gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-06 22:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r11823) -Fix (r11822): Custom names from old TTD games were not updated.

Browse Source
This commit is contained in:
peter1138 2008-01-12 21:01:27 +00:00
parent ab8382c0db
commit e677814a4b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine.h
View File

@ -212,8 +212,6 @@ static inline Engine* GetEngine(EngineID i)
return &_engines[i]; return &_engines[i];
} }
VARDEF StringID _engine_name_strings[TOTAL_NUM_ENGINES];
static inline bool IsEngineIndex(uint index) static inline bool IsEngineIndex(uint index)
{ {
return index < TOTAL_NUM_ENGINES; return index < TOTAL_NUM_ENGINES;

9
src/oldloader.cpp
View File

@ -1306,6 +1306,13 @@ static bool LoadOldEngine(LoadgameState *ls, int num)
return true; return true;
} }
static bool LoadOldEngineName(LoadgameState *ls, int num)
{
Engine *e = GetEngine(num);
e->name = CopyFromOldName(RemapOldStringID(ReadUint16(ls)));
return true;
}
static const OldChunks subsidy_chunk[] = { static const OldChunks subsidy_chunk[] = {
OCL_SVAR( OC_UINT8, Subsidy, cargo_type ), OCL_SVAR( OC_UINT8, Subsidy, cargo_type ),
OCL_SVAR( OC_UINT8, Subsidy, age ), OCL_SVAR( OC_UINT8, Subsidy, age ),
@ -1512,7 +1519,7 @@ static const OldChunks main_chunk[] = {
OCL_NULL( 144 ), ///< cargo-stuff, calculated in InitializeLandscapeVariables OCL_NULL( 144 ), ///< cargo-stuff, calculated in InitializeLandscapeVariables
OCL_VAR ( OC_UINT16, 256, &_engine_name_strings[0] ), OCL_CHUNK(256, LoadOldEngineName ),
OCL_NULL( 144 ), ///< AI cargo-stuff, calculated in InitializeLandscapeVariables OCL_NULL( 144 ), ///< AI cargo-stuff, calculated in InitializeLandscapeVariables
OCL_NULL( 2 ), ///< Company indexes of players, no longer in use OCL_NULL( 2 ), ///< Company indexes of players, no longer in use