(svn r11823) -Fix (r11822): Custom names from old TTD games were not updated.
authorpeter1138
Sat, 12 Jan 2008 21:01:27 +0000
changeset 8259 3fb6f1f46a4f
parent 8258 9fa31acb07bc
child 8260 b0187eaec344
(svn r11823) -Fix (r11822): Custom names from old TTD games were not updated.
src/engine.h
src/oldloader.cpp
--- a/src/engine.h	Sat Jan 12 19:58:06 2008 +0000
+++ b/src/engine.h	Sat Jan 12 21:01:27 2008 +0000
@@ -212,8 +212,6 @@
 	return &_engines[i];
 }
 
-VARDEF StringID _engine_name_strings[TOTAL_NUM_ENGINES];
-
 static inline bool IsEngineIndex(uint index)
 {
 	return index < TOTAL_NUM_ENGINES;
--- a/src/oldloader.cpp	Sat Jan 12 19:58:06 2008 +0000
+++ b/src/oldloader.cpp	Sat Jan 12 21:01:27 2008 +0000
@@ -1306,6 +1306,13 @@
 	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[] = {
 	OCL_SVAR(  OC_UINT8, Subsidy, cargo_type ),
 	OCL_SVAR(  OC_UINT8, Subsidy, age ),
@@ -1512,7 +1519,7 @@
 
 	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( 2 ),               ///< Company indexes of players, no longer in use