[Stratagus-CVS] stratagus/src include/missile.h map/map_fog.c m...

[address@hidden]

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       04/02/09 03:13:27

Modified files:
        src/include    : missile.h 
        src/map        : map_fog.c 
        src/missile    : missile.c 
        src/unit       : script_unittype.c 

Log message:
        Increase number of missiles. Fix fog of war drawing bug.

Patches:
Index: stratagus/src/include/missile.h
diff -u stratagus/src/include/missile.h:1.84 
stratagus/src/include/missile.h:1.85
--- stratagus/src/include/missile.h:1.84        Tue Jan 20 00:03:44 2004
+++ stratagus/src/include/missile.h     Mon Feb  9 03:13:24 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: missile.h,v 1.84 2004/01/19 13:03:44 nobody_ Exp $
+//      $Id: missile.h,v 1.85 2004/02/08 16:13:24 nobody_ Exp $
 
 #ifndef __MISSILE_H__
 #define __MISSILE_H__
@@ -352,7 +352,8 @@
 
 #endif
 
-#define MAX_MISSILES 1800  /// maximum number of missiles
+#define MAX_MISSILES 2048        /// maximum number of missiles
+#define MAX_LOCAL_MISSILES 4096  /// maximum number of local missiles
 
 /**
 **  Missile-type-class typedef
Index: stratagus/src/map/map_fog.c
diff -u stratagus/src/map/map_fog.c:1.148 stratagus/src/map/map_fog.c:1.149
--- stratagus/src/map/map_fog.c:1.148   Sun Feb  1 13:14:57 2004
+++ stratagus/src/map/map_fog.c Mon Feb  9 03:13:25 2004
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: map_fog.c,v 1.148 2004/02/01 02:14:57 wizzard Exp $
+//      $Id: map_fog.c,v 1.149 2004/02/08 16:13:25 nobody_ Exp $
 
 //@{
 
@@ -45,6 +45,7 @@
 #include "unit.h"
 #include "map.h"
 #include "minimap.h"
+#include "font.h"
 #include "ui.h"
 
 #if defined(DEBUG) && defined(TIMEIT)
@@ -113,7 +114,7 @@
 **             Mapping for fog of war tiles.
 */
 local const int FogTable[16] = {
-        0,11,10, 2,  13, 6, 0, 3,  12, 0, 4, 1,  8, 9, 7, 0,
+        0,11,10, 2,  13, 6, 14, 3,  12, 15, 4, 1,  8, 9, 7, 0,
 };
 
 global unsigned char* VisionTable[3];
@@ -836,7 +837,7 @@
        }
 
        if (IsMapFieldVisibleTable(x, y) || ReplayRevealMap) {
-               if (tile) {
+               if (tile && tile != tile2) {
                        VideoDrawFog(tile, dx, dy);
 //                     TheMap.Fields[sx].VisibleLastFrame |= 
MapFieldPartiallyVisible;
 //             } else {
Index: stratagus/src/missile/missile.c
diff -u stratagus/src/missile/missile.c:1.135 
stratagus/src/missile/missile.c:1.136
--- stratagus/src/missile/missile.c:1.135       Fri Jan 30 13:46:09 2004
+++ stratagus/src/missile/missile.c     Mon Feb  9 03:13:26 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: missile.c,v 1.135 2004/01/30 02:46:09 wizzard Exp $
+//      $Id: missile.c,v 1.136 2004/02/08 16:13:26 nobody_ Exp $
 
 //@{
 
@@ -224,7 +224,7 @@
        Missile* missile;
 
        // Check maximum missiles!
-       if (NumGlobalMissiles == MAX_MISSILES) {
+       if (NumGlobalMissiles == MAX_MISSILES - 1) {
                fprintf(stderr, "Maximum of global missiles reached\n");
                abort();
                return NULL;
@@ -246,7 +246,7 @@
        Missile* missile;
 
        // Check maximum missiles!
-       if (NumLocalMissiles == MAX_MISSILES * 8) {
+       if (NumLocalMissiles == MAX_LOCAL_MISSILES - 1) {
                fprintf(stderr, "Maximum of local missiles reached\n");
                abort();
                return NULL;
@@ -1289,7 +1289,7 @@
 
        DebugCheck(file == NULL);
        CLprintf(file, "\n;;; -----------------------------------------\n");
-       CLprintf(file, ";;; MODULE: missile-types $Id: missile.c,v 1.135 
2004/01/30 02:46:09 wizzard Exp $\n\n");
+       CLprintf(file, ";;; MODULE: missile-types $Id: missile.c,v 1.136 
2004/02/08 16:13:26 nobody_ Exp $\n\n");
 
        //
        // Original number to internal missile-type name.
@@ -1411,7 +1411,7 @@
        Missile* const* missiles;
 
        CLprintf(file,"\n--- -----------------------------------------\n");
-       CLprintf(file,"--- MODULE: missiles $Id: missile.c,v 1.135 2004/01/30 
02:46:09 wizzard Exp $\n\n");
+       CLprintf(file,"--- MODULE: missiles $Id: missile.c,v 1.136 2004/02/08 
16:13:26 nobody_ Exp $\n\n");
 
        for (missiles = GlobalMissiles; *missiles; ++missiles) {
                SaveMissile(*missiles, file);
Index: stratagus/src/unit/script_unittype.c
diff -u stratagus/src/unit/script_unittype.c:1.133 
stratagus/src/unit/script_unittype.c:1.134
--- stratagus/src/unit/script_unittype.c:1.133  Mon Jan 19 09:36:31 2004
+++ stratagus/src/unit/script_unittype.c        Mon Feb  9 03:13:27 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: script_unittype.c,v 1.133 2004/01/18 22:36:31 nobody_ Exp $
+//      $Id: script_unittype.c,v 1.134 2004/02/08 16:13:27 nobody_ Exp $
 
 //@{
 
@@ -1046,7 +1046,7 @@
 }
 
 /**
-**             Define tileset mapping from original number to internal symbol
+**             Define unit type mapping from original number to internal symbol
 **
 **             @param list             List of all names.
 */