mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-29 00:48:58 +02:00
Code Issues Projects Releases Wiki Activity

Added code for the following:

Browse Source 
a) Complete Unit Rotation for multi-player
b) Added support for user defined data folders
This commit is contained in:
Mark Vejvoda
2010-03-18 21:26:40 +00:00
parent 3580e13468
commit f838293632
35 changed files with 4517 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/shared_lib/sources/util/properties.cpp
View File

@@ -137,6 +137,7 @@ const string Properties::getString(const string &key, const char *defaultValueIf
it= propertyMap.find(key);
if(it==propertyMap.end()){
if(defaultValueIfNotFound != NULL) {
//printf("In [%s::%s - %d]defaultValueIfNotFound = [%s]\n",__FILE__,__FUNCTION__,__LINE__,defaultValueIfNotFound);
return string(defaultValueIfNotFound);
}
else {
@@ -144,7 +145,7 @@ const string Properties::getString(const string &key, const char *defaultValueIf
}
}
else{
return it->second;
return (it->second != "" ? it->second : (defaultValueIfNotFound != NULL ? defaultValueIfNotFound : it->second));
}
}
@@ -209,6 +210,7 @@ const string Properties::getString(const char *key, const char *defaultValueIfNo
it= propertyMap.find(key);
if(it==propertyMap.end()){
if(defaultValueIfNotFound != NULL) {
//printf("In [%s::%s - %d]defaultValueIfNotFound = [%s]\n",__FILE__,__FUNCTION__,__LINE__,defaultValueIfNotFound);
return string(defaultValueIfNotFound);
}
else {
@@ -216,7 +218,7 @@ const string Properties::getString(const char *key, const char *defaultValueIfNo
}
}
else{
return it->second;
return (it->second != "" ? it->second : (defaultValueIfNotFound != NULL ? defaultValueIfNotFound : it->second));
}
}