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

pull/155/head
smatz 14 years ago
parent 67fc433af8
commit 8456217bf4

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

@ -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);

@ -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();
}

Loading…
Cancel
Save