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

(svn r20758) -Fix: when leaving the program, current newgrf config would leak, causing valgrind warnings

Browse Source
This commit is contained in:
smatz 2010-09-06 18:20:07 +00:00
parent a71cc228b2
commit 82949024f1
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/newgrf.cpp
View File

@ -6984,7 +6984,7 @@ static void ResetNewGRFErrors()
* Reset all NewGRF loaded data
* TODO
*/
static void ResetNewGRFData()
void ResetNewGRFData()
{
CleanUpStrings();
CleanUpGRFTownNames();

1
src/newgrf.h
View File

@ -159,6 +159,7 @@ extern GRFLoadedFeatures _loaded_newgrf_features;
void LoadNewGRFFile(struct GRFConfig *config, uint file_index, GrfLoadingStage stage);
void LoadNewGRF(uint load_index, uint file_index);
void ReloadNewGRFData(); // in saveload/afterload.cpp
void ResetNewGRFData();
void CDECL grfmsg(int severity, const char *str, ...) WARN_FORMAT(2, 3);

3
src/openttd.cpp
View File

@ -59,6 +59,7 @@
#include "rail_gui.h"
#include "core/backup_type.hpp"
#include "hotkeys.h"
#include "newgrf.h"
#include "town.h"
@ -347,6 +348,8 @@ static void ShutdownGame()
free(_config_file);
#endif
ResetNewGRFData();
/* Close all and any open filehandles */
FioCloseAll();
}