[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/tools wartool.c
From: |
Russell Smith |
Subject: |
[Stratagus-CVS] stratagus/tools wartool.c |
Date: |
Fri, 14 Nov 2003 18:55:22 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Russell Smith <address@hidden> 03/11/14 18:55:22
Modified files:
tools : wartool.c
Log message:
Fakes swamp-tileset from wasteland if it does not exist
Patches:
Index: stratagus/tools/wartool.c
diff -u stratagus/tools/wartool.c:1.108 stratagus/tools/wartool.c:1.109
--- stratagus/tools/wartool.c:1.108 Sat Jul 12 10:09:18 2003
+++ stratagus/tools/wartool.c Fri Nov 14 18:55:22 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: wartool.c,v 1.108 2003/07/12 14:09:18 n0body Exp $
+// $Id: wartool.c,v 1.109 2003/11/14 23:55:22 mr-russ Exp $
//@{
@@ -279,6 +279,8 @@
{T,0,"summer/terrain/summer", 2, 3, 4, 5 },
{R,0,"wasteland/wasteland", 10 __},
{T,0,"wasteland/terrain/wasteland", 10, 11, 12, 13 },
+{R,3,"swamp/swamp", 10 __},
+{T,3,"swamp/terrain/swamp", 10, 11, 12, 13 },
{R,0,"winter/winter", 18 __},
{T,0,"winter/terrain/winter", 18, 19, 20, 21 },
@@ -313,6 +315,7 @@
{G,0,"orc/units/%43", 2, 63 _2},
{G,0,"tilesets/summer/neutral/units/%59", 2, 64 _2},
{G,0,"tilesets/wasteland/neutral/units/%59", 10, 65 _2},
+{G,3,"tilesets/swamp/neutral/units/%59", 10, 65 _2},
{G,0,"tilesets/winter/neutral/units/%59", 18, 66 _2},
{G,0,"neutral/units/%57", 2, 69 _2},
{G,0,"neutral/units/%58", 2, 70 _2},
@@ -357,6 +360,44 @@
{G,0,"tilesets/summer/orc/buildings/%93", 2, 117 _2},
{G,0,"tilesets/summer/neutral/buildings/%95", 2, 118 _2},
{G,0,"tilesets/summer/neutral/buildings/%94", 2, 119 _2},
+{G,3,"tilesets/swamp/human/buildings/%-98", 2, 80 _2},
+{G,3,"tilesets/swamp/orc/buildings/%-99", 2, 81 _2},
+{G,3,"tilesets/swamp/human/buildings/%-100", 2, 82 _2},
+{G,3,"tilesets/swamp/orc/buildings/%-101", 2, 83 _2},
+{G,3,"tilesets/swamp/human/buildings/%82", 2, 84 _2},
+{G,3,"tilesets/swamp/orc/buildings/%83", 2, 85 _2},
+{G,3,"tilesets/swamp/human/buildings/%90", 2, 86 _2},
+{G,3,"tilesets/swamp/orc/buildings/%91", 2, 87 _2},
+{G,3,"tilesets/swamp/human/buildings/%72", 2, 88 _2},
+{G,3,"tilesets/swamp/orc/buildings/%73", 2, 89 _2},
+{G,3,"tilesets/swamp/human/buildings/%70", 2, 90 _2},
+{G,3,"tilesets/swamp/orc/buildings/%71", 2, 91 _2},
+{G,3,"tilesets/swamp/human/buildings/%60", 2, 92 _2},
+{G,3,"tilesets/swamp/orc/buildings/%61", 2, 93 _2},
+{G,3,"tilesets/swamp/human/buildings/%-62", 2, 94 _2},
+{G,3,"tilesets/swamp/orc/buildings/%-63", 2, 95 _2},
+{G,3,"tilesets/swamp/human/buildings/%64", 2, 96 _2},
+{G,3,"tilesets/swamp/orc/buildings/%65", 2, 97 _2},
+{G,3,"tilesets/swamp/human/buildings/%66", 2, 98 _2},
+{G,3,"tilesets/swamp/orc/buildings/%67", 2, 99 _2},
+{G,3,"tilesets/swamp/human/buildings/%76", 2, 100 _2},
+{G,3,"tilesets/swamp/orc/buildings/%77", 2, 101 _2},
+{G,3,"tilesets/swamp/human/buildings/%78", 2, 102 _2},
+{G,3,"tilesets/swamp/orc/buildings/%79", 2, 103 _2},
+{G,3,"tilesets/swamp/human/buildings/%68", 2, 104 _2},
+{G,3,"tilesets/swamp/orc/buildings/%69", 2, 105 _2},
+{G,3,"tilesets/swamp/human/buildings/%-84", 2, 106 _2},
+{G,3,"tilesets/swamp/orc/buildings/%-85", 2, 107 _2},
+{G,3,"tilesets/swamp/human/buildings/%-74", 2, 108 _2},
+{G,3,"tilesets/swamp/orc/buildings/%-75", 2, 109 _2},
+{G,3,"tilesets/swamp/human/buildings/%-80", 2, 110 _2},
+{G,3,"tilesets/swamp/orc/buildings/%-81", 2, 111 _2},
+{G,3,"tilesets/swamp/human/buildings/%-86", 2, 112 _2},
+{G,3,"tilesets/swamp/orc/buildings/%-87", 2, 113 _2},
+{G,3,"tilesets/swamp/human/buildings/%-88", 2, 114 _2},
+{G,3,"tilesets/swamp/orc/buildings/%-89", 2, 115 _2},
+{G,3,"tilesets/swamp/human/buildings/%92", 2, 116 _2},
+{G,3,"tilesets/swamp/orc/buildings/%93", 2, 117 _2},
{G,0,"neutral/units/corpses", 2, 120 _2},
{G,0,"tilesets/summer/neutral/buildings/destroyed_site", 2, 121 _2},
// Hardcoded support for worker with resource repairing
@@ -419,17 +460,31 @@
{G,0,"tilesets/wasteland/orc/buildings/%-89", 10, 178 _2},
{G,0,"tilesets/wasteland/neutral/buildings/%94", 10, 179 _2},
{G,0,"tilesets/wasteland/neutral/buildings/%95", 10, 180 _2},
+{G,3,"tilesets/swamp/human/buildings/%60", 10, 173 _2},
+{G,3,"tilesets/swamp/orc/buildings/%61", 10, 174 _2},
+{G,3,"tilesets/swamp/human/buildings/%78", 10, 175 _2},
+{G,3,"tilesets/swamp/orc/buildings/%79", 10, 176 _2},
+{G,3,"tilesets/swamp/human/buildings/%-88", 10, 177 _2},
+{G,3,"tilesets/swamp/orc/buildings/%-89", 10, 178 _2},
+{G,3,"tilesets/swamp/neutral/buildings/%94", 10, 179 _2},
+{G,3,"tilesets/swamp/neutral/buildings/%95", 10, 180 _2},
{G,0,"neutral/buildings/%104", 2, 181 _2},
{G,0,"tilesets/wasteland/human/units/%40", 10, 182 _2},
{G,0,"tilesets/wasteland/orc/units/%41", 10, 183 _2},
+{G,3,"tilesets/swamp/human/units/%40", 10, 182 _2},
+{G,3,"tilesets/swamp/orc/units/%41", 10, 183 _2},
{G,0,"tilesets/winter/neutral/buildings/%103", 18, 184 _2},
{G,0,"tilesets/wasteland/neutral/buildings/%103", 10, 185 _2},
+{G,3,"tilesets/swamp/neutral/buildings/%103", 10, 185 _2},
+{G,3,"tilesets/swamp/neutral/buildings/%104", 2, 181 _2},
{G,0,"tilesets/winter/neutral/buildings/%104", 18, 186 _2},
{U,0,"ui/gold,wood,oil,mana", 2, 187 _2},
{G,0,"tilesets/wasteland/neutral/buildings/small_destroyed_site",10,188
_2},
+{G,3,"tilesets/swamp/neutral/buildings/small_destroyed_site", 10, 188 _2},
{G,0,"tilesets/summer/neutral/buildings/small_destroyed_site", 2, 189 _2},
{G,0,"tilesets/winter/neutral/buildings/small_destroyed_site", 18, 190 _2},
{G,0,"tilesets/wasteland/neutral/buildings/destroyed_site", 10, 191 _2},
+{G,3,"tilesets/swamp/neutral/buildings/destroyed_site", 10, 191
_2},
//--------------------------------------------------
{P,0,"campaigns/human/level01h", 192 __},
{P,0,"campaigns/orc/level01o", 193 __},
@@ -525,12 +580,19 @@
{G,0,"neutral/buildings/land_construction_site", 2, 252 _2},
{G,0,"human/buildings/shipyard_construction_site", 2, 253 _2},
{G,0,"orc/buildings/shipyard_construction_site", 2, 254 _2},
+{G,3,"tilesets/swamp/neutral/buildings/land_construction_site", 2, 252
_2},
+{G,3,"tilesets/swamp/human/buildings/shipyard_construction_site", 2, 253 _2},
+{G,3,"tilesets/swamp/orc/buildings/shipyard_construction_site", 2, 254
_2},
{G,0,"tilesets/summer/human/buildings/oil_well_construction_site",2, 255 _2},
{G,0,"tilesets/summer/orc/buildings/oil_well_construction_site", 2, 256
_2},
{G,0,"human/buildings/refinery_construction_site", 2, 257 _2},
{G,0,"orc/buildings/refinery_construction_site", 2, 258 _2},
{G,0,"human/buildings/foundry_construction_site", 2, 259 _2},
{G,0,"orc/buildings/foundry_construction_site", 2, 260
_2},
+{G,3,"tilesets/swamp/human/buildings/refinery_construction_site", 2, 257 _2},
+{G,3,"tilesets/swamp/orc/buildings/refinery_construction_site", 2, 258
_2},
+{G,3,"tilesets/swamp/human/buildings/foundry_construction_site", 2, 259
_2},
+{G,3,"tilesets/swamp/orc/buildings/foundry_construction_site", 2, 260 _2},
{G,0,"tilesets/summer/neutral/buildings/wall_construction_site", 2, 261
_2},
{G,0,"tilesets/winter/neutral/buildings/land_construction_site",18, 262 _2},
{G,0,"tilesets/winter/human/buildings/shipyard_construction_site",18, 263 _2},
@@ -543,10 +605,14 @@
{G,0,"tilesets/winter/orc/buildings/foundry_construction_site", 18, 270
_2},
{G,0,"tilesets/wasteland/human/buildings/oil_well_construction_site",10, 271
_2},
{G,0,"tilesets/wasteland/orc/buildings/oil_well_construction_site",10, 272 _2},
+{G,3,"tilesets/swamp/human/buildings/oil_platform_construction_site",10, 271
_2},
+{G,3,"tilesets/swamp/orc/buildings/oil_platform_construction_site",10, 272 _2},
{G,0,"tilesets/winter/neutral/buildings/wall", 18, 273 _2},
{G,0,"tilesets/wasteland/neutral/buildings/wall", 10, 274 _2},
+{G,3,"tilesets/swamp/neutral/buildings/wall", 10, 274 _2},
{G,0,"tilesets/winter/neutral/buildings/wall_construction_site",18, 275 _2},
{G,0,"tilesets/wasteland/neutral/buildings/wall_construction_site",10, 276 _2},
+{G,3,"tilesets/swamp/neutral/buildings/wall_construction_site",10, 276 _2},
// 277 Control programs for computer player AI
// 278 Control programs for unit movement
// --------------------------------------------------
@@ -669,6 +735,7 @@
{G,0,"tilesets/summer/icons", 2, 356 _2},
{G,0,"tilesets/winter/icons", 18, 357 _2},
{G,0,"tilesets/wasteland/icons", 10, 358 _2},
+{G,3,"tilesets/swamp/icons", 10, 358 _2},
{I,0,"ui/human/victory", 363, 359 _2},
{I,0,"ui/orc/victory", 364, 360 _2},
@@ -3843,6 +3910,10 @@
// Should only be on the expansion cd
DebugLevel2("%s:\n" _C_ ParseString(Todo[u].File));
if (!expansion_cd && Todo[u].Version==2 ) {
+ continue;
+ }
+ // Extract dummy expansion files
+ if (expansion_cd && Todo[u].Version==3) {
continue;
}
switch( Todo[u].Type ) {
- [Stratagus-CVS] stratagus/tools wartool.c,
Russell Smith <=