[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus src/action/action_build.c src/ai/ai_b...
|
From: |
Crestez Leonard |
|
Subject: |
[Stratagus-CVS] stratagus src/action/action_build.c src/ai/ai_b... |
|
Date: |
Sat, 12 Jul 2003 10:09:18 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Crestez Leonard <address@hidden> 03/07/12 10:09:18
Modified files:
src/action : action_build.c
src/ai : ai_building.c
src/clone : unit.c unit_find.c
src/include : unittype.h
src/ui : mainscr.c mouse.c
src/unit : ccl_unittype.c unittype.c
tools : wartool.c
Log message:
Updated wartool to replace spaces with underscores.
Renamed Unit::Stores[] to Unit::MaxCosts for consistence with CCL
Patches:
Index: stratagus/src/action/action_build.c
diff -u stratagus/src/action/action_build.c:1.82
stratagus/src/action/action_build.c:1.83
--- stratagus/src/action/action_build.c:1.82 Fri Jul 11 10:35:29 2003
+++ stratagus/src/action/action_build.c Sat Jul 12 10:09:17 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: action_build.c,v 1.82 2003/07/11 14:35:29 n0body Exp $
+// $Id: action_build.c,v 1.83 2003/07/12 14:09:17 n0body Exp $
//@{
@@ -372,7 +372,7 @@
//
// Building lumber mill, let worker automatic chopping wood.
//
- if( type->Stores[WoodCost] ) {
+ if( type->CanStore[WoodCost] ) {
CommandHarvest(worker,unit->X+unit->Type->TileWidth/2,
unit->Y+unit->Type->TileHeight/2,0);
}
Index: stratagus/src/ai/ai_building.c
diff -u stratagus/src/ai/ai_building.c:1.32 stratagus/src/ai/ai_building.c:1.33
--- stratagus/src/ai/ai_building.c:1.32 Fri Jul 11 10:35:29 2003
+++ stratagus/src/ai/ai_building.c Sat Jul 12 10:09:17 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ai_building.c,v 1.32 2003/07/11 14:35:29 n0body Exp $
+// $Id: ai_building.c,v 1.33 2003/07/12 14:09:17 n0body Exp $
#ifdef NEW_AI // {
@@ -443,7 +443,7 @@
break;
}
// Town hall near mine
- if( units[j]->Type->Stores[GoldCost] ) {
+ if( units[j]->Type->CanStore[GoldCost] ) {
break;
}
// Town hall may not be near but we may be using it,
check
@@ -626,14 +626,14 @@
//
// Find a good place for a new hall
//
- if( type->Stores[GoldCost] && AiFindHallPlace(worker,type,dx,dy) ) {
+ if( type->CanStore[GoldCost] && AiFindHallPlace(worker,type,dx,dy) ) {
return 1;
}
//
// Find a place near wood for a lumber mill
//
- if( type->Stores[WoodCost] && AiFindLumberMillPlace(worker,type,dx,dy) ) {
+ if( type->CanStore[WoodCost] && AiFindLumberMillPlace(worker,type,dx,dy) )
{
return 1;
}
Index: stratagus/src/clone/unit.c
diff -u stratagus/src/clone/unit.c:1.277 stratagus/src/clone/unit.c:1.278
--- stratagus/src/clone/unit.c:1.277 Fri Jul 11 10:21:17 2003
+++ stratagus/src/clone/unit.c Sat Jul 12 10:09:17 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit.c,v 1.277 2003/07/11 14:21:17 n0body Exp $
+// $Id: unit.c,v 1.278 2003/07/12 14:09:17 n0body Exp $
//@{
@@ -1979,7 +1979,7 @@
// City center converts complete race
// NOTE: I use a trick here, centers could
// store gold. FIXME!!!
- if( unit->Type->Stores[GoldCost] ) {
+ if( unit->Type->CanStore[GoldCost] ) {
ChangePlayerOwner(p,around[i]->Player);
break;
}
@@ -2378,7 +2378,7 @@
}
}
- if( type->Stores[GoldCost] ) {
+ if( type->CanStore[GoldCost] ) {
//
// Gold deposit can't be build too near to gold-mine.
//
@@ -2427,7 +2427,7 @@
}
next:
- if( type->Stores[OilCost] ) {
+ if( type->CanStore[OilCost] ) {
//
// Oil deposit can't be build too near to oil-patch or platform.
//
@@ -3184,7 +3184,7 @@
if( UnitUnusable(unit) ) {
continue;
}
- if( unit->Type->Stores[resource] ) {
+ if( unit->Type->CanStore[resource] ) {
d=MapDistanceToUnit(x,y,unit);
if( d<best_d
// FIXME: UnitReachable didn't work with unit inside
@@ -4335,7 +4335,7 @@
int InRun, RunStart;
fprintf(file,"\n;;; -----------------------------------------\n");
- fprintf(file,";;; MODULE: units $Id: unit.c,v 1.277 2003/07/11 14:21:17
n0body Exp $\n\n");
+ fprintf(file,";;; MODULE: units $Id: unit.c,v 1.278 2003/07/12 14:09:17
n0body Exp $\n\n");
//
// Local variables
Index: stratagus/src/clone/unit_find.c
diff -u stratagus/src/clone/unit_find.c:1.48
stratagus/src/clone/unit_find.c:1.49
--- stratagus/src/clone/unit_find.c:1.48 Fri Jul 11 10:35:30 2003
+++ stratagus/src/clone/unit_find.c Sat Jul 12 10:09:17 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit_find.c,v 1.48 2003/07/11 14:35:30 n0body Exp $
+// $Id: unit_find.c,v 1.49 2003/07/12 14:09:17 n0body Exp $
//@{
@@ -574,7 +574,7 @@
if( UnitUnusable(table[i]) ) {
continue;
}
- if( table[i]->Type->Stores[resource] ) {
+ if( table[i]->Type->CanStore[resource] ) {
return table[i];
}
}
Index: stratagus/src/include/unittype.h
diff -u stratagus/src/include/unittype.h:1.88
stratagus/src/include/unittype.h:1.89
--- stratagus/src/include/unittype.h:1.88 Fri Jul 11 10:35:30 2003
+++ stratagus/src/include/unittype.h Sat Jul 12 10:09:17 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unittype.h,v 1.88 2003/07/11 14:35:30 n0body Exp $
+// $Id: unittype.h,v 1.89 2003/07/12 14:09:17 n0body Exp $
#ifndef __UNITTYPE_H__
#define __UNITTYPE_H__
@@ -306,9 +306,9 @@
**
** We get here oil
**
-** UnitType::StoresGold
+** UnitType::CanStore[::MaxCosts]
**
-** We can store oil/gold/wood here
+** What resource types we can store here.
**
** UnitType::Vanishes
**
@@ -330,10 +330,6 @@
**
** Unit is able to use spells
**
-** UnitType::StoresWood
-**
-** We can store wood here
-**
** UnitType::CanAttack
**
** FIXME: docu
@@ -354,10 +350,6 @@
**
** FIXME: docu
**
-** UnitType::StoresOil
-**
-** We can store oil here
-**
** UnitType::Volatile
**
** Invisiblity/unholy armor kills unit
@@ -591,10 +583,7 @@
unsigned Transporter : 1; /// Can transport units
unsigned MaxOnBoard; /// Number of Transporter slots.
unsigned GivesOil : 1; /// We get here oil
-/* unsigned StoresWood : 1; /// We can store wood here
- unsigned StoresGold : 1; /// We can store oil/gold/wood here
- unsigned StoresOil : 1; /// We can store oil here*/
- unsigned Stores[MaxCosts]; /// Resources that we can store here.
+ unsigned CanStore[MaxCosts]; /// Resources that we can store
here.
unsigned Vanishes : 1; /// Corpes & destroyed places
unsigned GroundAttack : 1; /// Can do command ground attack
unsigned IsUndead : 1; /// Unit is already dead
Index: stratagus/src/ui/mainscr.c
diff -u stratagus/src/ui/mainscr.c:1.111 stratagus/src/ui/mainscr.c:1.112
--- stratagus/src/ui/mainscr.c:1.111 Fri Jul 11 10:35:33 2003
+++ stratagus/src/ui/mainscr.c Sat Jul 12 10:09:17 2003
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: mainscr.c,v 1.111 2003/07/11 14:35:33 n0body Exp $
+// $Id: mainscr.c,v 1.112 2003/07/12 14:09:17 n0body Exp $
//@{
@@ -368,7 +368,7 @@
}
}
- if( type->Stores[WoodCost] ) {
+ if( type->CanStore[WoodCost] ) {
VideoDrawText(x+20,y+8+78,GameFont,"Production");
VideoDrawText(x+22,y+8+93,GameFont,"Lumber:");
// I'm assuming that it will be short enough to fit in the space
@@ -386,7 +386,7 @@
VideoDrawText(x+120,y+8+93,GameFont,buf);
return;
- } else if( type->Stores[OilCost] ) {
+ } else if( type->CanStore[OilCost] ) {
VideoDrawText(x+20,y+8+78,GameFont,"Production");
VideoDrawText(x+54,y+8+93,GameFont,"Oil:");
VideoDrawNumber(x+78,y+8+93,GameFont,DefaultIncomes[OilCost]);
@@ -399,7 +399,7 @@
VideoDrawText(x+120,y+8+93,GameFont,buf);
return;
- } else if( type->Stores[GoldCost] ) {
+ } else if( type->CanStore[GoldCost] ) {
VideoDrawText(x+20,y+8+61,GameFont,"Production");
VideoDrawText(x+43,y+8+77,GameFont,"Gold:");
VideoDrawNumber(x+78,y+8+77,GameFont,DefaultIncomes[GoldCost]);
Index: stratagus/src/ui/mouse.c
diff -u stratagus/src/ui/mouse.c:1.132 stratagus/src/ui/mouse.c:1.133
--- stratagus/src/ui/mouse.c:1.132 Fri Jul 11 10:35:34 2003
+++ stratagus/src/ui/mouse.c Sat Jul 12 10:09:17 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: mouse.c,v 1.132 2003/07/11 14:35:34 n0body Exp $
+// $Id: mouse.c,v 1.133 2003/07/12 14:09:17 n0body Exp $
//@{
@@ -206,14 +206,14 @@
if( UnitUnderCursor && (dest=UnitOnMapTile(x,y)) ) {
if( dest->Player==unit->Player ) {
dest->Blink=4;
- if( dest->Type->Stores[GoldCost]
+ if( dest->Type->CanStore[GoldCost]
&& (type==UnitTypeOrcWorkerWithGold
|| type==UnitTypeHumanWorkerWithGold) ) {
DebugLevel3("GOLD-DEPOSIT\n");
SendCommandReturnGoods(unit,dest,flush);
continue;
}
- if( (dest->Type->Stores[WoodCost])
+ if( (dest->Type->CanStore[WoodCost])
&& (type==UnitTypeOrcWorkerWithWood
|| type==UnitTypeHumanWorkerWithWood) ) {
DebugLevel3("WOOD-DEPOSIT\n");
@@ -278,7 +278,7 @@
if( UnitUnderCursor && (dest=UnitOnMapTile(x,y))
&& dest->Player==unit->Player ) {
dest->Blink=4;
- if( dest->Type->Stores[OilCost] ) {
+ if( dest->Type->CanStore[OilCost] ) {
DebugLevel3("OIL-DEPOSIT\n");
SendCommandReturnGoods(unit,dest,flush);
continue;
Index: stratagus/src/unit/ccl_unittype.c
diff -u stratagus/src/unit/ccl_unittype.c:1.66
stratagus/src/unit/ccl_unittype.c:1.67
--- stratagus/src/unit/ccl_unittype.c:1.66 Fri Jul 11 10:35:34 2003
+++ stratagus/src/unit/ccl_unittype.c Sat Jul 12 10:09:18 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_unittype.c,v 1.66 2003/07/11 14:35:34 n0body Exp $
+// $Id: ccl_unittype.c,v 1.67 2003/07/12 14:09:18 n0body Exp $
//@{
@@ -382,7 +382,7 @@
sublist=gh_cdr(sublist);
for( i=0; i<MaxCosts; ++i ) {
if( gh_eq_p(value,gh_symbol2scm(DefaultResourceNames[i])) )
{
- type->Stores[i]=1;
+ type->CanStore[i]=1;
break;
}
}
Index: stratagus/src/unit/unittype.c
diff -u stratagus/src/unit/unittype.c:1.76 stratagus/src/unit/unittype.c:1.77
--- stratagus/src/unit/unittype.c:1.76 Fri Jul 11 10:35:34 2003
+++ stratagus/src/unit/unittype.c Sat Jul 12 10:09:18 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unittype.c,v 1.76 2003/07/11 14:35:34 n0body Exp $
+// $Id: unittype.c,v 1.77 2003/07/12 14:09:18 n0body Exp $
//@{
@@ -462,19 +462,19 @@
unittype->Tanker=BIT(9,v);
unittype->Transporter=BIT(10,v);
unittype->GivesOil=BIT(11,v);
- unittype->Stores[GoldCost]=BIT(12,v);
+ unittype->CanStore[GoldCost]=BIT(12,v);
unittype->Vanishes=BIT(13,v);
unittype->GroundAttack=BIT(14,v);
unittype->IsUndead=BIT(15,v);
unittype->ShoreBuilding=BIT(16,v);
unittype->CanCastSpell=BIT(17,v);
- unittype->Stores[WoodCost]=BIT(18,v);
+ unittype->CanStore[WoodCost]=BIT(18,v);
unittype->CanAttack=BIT(19,v);
unittype->Tower=BIT(20,v);
unittype->OilPatch=BIT(21,v);
unittype->GoldMine=BIT(22,v);
unittype->Hero=BIT(23,v);
- unittype->Stores[OilCost]=BIT(24,v);
+ unittype->CanStore[OilCost]=BIT(24,v);
unittype->Volatile=BIT(25,v);
unittype->CowerMage=BIT(26,v);
unittype->Organic=BIT(27,v);
@@ -882,7 +882,7 @@
// Save store info.
for (flag=i=0;i<MaxCosts;i++)
- if (type->Stores[i]) {
+ if (type->CanStore[i]) {
if (!flag) {
flag=1;
fprintf(file," 'can-store '(%s",DefaultResourceNames[i]);
@@ -1005,7 +1005,7 @@
int i;
fprintf(file,"\n;;; -----------------------------------------\n");
- fprintf(file,";;; MODULE: unittypes $Id: unittype.c,v 1.76 2003/07/11
14:35:34 n0body Exp $\n\n");
+ fprintf(file,";;; MODULE: unittypes $Id: unittype.c,v 1.77 2003/07/12
14:09:18 n0body Exp $\n\n");
// Original number to internal unit-type name.
Index: stratagus/tools/wartool.c
diff -u stratagus/tools/wartool.c:1.107 stratagus/tools/wartool.c:1.108
--- stratagus/tools/wartool.c:1.107 Fri Jul 11 10:35:34 2003
+++ stratagus/tools/wartool.c Sat Jul 12 10:09:18 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: wartool.c,v 1.107 2003/07/11 14:35:34 n0body Exp $
+// $Id: wartool.c,v 1.108 2003/07/12 14:09:18 n0body Exp $
//@{
@@ -193,7 +193,7 @@
#else
{F,0,"rezdat.war", 3000 __},
#endif
-{I,0,"ui/Credits background", 27, 28 _2},
+{I,0,"ui/Credits_background", 27, 28 _2},
#ifdef USE_BEOS
{F,0,"STRDAT.WAR", 4000 __},
@@ -306,8 +306,8 @@
{G,0,"orc/units/%11", 2, 54 _2},
{G,0,"human/units/%12", 2, 55
_2},
{G,0,"orc/units/%13", 2, 58 _2},
-{G,0,"human/units/%-28 empty", 2, 59 _2},
-{G,0,"orc/units/%-29 empty", 2, 60 _2},
+{G,0,"human/units/%-28_empty", 2, 59 _2},
+{G,0,"orc/units/%-29_empty", 2, 60 _2},
{G,0,"human/units/%32", 2, 61
_2},
{G,0,"orc/units/%33", 2, 62 _2},
{G,0,"orc/units/%43", 2, 63 _2},
@@ -358,14 +358,14 @@
{G,0,"tilesets/summer/neutral/buildings/%95", 2, 118 _2},
{G,0,"tilesets/summer/neutral/buildings/%94", 2, 119 _2},
{G,0,"neutral/units/corpses", 2, 120 _2},
-{G,0,"tilesets/summer/neutral/buildings/destroyed site", 2, 121 _2},
+{G,0,"tilesets/summer/neutral/buildings/destroyed_site", 2, 121 _2},
// Hardcoded support for worker with resource repairing
-{G,0,"human/units/%4 with wood", 2, 122, 47,
25},
-{G,0,"orc/units/%5 with wood", 2, 123, 48,
25},
-{G,0,"human/units/%4 with gold", 2, 124, 47,
25},
-{G,0,"orc/units/%5 with gold", 2, 125, 48,
25},
-{G,0,"human/units/%-28 full", 2, 126 _2},
-{G,0,"orc/units/%-29 full", 2, 127 _2},
+{G,0,"human/units/%4_with_wood", 2, 122, 47,
25},
+{G,0,"orc/units/%5_with_wood", 2, 123, 48,
25},
+{G,0,"human/units/%4_with_gold", 2, 124, 47,
25},
+{G,0,"orc/units/%5_with_gold", 2, 125, 48,
25},
+{G,0,"human/units/%-28_full", 2, 126 _2},
+{G,0,"orc/units/%-29_full", 2, 127 _2},
{G,0,"tilesets/winter/human/buildings/%90", 18, 128 _2},
{G,0,"tilesets/winter/orc/buildings/%91", 18, 129 _2},
{G,0,"tilesets/winter/human/buildings/%72", 18, 130 _2},
@@ -401,9 +401,9 @@
{G,0,"tilesets/winter/human/buildings/%82", 18, 160 _2},
{G,0,"tilesets/winter/orc/buildings/%83", 18, 161 _2},
{G,0,"tilesets/winter/neutral/buildings/%94", 18, 162 _2},
-{G,0,"tilesets/winter/neutral/buildings/destroyed site", 18, 163 _2},
-{G,0,"human/x startpoint", 2, 164 _2},
-{G,0,"orc/o startpoint", 2, 165 _2},
+{G,0,"tilesets/winter/neutral/buildings/destroyed_site", 18, 163 _2},
+{G,0,"human/x_startpoint", 2, 164 _2},
+{G,0,"orc/o_startpoint", 2, 165 _2},
{G,0,"neutral/buildings/%102", 2, 166 _2},
{G,0,"tilesets/summer/neutral/buildings/%103", 2, 167 _2},
{G,0,"tilesets/summer/neutral/buildings/%105", 2, 168 _2},
@@ -426,10 +426,10 @@
{G,0,"tilesets/wasteland/neutral/buildings/%103", 10, 185 _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,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,0,"tilesets/wasteland/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},
//--------------------------------------------------
{P,0,"campaigns/human/level01h", 192 __},
{P,0,"campaigns/orc/level01o", 193 __},
@@ -522,36 +522,36 @@
{P,0,"puds/demo/demo03", 250 __},
{P,0,"puds/demo/demo04", 251 __},
// --------------------------------------------------
-{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,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,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},
-{G,0,"tilesets/winter/orc/buildings/shipyard construction site",18, 264 _2},
-{G,0,"tilesets/winter/human/buildings/oil well construction site",18, 265 _2},
-{G,0,"tilesets/winter/orc/buildings/oil well construction site",18, 266 _2},
-{G,0,"tilesets/winter/human/buildings/refinery construction site",18, 267 _2},
-{G,0,"tilesets/winter/orc/buildings/refinery construction site",18, 268 _2},
-{G,0,"tilesets/winter/human/buildings/foundry construction site",18, 269 _2},
-{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,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,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,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},
+{G,0,"tilesets/winter/orc/buildings/shipyard_construction_site",18, 264 _2},
+{G,0,"tilesets/winter/human/buildings/oil_well_construction_site",18, 265 _2},
+{G,0,"tilesets/winter/orc/buildings/oil_well_construction_site",18, 266 _2},
+{G,0,"tilesets/winter/human/buildings/refinery_construction_site",18, 267 _2},
+{G,0,"tilesets/winter/orc/buildings/refinery_construction_site",18, 268 _2},
+{G,0,"tilesets/winter/human/buildings/foundry_construction_site",18, 269 _2},
+{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,0,"tilesets/winter/neutral/buildings/wall", 18, 273 _2},
{G,0,"tilesets/wasteland/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,0,"tilesets/winter/neutral/buildings/wall_construction_site",18, 275 _2},
+{G,0,"tilesets/wasteland/neutral/buildings/wall_construction_site",10, 276 _2},
// 277 Control programs for computer player AI
// 278 Control programs for unit movement
// --------------------------------------------------
-{N,0,"large episode titles", 279 __},
-{N,0,"small episode titles", 280 __},
+{N,0,"large_episode_titles", 279 __},
+{N,0,"small_episode_titles", 280 __},
{N,0,"large", 281 __},
{N,0,"game", 282 __},
{N,0,"small", 283 __},
@@ -608,62 +608,62 @@
{I,0,"ui/human/1600x1200/buttonpanel", 2, 297, 176,
864},
{I,0,"ui/orc/1600x1200/buttonpanel", 2, 298, 176,
864},
// --------------------------------------------------
-{C,0,"human/cursors/human gauntlet", 2, 301 _2},
-{C,0,"orc/cursors/orcish claw", 2, 302
_2},
-{C,0,"human/cursors/human don't click here", 2, 303 _2},
-{C,0,"orc/cursors/orcish don't click here", 2, 304 _2},
-{C,0,"human/cursors/yellow eagle", 2, 305 _2},
-{C,0,"orc/cursors/yellow crosshairs", 2, 306 _2},
-{C,0,"human/cursors/red eagle", 2, 307
_2},
-{C,0,"orc/cursors/red crosshairs", 2, 308 _2},
-{C,0,"human/cursors/green eagle", 2, 309 _2},
-{C,0,"orc/cursors/green crosshairs", 2, 310 _2},
-{C,0,"cursors/magnifying glass", 2, 311 _2},
-{C,0,"cursors/small green cross", 2, 312 _2},
+{C,0,"human/cursors/human_gauntlet", 2, 301 _2},
+{C,0,"orc/cursors/orcish_claw", 2, 302
_2},
+{C,0,"human/cursors/human_don't_click_here", 2, 303 _2},
+{C,0,"orc/cursors/orcish_don't_click_here", 2, 304 _2},
+{C,0,"human/cursors/yellow_eagle", 2, 305 _2},
+{C,0,"orc/cursors/yellow_crosshairs", 2, 306 _2},
+{C,0,"human/cursors/red_eagle", 2, 307
_2},
+{C,0,"orc/cursors/red_crosshairs", 2, 308 _2},
+{C,0,"human/cursors/green_eagle", 2, 309 _2},
+{C,0,"orc/cursors/green_crosshairs", 2, 310 _2},
+{C,0,"cursors/magnifying_glass", 2, 311 _2},
+{C,0,"cursors/small_green_cross", 2, 312 _2},
{C,0,"cursors/hourglass", 2, 313 _2},
-{C,0,"cursors/credits arrow", 27, 314 _2},
-{C,0,"cursors/arrow N", 2, 315
_2},
-{C,0,"cursors/arrow NE", 2, 316 _2},
-{C,0,"cursors/arrow E", 2, 317
_2},
-{C,0,"cursors/arrow SE", 2, 318 _2},
-{C,0,"cursors/arrow S", 2, 319
_2},
-{C,0,"cursors/arrow SW", 2, 320 _2},
-{C,0,"cursors/arrow W", 2, 321
_2},
-{C,0,"cursors/arrow NW", 2, 322 _2},
+{C,0,"cursors/credits_arrow", 27, 314 _2},
+{C,0,"cursors/arrow_N", 2, 315
_2},
+{C,0,"cursors/arrow_NE", 2, 316 _2},
+{C,0,"cursors/arrow_E", 2, 317
_2},
+{C,0,"cursors/arrow_SE", 2, 318 _2},
+{C,0,"cursors/arrow_S", 2, 319
_2},
+{C,0,"cursors/arrow_SW", 2, 320 _2},
+{C,0,"cursors/arrow_W", 2, 321
_2},
+{C,0,"cursors/arrow_NW", 2, 322 _2},
{U,0,"ui/bloodlust,haste,slow,invisible,shield", 2, 323 _2},
// --------------------------------------------------------
{G,0,"missiles/lightning", 2, 324 _2},
-{G,0,"missiles/gryphon hammer", 2, 325
_2},
+{G,0,"missiles/gryphon_hammer", 2, 325
_2},
// "fireball (also dragon breath)"
-{G,0,"missiles/dragon breath", 2, 326 _2},
+{G,0,"missiles/dragon_breath", 2, 326 _2},
// "fireball (when casting flameshield)"
{G,0,"missiles/fireball", 2, 327 _2},
-{G,0,"missiles/flame shield", 2, 328 _2},
+{G,0,"missiles/flame_shield", 2, 328 _2},
{G,0,"missiles/blizzard", 2, 329 _2},
-{G,0,"missiles/death and decay", 2, 330 _2},
-{G,0,"missiles/big cannon", 2, 331 _2},
+{G,0,"missiles/death_and_decay", 2, 330 _2},
+{G,0,"missiles/big_cannon", 2, 331 _2},
{G,0,"missiles/exorcism", 2, 332 _2},
-{G,0,"missiles/heal effect", 2, 333 _2},
-{G,0,"missiles/touch of death", 2, 334
_2},
+{G,0,"missiles/heal_effect", 2, 333 _2},
+{G,0,"missiles/touch_of_death", 2, 334
_2},
{G,0,"missiles/rune", 2, 335 _2},
{G,0,"missiles/tornado", 2, 336 _2},
-{G,0,"missiles/catapult rock", 2, 337 _2},
-{G,0,"missiles/ballista bolt", 2, 338 _2},
+{G,0,"missiles/catapult_rock", 2, 337 _2},
+{G,0,"missiles/ballista_bolt", 2, 338 _2},
{G,0,"missiles/arrow", 2, 339 _2},
{G,0,"missiles/axe", 2, 340 _2},
-{G,0,"missiles/submarine missile", 2, 341 _2},
-{G,0,"missiles/turtle missile", 2, 342
_2},
-{G,0,"missiles/small fire", 2, 343 _2},
-{G,0,"missiles/big fire", 2, 344 _2},
-{G,0,"missiles/ballista-catapult impact", 2, 345 _2},
-{G,0,"missiles/normal spell", 2, 346 _2},
+{G,0,"missiles/submarine_missile", 2, 341 _2},
+{G,0,"missiles/turtle_missile", 2, 342
_2},
+{G,0,"missiles/small_fire", 2, 343 _2},
+{G,0,"missiles/big_fire", 2, 344 _2},
+{G,0,"missiles/ballista-catapult_impact", 2, 345 _2},
+{G,0,"missiles/normal_spell", 2, 346 _2},
{G,0,"missiles/explosion", 2, 347 _2},
{G,0,"missiles/cannon", 2, 348
_2},
-{G,0,"missiles/cannon explosion", 2, 349 _2},
-{G,0,"missiles/cannon-tower explosion", 2, 350
_2},
-{G,0,"missiles/daemon fire", 2, 351 _2},
-{G,0,"missiles/green cross", 2, 352 _2},
-{G,0,"missiles/unit shadow", 2, 353 _2},
+{G,0,"missiles/cannon_explosion", 2, 349 _2},
+{G,0,"missiles/cannon-tower_explosion", 2, 350
_2},
+{G,0,"missiles/daemon_fire", 2, 351 _2},
+{G,0,"missiles/green_cross", 2, 352 _2},
+{G,0,"missiles/unit_shadow", 2, 353 _2},
{U,0,"ui/human/infopanel", 2, 354 _2},
{U,0,"ui/orc/infopanel", 2, 355 _2},
{G,0,"tilesets/summer/icons", 2, 356 _2},
@@ -763,19 +763,19 @@
{G,2,"tilesets/swamp/human/buildings/%-100", 438, 509 _2},
{G,2,"tilesets/swamp/orc/buildings/%-101", 438, 510 _2},
{G,2,"tilesets/swamp/neutral/buildings/%94", 438, 511 _2},
-{G,2,"tilesets/swamp/neutral/buildings/destroyed site", 438,
512 _2},
+{G,2,"tilesets/swamp/neutral/buildings/destroyed_site", 438,
512 _2},
{G,2,"tilesets/swamp/neutral/buildings/%103", 438, 513 _2},
{G,2,"tilesets/swamp/neutral/buildings/%104", 438, 514 _2},
{G,2,"tilesets/swamp/neutral/buildings/%95", 438, 515 _2},
-{G,2,"tilesets/swamp/human/buildings/%-74 construction site", 438, 516 _2},
-{G,2,"tilesets/swamp/orc/buildings/%-75 construction site", 438, 517 _2},
-{G,2,"tilesets/swamp/human/buildings/%-88 construction site", 438, 518 _2},
-{G,2,"tilesets/swamp/orc/buildings/%-89 construction site", 438, 519 _2},
-{G,2,"tilesets/swamp/human/buildings/%-86 construction site", 438, 520 _2},
-{G,2,"tilesets/swamp/orc/buildings/%-87 construction site", 438, 521 _2},
-{G,2,"tilesets/swamp/human/buildings/%-80 construction site", 438, 522 _2},
-{G,2,"tilesets/swamp/orc/buildings/%-81 construction site", 438, 523 _2},
-{G,2,"tilesets/swamp/neutral/buildings/small destroyed site", 438, 524 _2},
+{G,2,"tilesets/swamp/human/buildings/%-74_construction_site", 438, 516 _2},
+{G,2,"tilesets/swamp/orc/buildings/%-75_construction_site", 438, 517 _2},
+{G,2,"tilesets/swamp/human/buildings/%-88_construction_site", 438, 518 _2},
+{G,2,"tilesets/swamp/orc/buildings/%-89_construction_site", 438, 519 _2},
+{G,2,"tilesets/swamp/human/buildings/%-86_construction_site", 438, 520 _2},
+{G,2,"tilesets/swamp/orc/buildings/%-87_construction_site", 438, 521 _2},
+{G,2,"tilesets/swamp/human/buildings/%-80_construction_site", 438, 522 _2},
+{G,2,"tilesets/swamp/orc/buildings/%-81_construction_site", 438, 523 _2},
+{G,2,"tilesets/swamp/neutral/buildings/small_destroyed_site", 438, 524 _2},
{G,2,"tilesets/swamp/neutral/buildings/%102", 438, 525 _2},
{G,2,"tilesets/swamp/human/units/%40", 438, 526 _2},
{G,2,"tilesets/swamp/orc/units/%41", 438, 527 _2},
@@ -792,9 +792,9 @@
// 0 file length
// 1 description
-{W,0,"ui/placement error", 2 __},
-{W,0,"ui/placement success", 3 __},
-{W,0,"misc/building construction", 4 __},
+{W,0,"ui/placement_error", 2 __},
+{W,0,"ui/placement_success", 3 __},
+{W,0,"misc/building_construction", 4 __},
{W,0,"human/basic_voices/selected/1", 5 __},
{W,0,"orc/basic_voices/selected/1", 6 __},
{W,0,"human/basic_voices/selected/2", 7 __},
@@ -842,125 +842,125 @@
{W,0,"human/basic_voices/dead", 49
__},
{W,0,"orc/basic_voices/dead", 50 __},
{W,0,"ships/sinking", 51 __},
-{W,0,"misc/building explosion/1", 52 __},
-{W,0,"misc/building explosion/2", 53 __},
-{W,0,"misc/building explosion/3", 54 __},
-{W,0,"missiles/catapult-ballista attack", 55 __},
-{W,0,"misc/tree chopping/1", 56 __},
-{W,0,"misc/tree chopping/2", 57 __},
-{W,0,"misc/tree chopping/3", 58 __},
-{W,0,"misc/tree chopping/4", 59 __},
-{W,0,"missiles/sword attack/1", 60
__},
-{W,0,"missiles/sword attack/2", 61
__},
-{W,0,"missiles/sword attack/3", 62
__},
+{W,0,"misc/building_explosion/1", 52 __},
+{W,0,"misc/building_explosion/2", 53 __},
+{W,0,"misc/building_explosion/3", 54 __},
+{W,0,"missiles/catapult-ballista_attack", 55 __},
+{W,0,"misc/tree_chopping/1", 56 __},
+{W,0,"misc/tree_chopping/2", 57 __},
+{W,0,"misc/tree_chopping/3", 58 __},
+{W,0,"misc/tree_chopping/4", 59 __},
+{W,0,"missiles/sword_attack/1", 60
__},
+{W,0,"missiles/sword_attack/2", 61
__},
+{W,0,"missiles/sword_attack/3", 62
__},
{W,0,"missiles/punch", 63 __},
-{W,0,"missiles/fireball hit", 64 __},
-{W,0,"missiles/fireball throw", 65
__},
-{W,0,"missiles/bow throw", 66 __},
-{W,0,"missiles/bow hit", 67 __},
-{W,0,"spells/basic spell sound", 68 __},
+{W,0,"missiles/fireball_hit", 64 __},
+{W,0,"missiles/fireball_throw", 65
__},
+{W,0,"missiles/bow_throw", 66 __},
+{W,0,"missiles/bow_hit", 67 __},
+{W,0,"spells/basic_spell_sound", 68 __},
{W,0,"buildings/blacksmith", 69 __},
{W,0,"human/buildings/church", 70 __},
-{W,0,"orc/buildings/altar of storms", 71 __},
+{W,0,"orc/buildings/altar_of_storms", 71 __},
{W,0,"human/buildings/stables", 72
__},
-{W,0,"orc/buildings/ogre mound", 73 __},
+{W,0,"orc/buildings/ogre_mound", 73 __},
{W,0,"human/buildings/farm", 74 __},
-{W,0,"orc/buildings/pig farm", 75 __},
-{W,0,"neutral/buildings/gold mine", 76 __},
-{W,0,"missiles/axe throw", 77 __},
+{W,0,"orc/buildings/pig_farm", 75 __},
+{W,0,"neutral/buildings/gold_mine", 76 __},
+{W,0,"missiles/axe_throw", 77 __},
{W,0,"ships/tanker/acknowledgement/1", 78 __},
{W,0,"missiles/fist", 79 __},
{W,0,"buildings/shipyard", 80 __},
{W,0,"human/units/peasant/attack", 81 __},
-{W,0,"buildings/oil platform", 82 __},
-{W,0,"buildings/oil refinery", 83 __},
+{W,0,"buildings/oil_platform", 82 __},
+{W,0,"buildings/oil_refinery", 83 __},
{W,0,"buildings/lumbermill", 84 __},
-{W,0,"misc/transport docking", 85 __},
+{W,0,"misc/transport_docking", 85 __},
{W,0,"misc/burning", 86 __},
-{W,0,"human/buildings/gryphon aviary", 87 __},
-{W,0,"orc/buildings/dragon roost", 88 __},
+{W,0,"human/buildings/gryphon_aviary", 87 __},
+{W,0,"orc/buildings/dragon_roost", 88 __},
{W,0,"buildings/foundry", 89 __},
-{W,0,"human/buildings/gnomish inventor", 90 __},
-{W,0,"orc/buildings/goblin alchemist", 91 __},
-{W,0,"human/buildings/mage tower", 92 __},
-{W,0,"orc/buildings/temple of the damned", 93 __},
+{W,0,"human/buildings/gnomish_inventor", 90 __},
+{W,0,"orc/buildings/goblin_alchemist", 91 __},
+{W,0,"human/buildings/mage_tower", 92 __},
+{W,0,"orc/buildings/temple_of_the_damned", 93 __},
{W,0,"human/capture", 94 __},
{W,0,"orc/capture", 95 __},
{W,0,"human/rescue", 96 __},
{W,0,"orc/rescue", 97 __},
{W,0,"spells/bloodlust", 98 __},
-{W,0,"spells/death and decay", 99 __},
-{W,0,"spells/death coil", 100 __},
+{W,0,"spells/death_and_decay", 99 __},
+{W,0,"spells/death_coil", 100 __},
{W,0,"spells/exorcism", 101
__},
-{W,0,"spells/flame shield", 102 __},
+{W,0,"spells/flame_shield", 102 __},
{W,0,"spells/haste", 103 __},
{W,0,"spells/healing", 104 __},
-{W,0,"spells/holy vision", 105 __},
+{W,0,"spells/holy_vision", 105 __},
{W,0,"spells/blizzard", 106
__},
{W,0,"spells/invisibility", 107 __},
-{W,0,"spells/eye of kilrogg", 108 __},
+{W,0,"spells/eye_of_kilrogg", 108 __},
{W,0,"spells/polymorph", 109 __},
{W,0,"spells/slow", 110 __},
{W,0,"spells/lightning", 111 __},
-{W,0,"spells/touch of darkness", 112 __},
-{W,0,"spells/unholy armor", 113 __},
+{W,0,"spells/touch_of_darkness", 112 __},
+{W,0,"spells/unholy_armor", 113 __},
{W,0,"spells/whirlwind", 114 __},
{W,0,"orc/peon/ready", 115 __},
-{W,0,"orc/units/death knight/annoyed/1", 116 __},
-{W,0,"orc/units/death knight/annoyed/2", 117 __},
-{W,0,"orc/units/death knight/annoyed/3", 118 __},
-{W,0,"orc/units/death knight/ready", 119 __},
-{W,0,"orc/units/death knight/selected/1", 120 __},
-{W,0,"orc/units/death knight/selected/2", 121 __},
-{W,0,"orc/units/death knight/acknowledgement/1", 122 __},
-{W,0,"orc/units/death knight/acknowledgement/2", 123 __},
-{W,0,"orc/units/death knight/acknowledgement/3", 124 __},
-{W,0,"human/units/dwarven demolition squad/annoyed/1", 125 __},
-{W,0,"human/units/dwarven demolition squad/annoyed/2", 126 __},
-{W,0,"human/units/dwarven demolition squad/annoyed/3", 127 __},
-{W,0,"human/units/dwarven demolition squad/ready", 128 __},
-{W,0,"human/units/dwarven demolition squad/selected/1", 129
__},
-{W,0,"human/units/dwarven demolition squad/selected/2", 130
__},
-{W,0,"human/units/dwarven demolition squad/acknowledgement/1", 131 __},
-{W,0,"human/units/dwarven demolition squad/acknowledgement/2", 132 __},
-{W,0,"human/units/dwarven demolition squad/acknowledgement/3", 133 __},
-{W,0,"human/units/dwarven demolition squad/acknowledgement/4", 134 __},
-{W,0,"human/units/dwarven demolition squad/acknowledgement/5", 135 __},
-{W,0,"human/units/elven archer-ranger/annoyed/1", 136 __},
-{W,0,"human/units/elven archer-ranger/annoyed/2", 137 __},
-{W,0,"human/units/elven archer-ranger/annoyed/3", 138 __},
-{W,0,"human/units/elven archer-ranger/ready", 139 __},
-{W,0,"human/units/elven archer-ranger/selected/1", 140 __},
-{W,0,"human/units/elven archer-ranger/selected/2", 141 __},
-{W,0,"human/units/elven archer-ranger/selected/3", 142 __},
-{W,0,"human/units/elven archer-ranger/selected/4", 143 __},
-{W,0,"human/units/elven archer-ranger/acknowledgement/1", 144 __},
-{W,0,"human/units/elven archer-ranger/acknowledgement/2", 145 __},
-{W,0,"human/units/elven archer-ranger/acknowledgement/3", 146 __},
-{W,0,"human/units/elven archer-ranger/acknowledgement/4", 147 __},
-{W,0,"human/units/gnomish flying machine/annoyed/1", 148 __},
-{W,0,"human/units/gnomish flying machine/annoyed/2", 149 __},
-{W,0,"human/units/gnomish flying machine/annoyed/3", 150 __},
-{W,0,"human/units/gnomish flying machine/annoyed/4", 151 __},
-{W,0,"human/units/gnomish flying machine/annoyed/5", 152 __},
-{W,0,"human/units/gnomish flying machine/ready", 153 __},
-{W,0,"human/units/gnomish flying machine/acknowledgement/1", 154 __},
-{W,0,"orc/units/goblin sappers/annoyed/1", 155 __},
-{W,0,"orc/units/goblin sappers/annoyed/2", 156 __},
-{W,0,"orc/units/goblin sappers/annoyed/3", 157 __},
-{W,0,"orc/units/goblin sappers/ready", 158 __},
-{W,0,"orc/units/goblin sappers/selected/1", 159 __},
-{W,0,"orc/units/goblin sappers/selected/2", 160 __},
-{W,0,"orc/units/goblin sappers/selected/3", 161 __},
-{W,0,"orc/units/goblin sappers/selected/4", 162 __},
-{W,0,"orc/units/goblin sappers/acknowledgement/1", 163 __},
-{W,0,"orc/units/goblin sappers/acknowledgement/2", 164 __},
-{W,0,"orc/units/goblin sappers/acknowledgement/3", 165 __},
-{W,0,"orc/units/goblin sappers/acknowledgement/4", 166 __},
-{W,0,"orc/units/goblin zeppelin/annoyed/1", 167 __},
-{W,0,"orc/units/goblin zeppelin/annoyed/2", 168 __},
-{W,0,"orc/units/goblin zeppelin/ready", 169
__},
-{W,0,"orc/units/goblin zeppelin/acknowledgement/1", 170 __},
+{W,0,"orc/units/death_knight/annoyed/1", 116 __},
+{W,0,"orc/units/death_knight/annoyed/2", 117 __},
+{W,0,"orc/units/death_knight/annoyed/3", 118 __},
+{W,0,"orc/units/death_knight/ready", 119 __},
+{W,0,"orc/units/death_knight/selected/1", 120 __},
+{W,0,"orc/units/death_knight/selected/2", 121 __},
+{W,0,"orc/units/death_knight/acknowledgement/1", 122 __},
+{W,0,"orc/units/death_knight/acknowledgement/2", 123 __},
+{W,0,"orc/units/death_knight/acknowledgement/3", 124 __},
+{W,0,"human/units/dwarven_demolition_squad/annoyed/1", 125 __},
+{W,0,"human/units/dwarven_demolition_squad/annoyed/2", 126 __},
+{W,0,"human/units/dwarven_demolition_squad/annoyed/3", 127 __},
+{W,0,"human/units/dwarven_demolition_squad/ready", 128 __},
+{W,0,"human/units/dwarven_demolition_squad/selected/1", 129
__},
+{W,0,"human/units/dwarven_demolition_squad/selected/2", 130
__},
+{W,0,"human/units/dwarven_demolition_squad/acknowledgement/1", 131 __},
+{W,0,"human/units/dwarven_demolition_squad/acknowledgement/2", 132 __},
+{W,0,"human/units/dwarven_demolition_squad/acknowledgement/3", 133 __},
+{W,0,"human/units/dwarven_demolition_squad/acknowledgement/4", 134 __},
+{W,0,"human/units/dwarven_demolition_squad/acknowledgement/5", 135 __},
+{W,0,"human/units/elven_archer-ranger/annoyed/1", 136 __},
+{W,0,"human/units/elven_archer-ranger/annoyed/2", 137 __},
+{W,0,"human/units/elven_archer-ranger/annoyed/3", 138 __},
+{W,0,"human/units/elven_archer-ranger/ready", 139 __},
+{W,0,"human/units/elven_archer-ranger/selected/1", 140 __},
+{W,0,"human/units/elven_archer-ranger/selected/2", 141 __},
+{W,0,"human/units/elven_archer-ranger/selected/3", 142 __},
+{W,0,"human/units/elven_archer-ranger/selected/4", 143 __},
+{W,0,"human/units/elven_archer-ranger/acknowledgement/1", 144 __},
+{W,0,"human/units/elven_archer-ranger/acknowledgement/2", 145 __},
+{W,0,"human/units/elven_archer-ranger/acknowledgement/3", 146 __},
+{W,0,"human/units/elven_archer-ranger/acknowledgement/4", 147 __},
+{W,0,"human/units/gnomish_flying_machine/annoyed/1", 148 __},
+{W,0,"human/units/gnomish_flying_machine/annoyed/2", 149 __},
+{W,0,"human/units/gnomish_flying_machine/annoyed/3", 150 __},
+{W,0,"human/units/gnomish_flying_machine/annoyed/4", 151 __},
+{W,0,"human/units/gnomish_flying_machine/annoyed/5", 152 __},
+{W,0,"human/units/gnomish_flying_machine/ready", 153 __},
+{W,0,"human/units/gnomish_flying_machine/acknowledgement/1", 154 __},
+{W,0,"orc/units/goblin_sappers/annoyed/1", 155 __},
+{W,0,"orc/units/goblin_sappers/annoyed/2", 156 __},
+{W,0,"orc/units/goblin_sappers/annoyed/3", 157 __},
+{W,0,"orc/units/goblin_sappers/ready", 158 __},
+{W,0,"orc/units/goblin_sappers/selected/1", 159 __},
+{W,0,"orc/units/goblin_sappers/selected/2", 160 __},
+{W,0,"orc/units/goblin_sappers/selected/3", 161 __},
+{W,0,"orc/units/goblin_sappers/selected/4", 162 __},
+{W,0,"orc/units/goblin_sappers/acknowledgement/1", 163 __},
+{W,0,"orc/units/goblin_sappers/acknowledgement/2", 164 __},
+{W,0,"orc/units/goblin_sappers/acknowledgement/3", 165 __},
+{W,0,"orc/units/goblin_sappers/acknowledgement/4", 166 __},
+{W,0,"orc/units/goblin_zeppelin/annoyed/1", 167 __},
+{W,0,"orc/units/goblin_zeppelin/annoyed/2", 168 __},
+{W,0,"orc/units/goblin_zeppelin/ready", 169
__},
+{W,0,"orc/units/goblin_zeppelin/acknowledgement/1", 170 __},
{W,0,"human/units/knight/annoyed/1", 171 __},
{W,0,"human/units/knight/annoyed/2", 172 __},
{W,0,"human/units/knight/annoyed/3", 173 __},
@@ -1029,20 +1029,20 @@
{W,0,"orc/ships/acknowledgement/2", 236 __},
{W,0,"human/ships/acknowledgement/3", 237 __},
{W,0,"orc/ships/acknowledgement/3", 238 __},
-{W,0,"human/ships/gnomish submarine/annoyed/1", 239
__},
-{W,0,"human/ships/gnomish submarine/annoyed/2", 240
__},
-{W,0,"human/ships/gnomish submarine/annoyed/3", 241
__},
-{W,0,"human/ships/gnomish submarine/annoyed/4", 242
__},
-{W,0,"orc/units/troll axethrower-berserker/annoyed/1", 243 __},
-{W,0,"orc/units/troll axethrower-berserker/annoyed/2", 244 __},
-{W,0,"orc/units/troll axethrower-berserker/annoyed/3", 245 __},
-{W,0,"orc/units/troll axethrower-berserker/ready", 246 __},
-{W,0,"orc/units/troll axethrower-berserker/selected/1", 247
__},
-{W,0,"orc/units/troll axethrower-berserker/selected/2", 248
__},
-{W,0,"orc/units/troll axethrower-berserker/selected/3", 249
__},
-{W,0,"orc/units/troll axethrower-berserker/acknowledgement/1", 250 __},
-{W,0,"orc/units/troll axethrower-berserker/acknowledgement/2", 251 __},
-{W,0,"orc/units/troll axethrower-berserker/acknowledgement/3", 252 __},
+{W,0,"human/ships/gnomish_submarine/annoyed/1", 239
__},
+{W,0,"human/ships/gnomish_submarine/annoyed/2", 240
__},
+{W,0,"human/ships/gnomish_submarine/annoyed/3", 241
__},
+{W,0,"human/ships/gnomish_submarine/annoyed/4", 242
__},
+{W,0,"orc/units/troll_axethrower-berserker/annoyed/1", 243 __},
+{W,0,"orc/units/troll_axethrower-berserker/annoyed/2", 244 __},
+{W,0,"orc/units/troll_axethrower-berserker/annoyed/3", 245 __},
+{W,0,"orc/units/troll_axethrower-berserker/ready", 246 __},
+{W,0,"orc/units/troll_axethrower-berserker/selected/1", 247
__},
+{W,0,"orc/units/troll_axethrower-berserker/selected/2", 248
__},
+{W,0,"orc/units/troll_axethrower-berserker/selected/3", 249
__},
+{W,0,"orc/units/troll_axethrower-berserker/acknowledgement/1", 250 __},
+{W,0,"orc/units/troll_axethrower-berserker/acknowledgement/2", 251 __},
+{W,0,"orc/units/troll_axethrower-berserker/acknowledgement/3", 252 __},
{W,0,"human/units/mage/annoyed/1", 253 __},
{W,0,"human/units/mage/annoyed/2", 254 __},
{W,0,"human/units/mage/annoyed/3", 255 __},
@@ -1073,9 +1073,9 @@
{W,0,"orc/units/dragon/selected/1", 280 __},
{W,0,"orc/units/dragon/acknowledgement/1", 281 __},
{W,0,"orc/units/dragon/acknowledgement/2", 282 __},
-{W,0,"human/units/gryphon rider/selected/1", 283 __},
-{W,0,"human/units/gryphon rider/ready", 284
__},
-{W,0,"human/units/gryphon rider/acknowledgement/2", 285 __},
+{W,0,"human/units/gryphon_rider/selected/1", 283 __},
+{W,0,"human/units/gryphon_rider/ready", 284
__},
+{W,0,"human/units/gryphon_rider/acknowledgement/2", 285 __},
{W,0,"neutral/units/sheep/selected/1", 286 __},
{W,0,"neutral/units/sheep/annoyed/1", 287 __},
{W,0,"neutral/units/seal/selected/1", 288 __},
@@ -1146,33 +1146,33 @@
{W,2,"orc/units/dentarg/acknowledgement/1", 353 __},
{W,2,"orc/units/dentarg/acknowledgement/2", 354 __},
{W,2,"orc/units/dentarg/acknowledgement/3", 355 __},
-{W,2,"orc/units/grom hellscream/annoyed/1", 356 __},
-{W,2,"orc/units/grom hellscream/annoyed/2", 357 __},
-{W,2,"orc/units/grom hellscream/annoyed/3", 358 __},
-{W,2,"orc/units/grom hellscream/selected/1", 359 __},
-{W,2,"orc/units/grom hellscream/selected/2", 360 __},
-{W,2,"orc/units/grom hellscream/selected/3", 361 __},
-{W,2,"orc/units/grom hellscream/acknowledgement/1", 362 __},
-{W,2,"orc/units/grom hellscream/acknowledgement/2", 363 __},
-{W,2,"orc/units/grom hellscream/acknowledgement/3", 364 __},
-{W,2,"orc/units/korgath bladefist/annoyed/1", 365 __},
-{W,2,"orc/units/korgath bladefist/annoyed/2", 366 __},
-{W,2,"orc/units/korgath bladefist/annoyed/3", 367 __},
-{W,2,"orc/units/korgath bladefist/selected/1", 368 __},
-{W,2,"orc/units/korgath bladefist/selected/2", 369 __},
-{W,2,"orc/units/korgath bladefist/selected/3", 370 __},
-{W,2,"orc/units/korgath bladefist/acknowledgement/1", 371 __},
-{W,2,"orc/units/korgath bladefist/acknowledgement/2", 372 __},
-{W,2,"orc/units/korgath bladefist/acknowledgement/3", 373 __},
-{W,2,"orc/units/teron gorefiend/annoyed/1", 374 __},
-{W,2,"orc/units/teron gorefiend/annoyed/2", 375 __},
-{W,2,"orc/units/teron gorefiend/annoyed/3", 376 __},
-{W,2,"orc/units/teron gorefiend/selected/1", 377 __},
-{W,2,"orc/units/teron gorefiend/selected/2", 378 __},
-{W,2,"orc/units/teron gorefiend/selected/3", 379 __},
-{W,2,"orc/units/teron gorefiend/acknowledgement/1", 380 __},
-{W,2,"orc/units/teron gorefiend/acknowledgement/2", 381 __},
-{W,2,"orc/units/teron gorefiend/acknowledgement/3", 382 __},
+{W,2,"orc/units/grom_hellscream/annoyed/1", 356 __},
+{W,2,"orc/units/grom_hellscream/annoyed/2", 357 __},
+{W,2,"orc/units/grom_hellscream/annoyed/3", 358 __},
+{W,2,"orc/units/grom_hellscream/selected/1", 359 __},
+{W,2,"orc/units/grom_hellscream/selected/2", 360 __},
+{W,2,"orc/units/grom_hellscream/selected/3", 361 __},
+{W,2,"orc/units/grom_hellscream/acknowledgement/1", 362 __},
+{W,2,"orc/units/grom_hellscream/acknowledgement/2", 363 __},
+{W,2,"orc/units/grom_hellscream/acknowledgement/3", 364 __},
+{W,2,"orc/units/korgath_bladefist/annoyed/1", 365 __},
+{W,2,"orc/units/korgath_bladefist/annoyed/2", 366 __},
+{W,2,"orc/units/korgath_bladefist/annoyed/3", 367 __},
+{W,2,"orc/units/korgath_bladefist/selected/1", 368 __},
+{W,2,"orc/units/korgath_bladefist/selected/2", 369 __},
+{W,2,"orc/units/korgath_bladefist/selected/3", 370 __},
+{W,2,"orc/units/korgath_bladefist/acknowledgement/1", 371 __},
+{W,2,"orc/units/korgath_bladefist/acknowledgement/2", 372 __},
+{W,2,"orc/units/korgath_bladefist/acknowledgement/3", 373 __},
+{W,2,"orc/units/teron_gorefiend/annoyed/1", 374 __},
+{W,2,"orc/units/teron_gorefiend/annoyed/2", 375 __},
+{W,2,"orc/units/teron_gorefiend/annoyed/3", 376 __},
+{W,2,"orc/units/teron_gorefiend/selected/1", 377 __},
+{W,2,"orc/units/teron_gorefiend/selected/2", 378 __},
+{W,2,"orc/units/teron_gorefiend/selected/3", 379 __},
+{W,2,"orc/units/teron_gorefiend/acknowledgement/1", 380 __},
+{W,2,"orc/units/teron_gorefiend/acknowledgement/2", 381 __},
+{W,2,"orc/units/teron_gorefiend/acknowledgement/3", 382 __},
{W,2,"neutral/units/warthog/selected/1", 383 __},
{W,2,"neutral/units/warthog/annoyed/1", 384
__},
@@ -1187,43 +1187,43 @@
#endif
// (correct palette is #2 in maindat)
-{U,0,"ui/buttons 1", 14, 0 _2},
+{U,0,"ui/buttons_1", 14, 0 _2},
// (correct palette is #2 in maindat)
-{U,0,"ui/buttons 2", 14, 1 _2},
+{U,0,"ui/buttons_2", 14, 1 _2},
{I,0,"ui/cd-icon", 14, 2 _2},
-{I,0,"ui/human/panel 1", 14, 3 _2},
-{I,0,"ui/orc/panel 1", 14, 4 _2},
-{I,0,"ui/human/panel 2", 14, 5 _2},
-{I,0,"ui/orc/panel 2", 14, 6 _2},
-{I,0,"ui/human/panel 3", 14, 7 _2},
-{I,0,"ui/orc/panel 3", 14, 8 _2},
-{I,0,"ui/human/panel 4", 14, 9 _2},
-{I,0,"ui/orc/panel 4", 14, 10 _2},
-{I,0,"ui/human/panel 5", 14, 11 _2},
-{I,0,"ui/orc/panel 5", 14, 12 _2},
-{I,0,"ui/Menu background with title", 14, 13 _2},
-{I,0,"ui/Menu background without title", 16, 15 _2},
-{I,0,"../campaigns/human/interface/Act I - Shores of Lordareon",17, 19 _2},
-{I,0,"../campaigns/orc/interface/Act I - Seas of Blood", 17, 20 _2},
-{I,0,"../campaigns/human/interface/Act II - Khaz Modan", 17, 21 _2},
-{I,0,"../campaigns/orc/interface/Act II - Khaz Modan", 17, 22
_2},
-{I,0,"../campaigns/human/interface/Act III - The Northlands", 17, 23 _2},
-{I,0,"../campaigns/orc/interface/Act III - Quel'Thalas", 17, 24 _2},
-{I,0,"../campaigns/human/interface/Act IV - Return to Azeroth",17, 25 _2},
-{I,0,"../campaigns/orc/interface/Act IV - Tides of Darkness", 17, 26 _2},
+{I,0,"ui/human/panel_1", 14, 3 _2},
+{I,0,"ui/orc/panel_1", 14, 4 _2},
+{I,0,"ui/human/panel_2", 14, 5 _2},
+{I,0,"ui/orc/panel_2", 14, 6 _2},
+{I,0,"ui/human/panel_3", 14, 7 _2},
+{I,0,"ui/orc/panel_3", 14, 8 _2},
+{I,0,"ui/human/panel_4", 14, 9 _2},
+{I,0,"ui/orc/panel_4", 14, 10 _2},
+{I,0,"ui/human/panel_5", 14, 11 _2},
+{I,0,"ui/orc/panel_5", 14, 12 _2},
+{I,0,"ui/Menu_background_with_title", 14, 13 _2},
+{I,0,"ui/Menu_background_without_title", 16, 15 _2},
+{I,0,"../campaigns/human/interface/Act_I_-_Shores_of_Lordareon",17, 19 _2},
+{I,0,"../campaigns/orc/interface/Act_I_-_Seas_of_Blood", 17, 20 _2},
+{I,0,"../campaigns/human/interface/Act_II_-_Khaz_Modan", 17, 21 _2},
+{I,0,"../campaigns/orc/interface/Act_II_-_Khaz_Modan", 17, 22 _2},
+{I,0,"../campaigns/human/interface/Act_III_-_The_Northlands", 17, 23 _2},
+{I,0,"../campaigns/orc/interface/Act_III_-_Quel'Thalas", 17, 24 _2},
+{I,0,"../campaigns/human/interface/Act_IV_-_Return_to_Azeroth",17, 25 _2},
+{I,0,"../campaigns/orc/interface/Act_IV_-_Tides_of_Darkness", 17, 26 _2},
-{I,0,"ui/human/The End", 27, 29 _2},
-{I,0,"ui/orc/Smashing of Lordaeron scroll", 32, 30 _2},
+{I,0,"ui/human/The_End", 27, 29 _2},
+{I,0,"ui/orc/Smashing_of_Lordaeron_scroll", 32, 30 _2},
{I,2,"ui/Patch", 14, 91 _2},
-{I,2,"ui/Credits for extension background", 93, 94 _2},
-{I,2,"../campaigns/human-exp/interface/Act I - A Time for Heroes",17,96 _2},
-{I,2,"../campaigns/orc-exp/interface/Act I - Draenor, the Red World",17,97
_2},
-{I,2,"../campaigns/human-exp/interface/Act II - Draenor, the Red World",17,98
_2},
-{I,2,"../campaigns/orc-exp/interface/Act II - The Burning of Azeroth",17,99
_2},
-{I,2,"../campaigns/human-exp/interface/Act III- War in the Shadows",17, 100
_2},
-{I,2,"../campaigns/orc-exp/interface/Act III- The Great Sea", 17, 101 _2},
-{I,2,"../campaigns/human-exp/interface/Act IV - The Measure of Valor",17,102
_2},
-{I,2,"../campaigns/orc-exp/interface/Act IV - Prelude to New Worlds",17,103
_2},
+{I,2,"ui/Credits_for_extension_background", 93, 94 _2},
+{I,2,"../campaigns/human-exp/interface/Act_I_-_A_Time_for_Heroes",17,96 _2},
+{I,2,"../campaigns/orc-exp/interface/Act_I_-_Draenor,_the_Red_World",17,97 _2},
+{I,2,"../campaigns/human-exp/interface/Act_II_-_Draenor,_the_Red_World",17,98
_2},
+{I,2,"../campaigns/orc-exp/interface/Act_II_-_The_Burning_of_Azeroth",17,99
_2},
+{I,2,"../campaigns/human-exp/interface/Act_III_-_War_in_the_Shadows",17, 100
_2},
+{I,2,"../campaigns/orc-exp/interface/Act_III_-_The_Great_Sea", 17, 101 _2},
+{I,2,"../campaigns/human-exp/interface/Act_IV_-_The_Measure_of_Valor",17,102
_2},
+{I,2,"../campaigns/orc-exp/interface/Act_IV_-_Prelude_to_New_Worlds",17,103
_2},
///////////////////////////////////////////////////////////////////////////////
// SPEACH INTROS
@@ -3483,6 +3483,8 @@
int i;
int f;
+ DebugLevel3("%s -> " _C_ input);
+
for( sp=input,dp=buf; *sp; ) {
if( *sp=='%' ) {
f=0;
@@ -3499,6 +3501,9 @@
if( *tp=='-' ) {
*dp++='_';
tp++;
+ } else if (*tp==' ') {
+ *dp++='_';
+ tp++;
} else {
*dp++=tolower(*tp++);
}
@@ -3509,6 +3514,7 @@
}
*dp='\0';
+ DebugLevel3("%s\n" _C_ buf);
return buf;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus src/action/action_build.c src/ai/ai_b...,
Crestez Leonard <=