summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2005-12-18 14:03:28 +0000
committerpeter1138 <peter1138@openttd.org>2005-12-18 14:03:28 +0000
commit3532b91eef373177c1403e4c268de2f2fd7b8ef6 (patch)
tree27b3a322a066b580696dd9cd726bd5faab42aa62
parent3561a3068ebd48d8f732042ab92f4d7c400acd0c (diff)
downloadopenttd-3532b91eef373177c1403e4c268de2f2fd7b8ef6.tar.xz
(svn r3316) - NewGRF: Unload engine names before loading grf files. This fixes names in climates where the engines don't get loaded. Renamed function to reflect its purpose.
-rw-r--r--engine.c2
-rw-r--r--engine.h2
-rw-r--r--newgrf.c1
-rw-r--r--openttd.c1
4 files changed, 3 insertions, 3 deletions
diff --git a/engine.c b/engine.c
index 9b39f2891..95fb1c473 100644
--- a/engine.c
+++ b/engine.c
@@ -811,7 +811,7 @@ void SetCustomEngineName(EngineID engine, const char *name)
_engine_custom_names[engine] = strdup(name);
}
-void UnInitNewgrEngines(void)
+void UnloadCustomEngineNames(void)
{
char **i;
for (i = _engine_custom_names; i != endof(_engine_custom_names); i++) {
diff --git a/engine.h b/engine.h
index c312bc09d..8a36f1eb9 100644
--- a/engine.h
+++ b/engine.h
@@ -212,7 +212,6 @@ void LoadCustomEngineNames(void);
void DeleteCustomEngineNames(void);
bool IsEngineBuildable(uint engine, byte type);
-void UnInitNewgrEngines(void);
enum {
NUM_NORMAL_RAIL_ENGINES = 54,
@@ -283,5 +282,6 @@ static inline const RoadVehicleInfo* RoadVehInfo(EngineID e)
void UnloadWagonOverrides(void);
void UnloadCustomEngineSprites(void);
+void UnloadCustomEngineNames(void);
#endif /* ENGINE_H */
diff --git a/newgrf.c b/newgrf.c
index 895303dc6..6e6a03e1b 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -2455,6 +2455,7 @@ static void ResetNewGRFData(void)
// Unload sprite group data
UnloadWagonOverrides();
UnloadCustomEngineSprites();
+ UnloadCustomEngineNames();
// Reset price base data
ResetPriceBaseMultipliers();
diff --git a/openttd.c b/openttd.c
index ce56e8982..3a7217613 100644
--- a/openttd.c
+++ b/openttd.c
@@ -255,7 +255,6 @@ static void UnInitializeDynamicVariables(void)
static void UnInitializeGame(void)
{
UnInitWindowSystem();
- UnInitNewgrEngines();
free(_config_file);
}