Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

no more errors related to missing GlobalConfig::Get (or so I hope)

Browse Source
This commit is contained in:
Juan Linietsky
2017-01-14 21:56:22 -03:00
parent a1d07fd6d6
commit 5dde810aa5
8 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/path_remap.cpp
View File

@@ -124,7 +124,10 @@ void PathRemap::clear_remaps() {
void PathRemap::load_remaps() {
// default remaps first
PoolVector<String> remaps = GlobalConfig::get_singleton()->get("remap/all");
PoolVector<String> remaps;
if (GlobalConfig::get_singleton()->has("remap/all")) {
remaps = GlobalConfig::get_singleton()->get("remap/all");
}
{
int rlen = remaps.size();
@@ -141,7 +144,11 @@ void PathRemap::load_remaps() {
// platform remaps second, so override
remaps = GlobalConfig::get_singleton()->get("remap/"+OS::get_singleton()->get_name());
if (GlobalConfig::get_singleton()->has("remap/"+OS::get_singleton()->get_name())) {
remaps = GlobalConfig::get_singleton()->get("remap/"+OS::get_singleton()->get_name());
} else {
remaps.resize(0);
}
//remaps = Globals::get_singleton()->get("remap/PSP");
{
int rlen = remaps.size();