[Stratagus-CVS] stratagus/src ai/ccl_ai.c editor/editor.c netwo...

[address@hidden]

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       03/12/22 18:52:11

Modified files:
        src/ai         : ccl_ai.c 
        src/editor     : editor.c 
        src/network    : network.c 
        src/stratagus  : stratagus.c 

Log message:
        Fix gcc 3.3 warnings (from Carlos Marin)

Patches:
Index: stratagus/src/ai/ccl_ai.c
diff -u stratagus/src/ai/ccl_ai.c:1.92 stratagus/src/ai/ccl_ai.c:1.93
--- stratagus/src/ai/ccl_ai.c:1.92      Sat Dec 20 16:02:00 2003
+++ stratagus/src/ai/ccl_ai.c   Mon Dec 22 18:52:08 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: ccl_ai.c,v 1.92 2003/12/20 05:02:00 jsalmon3 Exp $
+//      $Id: ccl_ai.c,v 1.93 2003/12/22 07:52:08 wizzard Exp $
 
 //@{
 
@@ -803,6 +803,7 @@
                } else {
                        lua_pushfstring(l, "unknown tag: %s", value);
                        lua_error(l);
+                       what = -1;
                }
 
                //
@@ -2905,6 +2906,7 @@
        } else {
                lua_pushfstring(l, "Upgrade needed");
                lua_error(l);
+               upgrade = 0;
        }
 
        InsertResearchRequests(upgrade);
Index: stratagus/src/editor/editor.c
diff -u stratagus/src/editor/editor.c:1.12 stratagus/src/editor/editor.c:1.13
--- stratagus/src/editor/editor.c:1.12  Sat Dec 20 16:33:23 2003
+++ stratagus/src/editor/editor.c       Mon Dec 22 18:52:09 2003
@@ -5,12 +5,12 @@
 //     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
 //             \/                  \/          \//_____/            \/
 //  ______________________                           ______________________
-//                       T H E   W A R   B E G I N S
-//        Stratagus - A free fantasy real time strategy game engine
+//                        T H E   W A R   B E G I N S
+//         Stratagus - A free fantasy real time strategy game engine
 //
-/address@hidden editor.c       -       Editor functions. */
+/address@hidden editor.c - Editor functions. */
 //
-//     (c) Copyright 2002 by Lutz Sammer
+//      (c) Copyright 2002-2004 by Lutz Sammer
 //
 //      This program is free software; you can redistribute it and/or modify
 //      it under the terms of the GNU General Public License as published by
@@ -26,34 +26,34 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: editor.c,v 1.12 2003/12/20 05:33:23 jsalmon3 Exp $
+//      $Id: editor.c,v 1.13 2003/12/22 07:52:09 wizzard Exp $
 
 //@{
 
 //----------------------------------------------------------------------------
-//             Documentation
+//  Documentation
 //----------------------------------------------------------------------------
 
 /**
-**       @page EditorModule Module - Editor
+**  @page EditorModule Module - Editor
 **
-**             This is a very simple editor for the Stratagus engine.
+**  This is a very simple editor for the Stratagus engine.
 **
-**       @section Missing Missing features
+**  @section Missing Missing features
 **
-**             @li Edit upgrade section
-**             @li Edit allow section
-**             @li Edit .cm files
-**             @li Upgraded unit-types should be shown different on map
-**             @li Good keyboard bindings
-**             @li Script support
-**             @li Commandline support
-**             @li Cut&Paste
-**             @li More random map functions.
+**    @li Edit upgrade section
+**    @li Edit allow section
+**    @li Edit .cm files
+**    @li Upgraded unit-types should be shown different on map
+**    @li Good keyboard bindings
+**    @li Script support
+**    @li Commandline support
+**    @li Cut&Paste
+**    @li More random map functions.
 */
 
 /*----------------------------------------------------------------------------
---             Includes
+--  Includes
 ----------------------------------------------------------------------------*/
 
 #include <stdio.h>
@@ -61,17 +61,17 @@
 #include "stratagus.h"
 
 /*----------------------------------------------------------------------------
---             Defines
+--  Defines
 ----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------
---             Variables
+--  Variables
 ----------------------------------------------------------------------------*/
 
-global const char* EditorStartFile;            /// Editor CCL start file
+global const char* EditorStartFile;  /// Editor CCL start file
 
 /*----------------------------------------------------------------------------
---             Functions
+--  Functions
 ----------------------------------------------------------------------------*/
 
 //@}
Index: stratagus/src/network/network.c
diff -u stratagus/src/network/network.c:1.124 
stratagus/src/network/network.c:1.125
--- stratagus/src/network/network.c:1.124       Sat Dec 20 16:33:34 2003
+++ stratagus/src/network/network.c     Mon Dec 22 18:52:10 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: network.c,v 1.124 2003/12/20 05:33:34 jsalmon3 Exp $
+//     $Id: network.c,v 1.125 2003/12/22 07:52:10 wizzard Exp $
 
 //@{
 
@@ -555,7 +555,7 @@
                        } else if (type && check->Data.Dest == 
htons(type->Type)) {
                                DebugLevel3Fn("Removed Repeat Command\n");
                                return;
-                       } else if (check->Data.Dest == htons(-1)) {
+                       } else if (check->Data.Dest == 0xFFFF) {
                                DebugLevel3Fn("Removed Repeat Command\n");
                                return;
                        }
Index: stratagus/src/stratagus/stratagus.c
diff -u stratagus/src/stratagus/stratagus.c:1.236 
stratagus/src/stratagus/stratagus.c:1.237
--- stratagus/src/stratagus/stratagus.c:1.236   Sat Dec 20 18:54:25 2003
+++ stratagus/src/stratagus/stratagus.c Mon Dec 22 18:52:11 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: stratagus.c,v 1.236 2003/12/20 07:54:25 wizzard Exp $
+//     $Id: stratagus.c,v 1.237 2003/12/22 07:52:11 wizzard Exp $
 
 //@{
 
@@ -1020,7 +1020,7 @@
                InvalidateArea(5, VideoHeight - 18, VideoWidth - 10, 18);
                RealizeVideoMemory();
        } else {
-               DebugLevel0Fn("!!!!%s" _C_ temp);
+               DebugLevel0Fn("!!!!%s\n" _C_ temp);
        }
 }
 
@@ -1032,6 +1032,11 @@
 global void PreMenuSetup(void)
 {
        char* s;
+
+       if (Tilesets == NULL) {
+               fprintf(stderr, "Tilesets is null!!\n");
+               ExitFatal(-1);
+       }
 
        //
        //  Initial menus require some gfx.