Prepare a version for Steam and fixing bugs
This commit is contained in:
1 parent
8a0a8390b2
commit
c3f449b999
24 files changed
+1529
-22
No files matched your search
+1
-1
@@ -23,7 +23,7 @@ int Environment::height = CONST_DEFAULT_HEIGHT;
|
||||
float Environment::zoom = DEFAULT_ZOOM;
|
||||
|
||||
|
||||
bool Environment::enableLogging = true;
|
||||
bool Environment::enableLogging = false;
|
||||
|
||||
SDL_Window* Environment::window = nullptr;
|
||||
|
||||
|
||||
@@ -396,13 +396,11 @@ namespace FRG
|
||||
});
|
||||
|
||||
|
||||
#ifdef __ANDROID__
|
||||
loadSteps.push([this]() {
|
||||
if (menuManager.shadowsEnabled) {
|
||||
createShadowMapAndProparateToLocations();
|
||||
}
|
||||
});
|
||||
#endif
|
||||
|
||||
loadSteps.push([this]() {
|
||||
loadingCompleted = true;
|
||||
|
||||
+21
-4
@@ -173,15 +173,32 @@ namespace FRG {
|
||||
#else
|
||||
hudStep3Root = loadLocalizedUi("resources/w/ui/hud_step3.json", zipFile);
|
||||
#endif
|
||||
|
||||
hudStep4Root = loadLocalizedUi("resources/w/ui/hud_step4.json", zipFile);
|
||||
hudStep5aRoot = loadLocalizedUi("resources/w/ui/hud_step5a.json", zipFile);
|
||||
hudStep5bRoot = loadLocalizedUi("resources/w/ui/hud_step5b.json", zipFile);
|
||||
hudStep5abRoot = loadLocalizedUi("resources/w/ui/hud_step5ab.json", zipFile);
|
||||
|
||||
#ifdef __ANDROID__
|
||||
hudStep5abRoot = loadLocalizedUi("resources/w/ui/hud_step5abandroid.json", zipFile);
|
||||
#else
|
||||
hudStep5abRoot = loadLocalizedUi("resources/w/ui/hud_step5ab.json", zipFile);
|
||||
#endif
|
||||
|
||||
hudUniExtRoot = loadLocalizedUi("resources/w/ui/hud_uni_ext.json", zipFile);
|
||||
hudUniIntStep10Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step10.json", zipFile);
|
||||
hudUniIntStep11Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step11.json", zipFile);
|
||||
hudUniIntStep12Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step12.json", zipFile);
|
||||
hudUniIntStep13Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step13.json", zipFile);
|
||||
|
||||
#ifdef __ANDROID__
|
||||
hudUniIntStep11Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step11android.json", zipFile);
|
||||
#else
|
||||
hudUniIntStep11Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step11.json", zipFile);
|
||||
#endif
|
||||
hudUniIntStep12Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step12.json", zipFile);
|
||||
|
||||
#ifdef __ANDROID__
|
||||
hudUniIntStep13Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step13android.json", zipFile);
|
||||
#else
|
||||
hudUniIntStep13Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step13.json", zipFile);
|
||||
#endif
|
||||
hudUniIntFullRoot = loadLocalizedUi("resources/w/ui/hud_uni_int_full.json", zipFile);
|
||||
hudUniIntDarkFullRoot = loadLocalizedUi("resources/w/ui/hud_uni_int_dark_full.json", zipFile);
|
||||
hudUniExtDarkRoot = loadLocalizedUi("resources/w/ui/hud_uni_ext_dark.json", zipFile);
|
||||
|
||||
Reference in new issue
Block a user