mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(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.

This commit is contained in:
peter1138 2005-12-18 14:03:28 +00:00
parent 3561a3068e
commit 3532b91eef
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine.c
View File

@ -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++) {

2
engine.h
View File

@ -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 */

1
newgrf.c
View File

@ -2455,6 +2455,7 @@ static void ResetNewGRFData(void)
// Unload sprite group data
UnloadWagonOverrides();
UnloadCustomEngineSprites();
UnloadCustomEngineNames();
// Reset price base data
ResetPriceBaseMultipliers();

1
openttd.c
View File

@ -255,7 +255,6 @@ static void UnInitializeDynamicVariables(void)
static void UnInitializeGame(void)
{
UnInitWindowSystem();
UnInitNewgrEngines();
free(_config_file);
}