Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8071) -Fix (r5999): [FS#536] Merging 32bit dates broke the inauguration date of companies in

Browse Source 
oldloader: "The year the company was inaugurated (full value, not base-1920)"
 (Marcin Grzegorczyk's TTD internals site)
This commit is contained in:
Darkvater 2007-01-12 00:44:49 +00:00
parent 101f544ca8
commit a3e33358df
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/oldloader.cpp
View File

@ -724,7 +724,6 @@ static bool LoadOldIndustry(LoadgameState *ls, int num)
} }
static PlayerID _current_player_id; static PlayerID _current_player_id;
static uint16 _old_inaugurated_year;
static int32 _old_yearly; static int32 _old_yearly;
static const OldChunks player_yearly_chunk[] = { static const OldChunks player_yearly_chunk[] = {
@ -939,9 +938,9 @@ static const OldChunks player_chunk[] = {
OCL_CHUNK( 3, OldPlayerYearly ), OCL_CHUNK( 3, OldPlayerYearly ),
OCL_CHUNK( 1, OldPlayerEconomy ), OCL_CHUNK( 1, OldPlayerEconomy ),
OCL_VAR ( OC_UINT16, 1, &_old_inaugurated_year ), OCL_SVAR( OC_FILE_U16 | OC_VAR_I32, Player, inaugurated_year),
OCL_SVAR( OC_TILE, Player, last_build_coordinate ), OCL_SVAR( OC_TILE, Player, last_build_coordinate ),
OCL_SVAR( OC_UINT8, Player, num_valid_stat_ent ), OCL_SVAR( OC_UINT8, Player, num_valid_stat_ent ),
OCL_CHUNK( 1, OldPlayerAI ), OCL_CHUNK( 1, OldPlayerAI ),
@ -990,7 +989,7 @@ static bool LoadOldPlayer(LoadgameState *ls, int num)
p->money64 = p->player_money = p->current_loan = 100000; p->money64 = p->player_money = p->current_loan = 100000;
_player_colors[num] = p->player_color; _player_colors[num] = p->player_color;
p->inaugurated_year = _old_inaugurated_year; p->inaugurated_year -= ORIGINAL_BASE_YEAR;
if (p->location_of_house == 0xFFFF) if (p->location_of_house == 0xFFFF)
p->location_of_house = 0; p->location_of_house = 0;