mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-16 05:13:59 +02:00
Code Issues Projects Releases Wiki Activity

tracking down bug on i386 platform

Browse Source 
- comment titi's model debug output
This commit is contained in:
Mark Vejvoda
2013-06-01 17:23:51 +00:00
parent 8c725df8a2
commit e809080d0f
5 changed files with 22 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,10 +51,6 @@ string Properties::tutorialPath = "";
// class Properties
// =====================================================
Properties::Properties() {
propertyMapTmpInUse = false;
path = "";
}
void Properties::load(const string &path, bool clearCurrentProperties) {
char lineBuffer[maxLine]="";
@@ -82,12 +78,9 @@ void Properties::load(const string &path, bool clearCurrentProperties) {
if(clearCurrentProperties == true) {
propertyMap.clear();
propertyMapTmpInUse = true;
propertyMapTmp.clear();
propertyMapTmpInUse = false;
}
propertyMapTmpInUse = true;
while(fileStream.eof() == false) {
lineBuffer[0]='\0';
fileStream.getline(lineBuffer, maxLine);
@@ -168,7 +161,6 @@ void Properties::load(const string &path, bool clearCurrentProperties) {
}
}
}
propertyMapTmpInUse = false;
fileStream.close();
#if defined(WIN32) && !defined(__MINGW32__)
@@ -383,9 +375,7 @@ void Properties::save(const string &path){
void Properties::clear(){
propertyMap.clear();
propertyMapTmpInUse = true;
propertyMapTmp.clear();
propertyMapTmpInUse = false;
propertyVector.clear();
propertyVectorTmp.clear();
}
@@ -453,10 +443,6 @@ float Properties::getFloat(const string &key, float min, float max, const char *
}
const string Properties::getString(const string &key, const char *defaultValueIfNotFound) const{
for(time_t elapsed = time(NULL); propertyMapTmpInUse == true && difftime(time(NULL),elapsed) < 5;) {
sleep(100);
printf("Waiting for ini file updates to complete.\n");
}
PropertyMap::const_iterator it = propertyMapTmp.find(key);
if(it == propertyMapTmp.end()) {
if(defaultValueIfNotFound != NULL) {
@@ -515,10 +501,9 @@ void Properties::setString(const string &key, const string &value){
propertyMap.erase(key);
propertyMap.insert(PropertyPair(key, value));
propertyMapTmpInUse = true;
propertyMapTmp.erase(key);
propertyMapTmp.insert(PropertyPair(key, value));
propertyMapTmpInUse = false;
}
string Properties::toString(){