stratagus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Stratagus-CVS] stratagus/src include/map.h include/stratagus.h...


From: address@hidden
Subject: [Stratagus-CVS] stratagus/src include/map.h include/stratagus.h...
Date: 24 Jan 2004 13:42:28 +1100

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       04/01/24 13:42:28

Modified files:
        src/include    : map.h stratagus.h 
        src/stratagus  : stratagus.c 
        src/unit       : unit_cache.c 

Log message:
        Disabled NEW_UNIT_CACHE

Patches:
Index: stratagus/src/include/map.h
diff -u stratagus/src/include/map.h:1.117 stratagus/src/include/map.h:1.118
--- stratagus/src/include/map.h:1.117   Wed Jan 21 05:41:58 2004
+++ stratagus/src/include/map.h Sat Jan 24 13:42:25 2004
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: map.h,v 1.117 2004/01/20 18:41:58 nobody_ Exp $
+//      $Id: map.h,v 1.118 2004/01/24 02:42:25 jsalmon3 Exp $
 
 #ifndef __MAP_H__
 #define __MAP_H__
@@ -214,10 +214,9 @@
        unsigned char  Value;     /// HP for walls/ Wood Regeneration
        unsigned char Visible[PlayerMax];  /// Seen counter 0 unexplored
        unsigned char VisCloak[PlayerMax];  /// Visiblity for cloaking.
-#ifdef UNIT_ON_MAP
+#ifndef NEW_UNIT_CACHE
        Unit*      UnitCache;  /// An unit on the map field
-#endif
-#ifdef NEW_UNIT_CACHE
+#else
        UnitListItem*      UnitCache;  /// An unit on the map field
 #endif
 } MapField;
Index: stratagus/src/include/stratagus.h
diff -u stratagus/src/include/stratagus.h:1.45 
stratagus/src/include/stratagus.h:1.46
--- stratagus/src/include/stratagus.h:1.45      Fri Jan 23 05:47:37 2004
+++ stratagus/src/include/stratagus.h   Sat Jan 24 13:42:26 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: stratagus.h,v 1.45 2004/01/22 18:47:37 jsalmon3 Exp $
+//      $Id: stratagus.h,v 1.46 2004/01/24 02:42:26 jsalmon3 Exp $
 
 #ifndef __STRATAGUS_H__
 #define __STRATAGUS_H__
@@ -37,11 +37,8 @@
 ==  Config definitions
 ============================================================================*/
 
-// Unit On Map cache
-// #define UNIT_ON_MAP
-
 // New unit cache
-#define NEW_UNIT_CACHE
+//#define NEW_UNIT_CACHE
 
 // New Lua scripting.
 //#define META_LUA
Index: stratagus/src/stratagus/stratagus.c
diff -u stratagus/src/stratagus/stratagus.c:1.256 
stratagus/src/stratagus/stratagus.c:1.257
--- stratagus/src/stratagus/stratagus.c:1.256   Fri Jan 23 05:47:38 2004
+++ stratagus/src/stratagus/stratagus.c Sat Jan 24 13:42:26 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: stratagus.c,v 1.256 2004/01/22 18:47:38 jsalmon3 Exp $
+//      $Id: stratagus.c,v 1.257 2004/01/24 02:42:26 jsalmon3 Exp $
 
 //@{
 
@@ -930,9 +930,6 @@
 #endif
 #ifdef USE_MAD
                "MP3 "
-#endif
-#ifdef UNIT_ON_MAP
-               "UNIT-ON-MAP "
 #endif
 #ifdef NEW_UNIT_CACHE
                "NEW-UNIT-CACHE "
Index: stratagus/src/unit/unit_cache.c
diff -u stratagus/src/unit/unit_cache.c:1.45 
stratagus/src/unit/unit_cache.c:1.46
--- stratagus/src/unit/unit_cache.c:1.45        Sat Jan 24 10:43:57 2004
+++ stratagus/src/unit/unit_cache.c     Sat Jan 24 13:42:27 2004
@@ -30,7 +30,7 @@
 //         Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //         02111-1307, USA.
 //
-//             $Id: unit_cache.c,v 1.45 2004/01/23 23:43:57 wizzard Exp $
+//             $Id: unit_cache.c,v 1.46 2004/01/24 02:42:27 jsalmon3 Exp $
 
 //@{
 
@@ -46,7 +46,7 @@
 #include "unit.h"
 #include "map.h"
 
-#ifdef UNIT_ON_MAP
+#ifndef NEW_UNIT_CACHE
 
 /**
 **             Insert new unit into cache.
@@ -226,9 +226,7 @@
 {
 }
 
-#endif         // } UNIT_ON_MAP
-
-#ifdef NEW_UNIT_CACHE
+#else          // NEW_UNIT_CACHE
 
 /**
 **             Insert new unit into cache.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]