mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r3832) Replace some magic numbers by (Diag)Direction enums

This commit is contained in:
tron 2006-03-12 17:42:04 +00:00
parent 12d252d9bd
commit b05a98fdfa
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aircraft_cmd.c
View File

@ -110,7 +110,7 @@ void DrawAircraftEngine(int x, int y, EngineID engine, uint32 image_ormod)
int sprite = (6 + _aircraft_sprite[spritenum]); int sprite = (6 + _aircraft_sprite[spritenum]);
if (is_custom_sprite(spritenum)) { if (is_custom_sprite(spritenum)) {
sprite = GetCustomVehicleIcon(engine, 6); sprite = GetCustomVehicleIcon(engine, DIR_W);
if (!sprite) if (!sprite)
spritenum = orig_aircraft_vehicle_info[engine - AIRCRAFT_ENGINES_INDEX].image_index; spritenum = orig_aircraft_vehicle_info[engine - AIRCRAFT_ENGINES_INDEX].image_index;
} }

8
roadveh_cmd.c
View File

@ -82,7 +82,7 @@ void DrawRoadVehEngine(int x, int y, EngineID engine, uint32 image_ormod)
int spritenum = RoadVehInfo(engine)->image_index; int spritenum = RoadVehInfo(engine)->image_index;
if (is_custom_sprite(spritenum)) { if (is_custom_sprite(spritenum)) {
int sprite = GetCustomVehicleIcon(engine, 6); int sprite = GetCustomVehicleIcon(engine, DIR_W);
if (sprite != 0) { if (sprite != 0) {
DrawSprite(sprite | image_ormod, x, y); DrawSprite(sprite | image_ormod, x, y);
@ -286,9 +286,9 @@ typedef struct RoadFindDepotData {
byte owner; byte owner;
} RoadFindDepotData; } RoadFindDepotData;
static const byte _road_pf_directions[16] = { static const DiagDirection _road_pf_directions[] = {
0, 1, 0, 1, 2, 1, 255, 255, DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_SW, DIAGDIR_SE, 255, 255,
2, 3, 3, 2, 3, 0, 255, 255, DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_NW, DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_NE, 255, 255
}; };
static bool EnumRoadSignalFindDepot(TileIndex tile, void* data, int track, uint length, byte* state) static bool EnumRoadSignalFindDepot(TileIndex tile, void* data, int track, uint length, byte* state)

2
ship_cmd.c
View File

@ -33,7 +33,7 @@ void DrawShipEngine(int x, int y, EngineID engine, uint32 image_ormod)
int spritenum = ShipVehInfo(engine)->image_index; int spritenum = ShipVehInfo(engine)->image_index;
if (is_custom_sprite(spritenum)) { if (is_custom_sprite(spritenum)) {
int sprite = GetCustomVehicleIcon(engine, 6); int sprite = GetCustomVehicleIcon(engine, DIR_W);
if (sprite != 0) { if (sprite != 0) {
DrawSprite(sprite | image_ormod, x, y); DrawSprite(sprite | image_ormod, x, y);

16
train_cmd.c
View File

@ -400,7 +400,7 @@ void DrawTrainEngine(int x, int y, EngineID engine, uint32 image_ormod)
uint32 image = 0; uint32 image = 0;
if (is_custom_sprite(img)) { if (is_custom_sprite(img)) {
image = GetCustomVehicleIcon(engine, 6); image = GetCustomVehicleIcon(engine, DIR_W);
if (image == 0) { if (image == 0) {
img = orig_rail_vehicle_info[engine].image_index; img = orig_rail_vehicle_info[engine].image_index;
} else { } else {
@ -3153,13 +3153,13 @@ static bool TrainCheckIfLineEnds(Vehicle *v)
y = v->y_pos & 0xF; y = v->y_pos & 0xF;
switch (v->direction) { switch (v->direction) {
case 0: x = ~x + ~y + 24; break; case DIR_N : x = ~x + ~y + 24; break;
case 7: x = y; /* FALLTHROUGH */ case DIR_NW: x = y; /* FALLTHROUGH */
case 1: x = ~x + 16; break; case DIR_NE: x = ~x + 16; break;
case 2: x = ~x + y + 8; break; case DIR_E : x = ~x + y + 8; break;
case 3: x = y; break; case DIR_SE: x = y; break;
case 4: x = x + y - 8; break; case DIR_S : x = x + y - 8; break;
case 6: x = ~y + x + 8; break; case DIR_W : x = ~y + x + 8; break;
} }
if (GB(ts, 0, 16) != 0) { if (GB(ts, 0, 16) != 0) {