[Stratagus-CVS] stratagus/src action/action_resource.c map/map....

[address@hidden]

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       04/02/09 05:10:10

Modified files:
        src/action     : action_resource.c 
        src/map        : map.c minimap.c 
        src/unit       : unit.c 

Log message:
        Minor fixes. Minimap uses seen tiles.
        Fix building corpses showing up on minimap when under fog.
        Rem stdout junk with incomplete depots.

Patches:
Index: stratagus/src/action/action_resource.c
diff -u stratagus/src/action/action_resource.c:1.76 
stratagus/src/action/action_resource.c:1.77
--- stratagus/src/action/action_resource.c:1.76 Sat Jan 31 01:02:46 2004
+++ stratagus/src/action/action_resource.c      Mon Feb  9 05:10:05 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: action_resource.c,v 1.76 2004/01/30 14:02:46 nobody_ Exp $
+//      $Id: action_resource.c,v 1.77 2004/02/08 18:10:05 nobody_ Exp $
 
 //@{
 
@@ -605,7 +605,8 @@
        // If resource depot is still under construction, wait!
        //
        if (goal->Orders[0].Action == UnitActionBuilded) {
-               DebugLevel2Fn("Invalid resource depot. FIXME:WAIT!!! \n");
+               unit->Wait = 10;
+               DebugLevel3Fn("Invalid resource depot. WAIT!!! \n");
                return 0;
        }
 
Index: stratagus/src/map/map.c
diff -u stratagus/src/map/map.c:1.77 stratagus/src/map/map.c:1.78
--- stratagus/src/map/map.c:1.77        Tue Jan 27 21:15:23 2004
+++ stratagus/src/map/map.c     Mon Feb  9 05:10:07 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: map.c,v 1.77 2004/01/27 10:15:23 wizzard Exp $
+//     $Id: map.c,v 1.78 2004/02/08 18:10:07 nobody_ Exp $
 
 //@{
 
@@ -127,6 +127,8 @@
                MapFixSeenWallTile(x, y);
                MapFixSeenWallNeighbors(x, y);
        }
+
+       UpdateMinimapXY(x, y);
 }
 
 /**
Index: stratagus/src/map/minimap.c
diff -u stratagus/src/map/minimap.c:1.94 stratagus/src/map/minimap.c:1.95
--- stratagus/src/map/minimap.c:1.94    Tue Jan 27 10:10:28 2004
+++ stratagus/src/map/minimap.c Mon Feb  9 05:10:07 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: minimap.c,v 1.94 2004/01/26 23:10:28 jsalmon3 Exp $
+//     $Id: minimap.c,v 1.95 2004/02/08 18:10:07 nobody_ Exp $
 
 //@{
 
@@ -153,8 +153,6 @@
 /**
 **             Update a mini-map from the tiles of the map.
 **
-**             @todo           FIXME: this is not correct should use SeenTile.
-**
 **             FIXME: this can surely be sped up??
 */
 global void UpdateMinimapTerrain(void)
@@ -218,6 +216,10 @@
        int yofs;
        int tilepitch;
 
+       if (!MinimapTerrainSurface) {
+               return;
+       }
+
        scalex = MinimapScaleX / MINIMAP_FAC;
        if (scalex == 0) {
                scalex = 1;
@@ -256,7 +258,10 @@
                                break;
                        }
 
-                       tile = TheMap.Fields[x + y].Tile;
+                       tile = TheMap.Fields[x + y].SeenTile;
+                       if (!tile) {
+                               tile = TheMap.Fields[x + y].Tile;
+                       }
 
                        xofs = TileSizeX * (tile % tilepitch);
                        yofs = TileSizeY * (tile / tilepitch);
Index: stratagus/src/unit/unit.c
diff -u stratagus/src/unit/unit.c:1.390 stratagus/src/unit/unit.c:1.391
--- stratagus/src/unit/unit.c:1.390     Sun Feb  8 12:11:57 2004
+++ stratagus/src/unit/unit.c   Mon Feb  9 05:10:08 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: unit.c,v 1.390 2004/02/08 01:11:57 nobody_ Exp $
+//      $Id: unit.c,v 1.391 2004/02/08 18:10:08 nobody_ Exp $
 
 //@{
 
@@ -1263,6 +1263,7 @@
                        return 0;
                }
                return ((unit->Seen.ByPlayer & (1 << ThisPlayer->Player)) && 
+                               (unit->Seen.State != 3) &&
                                (!(unit->Seen.Destroyed & (1 << 
ThisPlayer->Player))) );
        }
 }
@@ -3743,7 +3744,7 @@
        int j;
 
        CLprintf(file, "\n--- -----------------------------------------\n");
-       CLprintf(file, "--- MODULE: units $Id: unit.c,v 1.390 2004/02/08 
01:11:57 nobody_ Exp $\n\n");
+       CLprintf(file, "--- MODULE: units $Id: unit.c,v 1.391 2004/02/08 
18:10:08 nobody_ Exp $\n\n");
 
 #if 0
        //