[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/clone unit.c
From: |
ludovic pollet |
Subject: |
[Stratagus-CVS] stratagus/src/clone unit.c |
Date: |
Thu, 20 Nov 2003 07:52:08 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: ludovic pollet <address@hidden> 03/11/20 07:52:07
Modified files:
src/clone : unit.c
Log message:
Fixed broken oil-platform behaviour with MAP_REGIONS
Patches:
Index: stratagus/src/clone/unit.c
diff -u stratagus/src/clone/unit.c:1.340 stratagus/src/clone/unit.c:1.341
--- stratagus/src/clone/unit.c:1.340 Wed Nov 19 21:22:29 2003
+++ stratagus/src/clone/unit.c Thu Nov 20 07:52:06 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit.c,v 1.340 2003/11/20 02:22:29 pludov Exp $
+// $Id: unit.c,v 1.341 2003/11/20 12:52:06 pludov Exp $
//@{
@@ -521,7 +521,10 @@
#endif
#ifdef MAP_REGIONS
- if (type->Building) {
+ if (type->Building &&
+ (type->FieldFlags &
+ (MapFieldLandUnit | MapFieldSeaUnit | MapFieldBuilding |
+ MapFieldUnpassable | MapFieldWall | MapFieldRocks | MapFieldForest))){
MapSplitterTilesOccuped(x, y, x + type->TileWidth - 1, y +
type->TileHeight - 1);
}
#endif
@@ -719,7 +722,10 @@
//
// Update map splitting.
//
- if (type->Building) {
+ if (type->Building &&
+ (type->FieldFlags &
+ (MapFieldLandUnit | MapFieldSeaUnit | MapFieldBuilding |
+ MapFieldUnpassable | MapFieldWall | MapFieldRocks | MapFieldForest))){
MapSplitterTilesCleared(unit->X, unit->Y,
unit->X + type->TileWidth - 1, unit->Y + type->TileHeight - 1);
}
@@ -3867,7 +3873,7 @@
int RunStart;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: units $Id: unit.c,v 1.340 2003/11/20 02:22:29
pludov Exp $\n\n");
+ CLprintf(file, ";;; MODULE: units $Id: unit.c,v 1.341 2003/11/20 12:52:06
pludov Exp $\n\n");
//
// Local variables