[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: |
Tue, 02 Dec 2003 20:26:26 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/12/02 20:26:25
Modified files:
src/ui : ccl_ui.c
Log message:
Fixed lua bugs
Patches:
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.162 stratagus/src/ui/ccl_ui.c:1.163
--- stratagus/src/ui/ccl_ui.c:1.162 Mon Dec 1 13:10:58 2003
+++ stratagus/src/ui/ccl_ui.c Tue Dec 2 20:26:25 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_ui.c,v 1.162 2003/12/01 18:10:58 jsalmon3 Exp $
+// $Id: ccl_ui.c,v 1.163 2003/12/03 01:26:25 jsalmon3 Exp $
//@{
@@ -6365,7 +6365,7 @@
char buf[64];
const char* value;
char* s1;
- char* s2;
+ const char* s2;
ButtonAction ba;
int args;
int j;
@@ -6438,7 +6438,7 @@
lua_error(l);
}
if (lua_isnumber(l, j + 1)) {
- sprintf(buf, "%ld", lua_tonumber(l, j + 1));
+ sprintf(buf, "%ld", (int)lua_tonumber(l, j + 1));
s1 = strdup(buf);
} else {
s1 = strdup(lua_tostring(l, j + 1));
@@ -6488,14 +6488,11 @@
subargs = luaL_getn(l, j + 1);
for (k = 0; k < subargs; ++k) {
lua_rawgeti(l, j + 1, k + 1);
- s2 = strdup(LuaToString(l, -1));
+ s2 = LuaToString(l, -1);
lua_pop(l, 1);
s1 = realloc(s1, strlen(s1) + strlen(s2) + 2);
strcat(s1, s2);
- free(s2);
- if (k == subargs) {
- strcat(s1, ",");
- }
+ strcat(s1, ",");
}
ba.AllowStr = s1;
} else if (!strcmp(value, "key")) {
@@ -6515,11 +6512,10 @@
subargs = luaL_getn(l, j + 1);
for (k = 0; k < subargs; ++k) {
lua_rawgeti(l, j + 1, k + 1);
- s2 = strdup(LuaToString(l, -1));
+ s2 = LuaToString(l, -1);
s1 = realloc(s1, strlen(s1) + strlen(s2) + 2);
strcat(s1, s2);
strcat(s1, ",");
- free(s2);
}
ba.UnitMask = s1;
if (!strncmp(ba.UnitMask, ",*,", 3)) {
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, Jimmy Salmon, 2003/12/01
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c,
Jimmy Salmon <=
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, Jimmy Salmon, 2003/12/02
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, Jimmy Salmon, 2003/12/03
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, address@hidden, 2003/12/15
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, address@hidden, 2003/12/16
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, address@hidden, 2003/12/16
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, address@hidden, 2003/12/22
- [Stratagus-CVS] stratagus/src/ui ccl_ui.c, address@hidden, 2003/12/31