[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/ui ccl_ui.c
From: |
Jimmy Salmon |
Subject: |
[Stratagus-CVS] stratagus/src/ui ccl_ui.c |
Date: |
Wed, 19 Nov 2003 23:47:44 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/11/19 23:47:43
Modified files:
src/ui : ccl_ui.c
Log message:
Fixed bug with nil values
Patches:
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.153 stratagus/src/ui/ccl_ui.c:1.154
--- stratagus/src/ui/ccl_ui.c:1.153 Mon Nov 17 14:14:37 2003
+++ stratagus/src/ui/ccl_ui.c Wed Nov 19 23:47:43 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_ui.c,v 1.153 2003/11/17 19:14:37 nehalmistry Exp $
+// $Id: ccl_ui.c,v 1.154 2003/11/20 04:47:43 jsalmon3 Exp $
//@{
@@ -5856,6 +5856,9 @@
s1 = strdup(lua_tostring(l, -1));
item->d.text.text = s1;
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.text.text = NULL;
}
lua_pop(l, 1);
@@ -5875,6 +5878,9 @@
lua_error(l);
}
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.text.action = NULL;
}
lua_pop(l, 1);
@@ -5950,6 +5956,9 @@
s1 = strdup(lua_tostring(l, -1));
item->d.button.text = s1;
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.button.text = NULL;
}
lua_pop(l, 1);
@@ -5979,6 +5988,9 @@
lua_error(l);
}
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.button.handler = NULL;
}
lua_pop(l, 1);
@@ -6079,6 +6091,10 @@
lua_pop(l, 1);
item->d.pulldown.options[subk] = s1;
}
+ } else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
}
lua_pop(l, 1);
} else if (!strcmp(value, "func")) {
@@ -6097,6 +6113,9 @@
lua_error(l);
}
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.pulldown.action = NULL;
}
lua_pop(l, 1);
@@ -6216,6 +6235,9 @@
lua_error(l);
}
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.listbox.action = NULL;
}
lua_pop(l, 1);
@@ -6235,6 +6257,9 @@
lua_error(l);
}
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.listbox.handler = NULL;
}
lua_pop(l, 1);
@@ -6254,6 +6279,9 @@
lua_error(l);
}
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.listbox.retrieveopt = NULL;
}
lua_pop(l, 1);
@@ -6411,6 +6439,9 @@
lua_pushfstring(l, "Can't find function: %s",
value);
}
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.vslider.action = NULL;
}
lua_pop(l, 1);
@@ -6430,6 +6461,9 @@
lua_error(l);
}
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.vslider.handler = NULL;
}
lua_pop(l, 1);
@@ -6535,6 +6569,9 @@
lua_pushfstring(l, "Can't find function: %s",
value);
}
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.input.action = NULL;
}
lua_pop(l, 1);
@@ -6648,6 +6685,9 @@
lua_pushfstring(l, "Can't find function: %s",
value);
}
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.gem.action = NULL;
}
lua_pop(l, 1);
@@ -6783,6 +6823,9 @@
lua_error(l);
}
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.hslider.action = NULL;
}
lua_pop(l, 1);
@@ -6802,6 +6845,9 @@
lua_error(l);
}
} else {
+ lua_pushnumber(l, 0);
+ lua_rawseti(l, j + 1, k + 1);
+ subargs = luaL_getn(l, j + 1);
item->d.hslider.handler = NULL;
}
lua_pop(l, 1);
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, Jimmy Salmon, 2003/11/13
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, Jimmy Salmon, 2003/11/14
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, Jimmy Salmon, 2003/11/14
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, Jimmy Salmon, 2003/11/15
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, Jimmy Salmon, 2003/11/17
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c,
Jimmy Salmon <=
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, Jimmy Salmon, 2003/11/20
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, Jimmy Salmon, 2003/11/20
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, Jimmy Salmon, 2003/11/29