1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 13:33:02 +01:00

remove all unnecessary object resets

This commit is contained in:
Ted John
2016-07-07 23:32:45 +01:00
parent 4664b73488
commit 78c6b6a251
10 changed files with 23 additions and 33 deletions

View File

@@ -15,6 +15,7 @@
#pragma endregion
#include <stack>
#include "../object/ObjectManager.h"
#include "LanguagePack.h"
extern "C" {
@@ -189,13 +190,12 @@ bool language_open(int id)
gCurrentTTFFontSet = &TTFFontCustom;
bool font_initialised = ttf_initialise();
if(!font_initialised) {
if (!font_initialised) {
log_warning("Unable to initialise configured TrueType font -- falling back to Language default.");
} else {
// Objects and their localized strings need to be refreshed
reset_loaded_objects();
return 1;
GetObjectManager()->ResetObjects();
return true;
}
}
ttf_dispose();
@@ -220,8 +220,7 @@ bool language_open(int id)
}
// Objects and their localized strings need to be refreshed
reset_loaded_objects();
GetObjectManager()->ResetObjects();
return true;
}