From 402e67c6b8b028bdab6898f1a8fdf3e29bb3028b Mon Sep 17 00:00:00 2001
From: mr-russ <>
Date: Mon, 6 Jan 2003 03:48:55 +0000
Subject: [PATCH] More New fog of war cleanups. Minimap Fixes and Goldmine
Fixes
---
src/map/minimap.cpp | 4 +++-
src/unit/unit.cpp | 7 +++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/map/minimap.cpp b/src/map/minimap.cpp
index 34b66b384..659915c3d 100644
--- a/src/map/minimap.cpp
+++ b/src/map/minimap.cpp
@@ -259,7 +259,9 @@ global void DrawMinimap(int vx __attribute__((unused)),
for( mx=0; mx<MINIMAP_W; ++mx ) {
#ifdef NEW_FOW
if( IsMapFieldVisible(Minimap2MapX[mx],(Minimap2MapY[my]/TheMap.Width))
- ) {
+ || (IsMapFieldExplored(Minimap2MapX[mx],
+ (Minimap2MapY[my]/TheMap.Width)) &&
+ ((mx&1)==(my&1)))) {
VideoDrawPixel(((unsigned char*)MinimapGraphic->Frames)
[mx+my*MINIMAP_W],x+mx,y+my);
}
diff --git a/src/unit/unit.cpp b/src/unit/unit.cpp
index 1627d442e..329bd4608 100644
--- a/src/unit/unit.cpp
+++ b/src/unit/unit.cpp
@@ -1917,6 +1917,7 @@ startn:
found:
unit->Wait=1; // should be correct unit has still action
+
PlaceUnit(unit, x, y);
}
@@ -2040,6 +2041,12 @@ global void DropOutAll(const Unit* source)
++i;
DropOutOnSide(unit,LookingW
,source->Type->TileWidth,source->Type->TileHeight);
+#ifdef NEW_FOW
+ //Worker is back on map, unmark sight
+ MapUnmarkSight(unit->Player,source->X+source->Type->TileWidth/2,
+ source->Y+source->Type->TileHeight/2,
+ source->Stats->SightRange);
+#endif
DebugCheck( unit->Orders[0].Goal );
unit->Orders[0].Action=UnitActionStill;
unit->Wait=unit->Reset=1;