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

(svn r546) -newgrf: Use GetCustomVehicleIcon() for fetching sprites for vehicle selection dialogs. (Idea by octo, done by pasky).

This commit is contained in:
darkvater 2004-11-12 17:16:13 +00:00
parent acaff32984
commit e7441c39e3
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine.h
View File

@ -91,7 +91,9 @@ int GetCustomEngineSprite(byte engine, uint16 overriding_engine, byte cargo, byt
GetCustomEngineSprite(v->engine_type, v->type == VEH_Train ? v->u.rail.first_engine : -1, \
_global_cargo_id[_opt.landscape][v->cargo_type], \
((v->cargo_count + 1) * 100) / (v->cargo_cap + 1), \
!!v->cur_speed, direction);
!!v->cur_speed, direction)
#define GetCustomVehicleIcon(v, direction) \
GetCustomEngineSprite(v, -1, CID_PURCHASE, 0, 0, direction)
void SetCustomEngineName(int engine, char *name);
StringID GetCustomEngineName(int engine);

2
ship_cmd.c
View File

@ -24,7 +24,7 @@ void DrawShipEngine(int x, int y, int engine, uint32 image_ormod)
int spritenum = ship_vehicle_info(engine).image_index;
if (is_custom_sprite(spritenum)) {
int sprite = GetCustomEngineSprite(engine, 0xffff, CID_PURCHASE, 0, 0, 6);
int sprite = GetCustomVehicleIcon(engine, 6);
if (sprite) {
DrawSprite(sprite | image_ormod, x, y);

4
train_cmd.c
View File

@ -174,7 +174,7 @@ void DrawTrainEngine(int x, int y, int engine, uint32 image_ormod)
uint32 image = 0;
if (is_custom_sprite(img)) {
image = GetCustomEngineSprite(engine, -1, CID_PURCHASE, 0, 0, 6);
image = GetCustomVehicleIcon(engine, 6);
if (!image) img = _engine_original_sprites[engine];
}
if (!image) {
@ -186,7 +186,7 @@ void DrawTrainEngine(int x, int y, int engine, uint32 image_ormod)
x += 15;
image = 0;
if (is_custom_sprite(img)) {
image = GetCustomEngineSprite(engine, -1, CID_PURCHASE, 0, 0, 2);
image = GetCustomVehicleIcon(engine, 2);
if (!image) img = _engine_original_sprites[engine];
}
if (!image) {