[Stratagus-CVS] stratagus/src include/stratagus.h ui/botpanel.c...

[address@hidden]

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       04/02/03 19:56:24

Modified files:
        src/include    : stratagus.h 
        src/ui         : botpanel.c 
        src/unit       : unittype.c 

Log message:
        Stupid puds:)

Patches:
Index: stratagus/src/include/stratagus.h
diff -u stratagus/src/include/stratagus.h:1.51 
stratagus/src/include/stratagus.h:1.52
--- stratagus/src/include/stratagus.h:1.51      Mon Feb  2 23:09:32 2004
+++ stratagus/src/include/stratagus.h   Tue Feb  3 19:56:22 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: stratagus.h,v 1.51 2004/02/02 12:09:32 nobody_ Exp $
+//      $Id: stratagus.h,v 1.52 2004/02/03 08:56:22 nobody_ Exp $
 
 #ifndef __STRATAGUS_H__
 #define __STRATAGUS_H__
@@ -41,7 +41,7 @@
 #define NEW_UNIT_CACHE
 
 // New Lua scripting.
-#define META_LUA
+//#define META_LUA
 
 // Dynamic loading.
 //#define DYNAMIC_LOAD
Index: stratagus/src/ui/botpanel.c
diff -u stratagus/src/ui/botpanel.c:1.107 stratagus/src/ui/botpanel.c:1.108
--- stratagus/src/ui/botpanel.c:1.107   Sat Jan 31 02:14:50 2004
+++ stratagus/src/ui/botpanel.c Tue Feb  3 19:56:23 2004
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: botpanel.c,v 1.107 2004/01/30 15:14:50 nobody_ Exp $
+//     $Id: botpanel.c,v 1.108 2004/02/03 08:56:23 nobody_ Exp $
 
 //@{
 
@@ -104,7 +104,7 @@
        char* cp;
 
        CLprintf(file, "\n;;; -----------------------------------------\n");
-       CLprintf(file, ";;; MODULE: buttons $Id: botpanel.c,v 1.107 2004/01/30 
15:14:50 nobody_ Exp $\n\n");
+       CLprintf(file, ";;; MODULE: buttons $Id: botpanel.c,v 1.108 2004/02/03 
08:56:23 nobody_ Exp $\n\n");
 
        for (i = 0; i < NumUnitButtons; ++i) {
                CLprintf(file, "(define-button 'pos %d 'level %d 'icon '%s\n",
@@ -485,6 +485,7 @@
                                                break;
                                        case ButtonSpellCast:
                                                for (j = 0; j < NumSelected; 
++j) {
+                                                       
DebugCheck(!Selected[j]->AutoCastSpell);
                                                        if 
(Selected[j]->AutoCastSpell[buttons[i].Value] != 1) {
                                                                break;
                                                        }
Index: stratagus/src/unit/unittype.c
diff -u stratagus/src/unit/unittype.c:1.153 stratagus/src/unit/unittype.c:1.154
--- stratagus/src/unit/unittype.c:1.153 Sun Feb  1 06:39:34 2004
+++ stratagus/src/unit/unittype.c       Tue Feb  3 19:56:24 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: unittype.c,v 1.153 2004/01/31 19:39:34 nobody_ Exp $
+//      $Id: unittype.c,v 1.154 2004/02/03 08:56:24 nobody_ Exp $
 
 //@{
 
@@ -286,6 +286,7 @@
                DebugLevel0("***\n\n");
        }
 #endif
+       DebugLevel0Fn("This PUD has an UDTA section, we are not sure it 
works.\n");
        start = udta;
 
        for (i = 0; i < 110; ++i) {                             // overlap 
frames
@@ -335,9 +336,9 @@
        for (i = 0; i < 110; ++i) {                             // Unit size in 
tiles
                unittype = UnitTypeByWcNum(i);
                v = FetchLE16(udta);
-               unittype->TileWidth = v;
+               //unittype->TileWidth = v;
                v = FetchLE16(udta);
-               unittype->TileHeight = v;
+               //unittype->TileHeight = v
        }
        for (i = 0; i < 110; ++i) {                             // Box size in 
pixel
                unittype = UnitTypeByWcNum(i);
@@ -482,11 +483,10 @@
                unittype->CanStore[GoldCost] = BIT(12, v);
                unittype->Vanishes = BIT(13, v);
                unittype->GroundAttack = BIT(14, v);
+//             No idea on what do about commented stuff.
 //             unittype->IsUndead = BIT(15, v);
                unittype->ShoreBuilding = BIT(16, v);
 //             unittype->CanCastSpell = BIT(17,v);
-//             unittype->CanCastSpell = (char*)malloc(/*nb_spell*/);
-               unittype->CanCastSpell = NULL;//
                unittype->CanStore[WoodCost] = BIT(18, v);
                unittype->CanAttack = BIT(19, v);
 //             unittype->Hero = BIT(23, v);
@@ -1187,7 +1187,7 @@
 //     char** sp;
 
        CLprintf(file, "\n--- -----------------------------------------\n");
-       CLprintf(file, "--- MODULE: unittypes $Id: unittype.c,v 1.153 
2004/01/31 19:39:34 nobody_ Exp $\n\n");
+       CLprintf(file, "--- MODULE: unittypes $Id: unittype.c,v 1.154 
2004/02/03 08:56:24 nobody_ Exp $\n\n");
 #if 0
        // Original number to internal unit-type name.