diff options
| author | darkvater <darkvater@openttd.org> | 2004-11-14 10:18:15 +0000 |
|---|---|---|
| committer | darkvater <darkvater@openttd.org> | 2004-11-14 10:18:15 +0000 |
| commit | 4f6fa3b4682f286f8a2deb87a116c7a99de502aa (patch) | |
| tree | d317e8204470b0ddb87b7ecc309dfcb6da37ef1f /oldloader.c | |
| parent | a9a7957eaa90de74344329aefb4bb15048d2f667 (diff) | |
| download | openttd-4f6fa3b4682f286f8a2deb87a116c7a99de502aa.tar.xz | |
(svn r584) -newgrf: Increase chance to get a TTDPatch savegame using custom GRF files loaded (pasky)
Diffstat (limited to 'oldloader.c')
| -rw-r--r-- | oldloader.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/oldloader.c b/oldloader.c index b4aa43c22..3bf64ecbb 100644 --- a/oldloader.c +++ b/oldloader.c @@ -11,6 +11,7 @@ extern byte _name_array[512][32]; extern TileIndex _animated_tile_list[256]; +extern uint16 _custom_sprites_base; #if defined(_MSC_VER) #pragma pack(push, 1) @@ -758,6 +759,8 @@ static void FixVehicle(Vehicle *n, OldVehicle *o, int num) n->owner = o->owner; n->tile = o->tile; n->cur_image = o->cur_image; + if (o->cur_image >= 0x2000) // TTDPatch maps sprites from 0x2000 up. + n->cur_image -= 0x2000 - _custom_sprites_base; n->vehstatus = o->vehstatus; n->cur_speed = o->cur_speed; @@ -774,7 +777,11 @@ static void FixVehicle(Vehicle *n, OldVehicle *o, int num) n->build_year = o->build_year; n->unitnumber = o->unitnumber; n->engine_type = o->engine_type; - n->spritenum = o->spritenum>>1; + switch (o->spritenum) { + case 0xfd: n->spritenum = 0xfd; break; + case 0xff: n->spritenum = 0xfe; break; + default: n->spritenum = o->spritenum >> 1; break; + } n->day_counter = o->day_counter; n->breakdowns_since_last_service = o->breakdowns_since_last_service; n->breakdown_ctr = o->breakdown_ctr; @@ -1108,7 +1115,7 @@ bool LoadOldSaveGame(const char *file) _opt.currency = m->currency; _opt.kilometers = m->use_kilometers; _opt.town_name = m->town_name_type; - _opt.landscape = m->landscape_type; + _opt.landscape = m->landscape_type & 0xf; _opt.snow_line = m->snow_line_height; _opt.autosave = 0; _opt.road_side = m->road_side; |