[Stratagus-CVS] stratagus/src clone/unit_draw.c editor/ccl_edit...

[Russell Smith]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Russell Smith <address@hidden>  03/12/02 22:54:15

Modified files:
        src/clone      : unit_draw.c 
        src/editor     : ccl_editor.c 
        src/sound      : ccl_sound.c 
        src/ui         : ccl_ui.c 

Log message:
        LUA support compiles on linux

Patches:
Index: stratagus/src/clone/unit_draw.c
diff -u stratagus/src/clone/unit_draw.c:1.194 
stratagus/src/clone/unit_draw.c:1.195
--- stratagus/src/clone/unit_draw.c:1.194       Mon Dec  1 23:00:12 2003
+++ stratagus/src/clone/unit_draw.c     Tue Dec  2 22:54:13 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: unit_draw.c,v 1.194 2003/12/02 04:00:12 nehalmistry Exp $
+//     $Id: unit_draw.c,v 1.195 2003/12/03 03:54:13 mr-russ Exp $
 
 //@{
 
@@ -36,6 +36,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "stratagus.h"
 #include "video.h"
@@ -943,7 +944,7 @@
 global void SaveDecorations(CLFile* file)
 {
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: decorations $Id: unit_draw.c,v 1.194 
2003/12/02 04:00:12 nehalmistry Exp $\n\n");
+    CLprintf(file, ";;; MODULE: decorations $Id: unit_draw.c,v 1.195 
2003/12/03 03:54:13 mr-russ Exp $\n\n");
 
     CLprintf(file, "(mana-sprite \"%s\"  %d %d  %d %d)\n",
        ManaSprite.File, ManaSprite.HotX, ManaSprite.HotY,
Index: stratagus/src/editor/ccl_editor.c
diff -u stratagus/src/editor/ccl_editor.c:1.13 
stratagus/src/editor/ccl_editor.c:1.14
--- stratagus/src/editor/ccl_editor.c:1.13      Thu Nov 20 15:04:51 2003
+++ stratagus/src/editor/ccl_editor.c   Tue Dec  2 22:54:14 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ccl_editor.c,v 1.13 2003/11/20 20:04:51 jsalmon3 Exp $
+//     $Id: ccl_editor.c,v 1.14 2003/12/03 03:54:14 mr-russ Exp $
 
 //@{
 
@@ -36,6 +36,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "stratagus.h"
 #include "editor.h"
Index: stratagus/src/sound/ccl_sound.c
diff -u stratagus/src/sound/ccl_sound.c:1.59 
stratagus/src/sound/ccl_sound.c:1.60
--- stratagus/src/sound/ccl_sound.c:1.59        Tue Dec  2 19:31:36 2003
+++ stratagus/src/sound/ccl_sound.c     Tue Dec  2 22:54:14 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ccl_sound.c,v 1.59 2003/12/03 00:31:36 jsalmon3 Exp $
+//     $Id: ccl_sound.c,v 1.60 2003/12/03 03:54:14 mr-russ Exp $
 
 //@{
 
@@ -560,6 +560,7 @@
     LuaUserData* data;
 
     args = lua_gettop(l);
+    data = NULL;
     for (j = 0; j < args; ++j) {
        value = LuaToString(l, j + 1);
        ++j;
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.164 stratagus/src/ui/ccl_ui.c:1.165
--- stratagus/src/ui/ccl_ui.c:1.164     Tue Dec  2 22:33:59 2003
+++ stratagus/src/ui/ccl_ui.c   Tue Dec  2 22:54:14 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ccl_ui.c,v 1.164 2003/12/03 03:33:59 jsalmon3 Exp $
+//     $Id: ccl_ui.c,v 1.165 2003/12/03 03:54:14 mr-russ Exp $
 
 //@{
 
@@ -4494,6 +4494,7 @@
     } else {
        lua_pushfstring(l, "Unsupported style: %s", value);
        lua_error(l);
+       return 0;
     }
     return id;
 }
@@ -6438,7 +6439,7 @@
                lua_error(l);
            }
            if (lua_isnumber(l, j + 1)) {
-               sprintf(buf, "%ld", (int)lua_tonumber(l, j + 1));
+               sprintf(buf, "%ld", (long int)lua_tonumber(l, j + 1));
                s1 = strdup(buf);
            } else {
                s1 = strdup(lua_tostring(l, j + 1));