mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15731) -Codechange: unify submarine creation

release/0.7
rubidium 2009-03-15 21:29:07 +00:00
parent 95cff9979c
commit 64dcd8acc5
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/disaster_cmd.cpp
View File

@ -875,12 +875,10 @@ static void Disaster_Big_Ufo_Init()
} }
/* Curious submarine #1, just floats around */ static void Disaster_Submarine_Init(DisasterSubType subtype)
static void Disaster_Small_Submarine_Init()
{ {
if (!Vehicle::CanAllocateItem()) return; if (!Vehicle::CanAllocateItem()) return;
Vehicle *v = new DisasterVehicle();
int y; int y;
Direction dir; Direction dir;
uint32 r = Random(); uint32 r = Random();
@ -893,31 +891,23 @@ static void Disaster_Small_Submarine_Init()
y = TILE_SIZE / 2; y = TILE_SIZE / 2;
dir = DIR_SE; dir = DIR_SE;
} }
InitializeDisasterVehicle(v, x, y, 0, dir, ST_Small_Submarine);
Vehicle *v = new DisasterVehicle();
InitializeDisasterVehicle(v, x, y, 0, dir, subtype);
v->age = 0; v->age = 0;
} }
/* Curious submarine #1, just floats around */
static void Disaster_Small_Submarine_Init()
{
Disaster_Submarine_Init(ST_Small_Submarine);
}
/* Curious submarine #2, just floats around */ /* Curious submarine #2, just floats around */
static void Disaster_Big_Submarine_Init() static void Disaster_Big_Submarine_Init()
{ {
if (!Vehicle::CanAllocateItem()) return; Disaster_Submarine_Init(ST_Big_Submarine);
Vehicle *v = new DisasterVehicle();
int y;
Direction dir;
uint32 r = Random();
int x = TileX(r) * TILE_SIZE + TILE_SIZE / 2;
if (HasBit(r, 31)) {
y = MapMaxX() * TILE_SIZE - TILE_SIZE / 2 - 1;
dir = DIR_NW;
} else {
y = TILE_SIZE / 2;
dir = DIR_SE;
}
InitializeDisasterVehicle(v, x, y, 0, dir, ST_Big_Submarine);
v->age = 0;
} }