Mercurial > hg > openttd
changeset 5659:78a7505fd513 draft
(svn r8119) -Fix (r8101): Uninitializing windows should be called before freeing dynamic variables as windows could use those variables during cleanup (eg WE_DESTROY calling GetStation(w->window_number).
-Merged UnInitializeGame with UnInitializeAirports and UnInitializeDynamicVariables
author | Darkvater <Darkvater@openttd.org> |
---|---|
date | Sun, 14 Jan 2007 17:17:30 +0000 |
parents | 407aa599bd6f |
children | 8ba2b1e4ef83 |
files | src/openttd.cpp |
diffstat | 1 files changed, 10 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -263,9 +263,15 @@ _industry_sort = NULL; } -static void UnInitializeDynamicVariables(void) + +static void UnInitializeGame(void) { - /* Dynamic stuff needs to be free'd somewhere... */ + UnInitWindowSystem(); + + /* Uninitialize airport state machines */ + UnInitializeAirports(); + + /* Uninitialize variables that are allocated dynamically */ CleanPool(&_Town_pool); CleanPool(&_Industry_pool); CleanPool(&_Station_pool); @@ -275,11 +281,6 @@ free((void*)_town_sort); free((void*)_industry_sort); -} - -static void UnInitializeGame(void) -{ - UnInitWindowSystem(); free(_config_file); } @@ -547,18 +548,14 @@ SaveToHighScore(); } - // uninitialize airport state machines - UnInitializeAirports(); - - /* uninitialize variables that are allocated dynamic */ - UnInitializeDynamicVariables(); + /* Reset windowing system and free config file */ + UnInitializeGame(); /* stop the AI */ AI_Uninitialize(); /* Close all and any open filehandles */ FioCloseAll(); - UnInitializeGame(); return 0; }