- added new commandline option to convert folders of g3d models to use specified texture format

- added new utility methods and changed code to use them (like adding trailing slash on paths)
2025-08-29 10:49:48 +02:00 · 2011-03-13 08:23:43 +00:00
parent f35e920d47
commit 39bf1b986e
32 changed files with 529 additions and 308 deletions
--- a/source/shared_lib/sources/graphics/model.cpp
+++ b/source/shared_lib/sources/graphics/model.cpp
@@ -189,19 +189,41 @@ void Mesh::ReleaseVBOs() {

 // ==================== load ====================

-void Mesh::loadV2(const string &dir, FILE *f, TextureManager *textureManager,bool deletePixMapAfterLoad) {
+string Mesh::findAlternateTexture(vector<string> conversionList, string textureFile) {
+	string result = textureFile;
+	string fileExt = extractExtension(textureFile);
+
+	for(int i = 0; i < conversionList.size(); ++i) {
+		string convertTo = conversionList[i];
+		if(fileExt != convertTo) {
+			string alternateTexture = textureFile;
+			replaceAll(alternateTexture, "." + fileExt, "." + convertTo);
+			if(fileExists(alternateTexture) == true) {
+				result = alternateTexture;
+				break;
+			}
+		}
+	}
+	return result;
+}
+
+void Mesh::loadV2(int meshIndex, const string &dir, FILE *f, TextureManager *textureManager,bool deletePixMapAfterLoad) {
 	this->textureManager = textureManager;
 	//read header
 	MeshHeaderV2 meshHeader;
 	size_t readBytes = fread(&meshHeader, sizeof(MeshHeaderV2), 1, f);


-	if(meshHeader.normalFrameCount!=meshHeader.vertexFrameCount){
-		throw runtime_error("Old model: vertex frame count different from normal frame count");
+	if(meshHeader.normalFrameCount != meshHeader.vertexFrameCount) {
+		char szBuf[4096]="";
+		sprintf(szBuf,"Old v2 model: vertex frame count different from normal frame count [v = %d, n = %d] meshIndex = %d",meshHeader.vertexFrameCount,meshHeader.normalFrameCount,meshIndex);
+		throw runtime_error(szBuf);
 	}

-	if(meshHeader.texCoordFrameCount!=1){
-		throw runtime_error("Old model: texture coord frame count is not 1");
+	if(meshHeader.texCoordFrameCount != 1) {
+		char szBuf[4096]="";
+		sprintf(szBuf,"Old v2 model: texture coord frame count is not 1 [t = %d] meshIndex = %d",meshHeader.texCoordFrameCount,meshIndex);
+		throw runtime_error(szBuf);
 	}

 	//init
@@ -216,7 +238,7 @@ void Mesh::loadV2(const string &dir, FILE *f, TextureManager *textureManager,boo
 	twoSided= false;
 	customColor= false;

-	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Load v2, this = %p Found meshHeader.hasTexture = %d, texName [%s] mtDiffuse = %d\n",this,meshHeader.hasTexture,toLower(reinterpret_cast<char*>(meshHeader.texName)).c_str(),mtDiffuse);
+	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Load v2, this = %p Found meshHeader.hasTexture = %d, texName [%s] mtDiffuse = %d meshIndex = %d\n",this,meshHeader.hasTexture,toLower(reinterpret_cast<char*>(meshHeader.texName)).c_str(),mtDiffuse,meshIndex);

 	textureFlags= 0;
 	if(meshHeader.hasTexture == true) {
@@ -228,19 +250,31 @@ void Mesh::loadV2(const string &dir, FILE *f, TextureManager *textureManager,boo
 		texturePaths[mtDiffuse]= toLower(reinterpret_cast<char*>(meshHeader.texName));
 		string texPath= dir;
        if(texPath != "") {
-            texPath += "/";
+        	endPathWithSlash(texPath);
        }
 		texPath += texturePaths[mtDiffuse];

-		textures[mtDiffuse]= static_cast<Texture2D*>(textureManager->getTexture(texPath));
-		if(textures[mtDiffuse]==NULL){
-			textures[mtDiffuse]= textureManager->newTexture2D();
-			textures[mtDiffuse]->load(texPath);
-			texturesOwned[mtDiffuse]=true;
-			// M.V. Test
-			textures[mtDiffuse]->init(textureManager->getTextureFilter(),textureManager->getMaxAnisotropy());
-			if(deletePixMapAfterLoad == true) {
-				textures[mtDiffuse]->deletePixels();
+		textures[mtDiffuse]= dynamic_cast<Texture2D*>(textureManager->getTexture(texPath));
+		if(textures[mtDiffuse] == NULL) {
+			if(fileExists(texPath) == false) {
+				vector<string> conversionList;
+				conversionList.push_back("png");
+				conversionList.push_back("jpg");
+				conversionList.push_back("tga");
+				conversionList.push_back("bmp");
+				texPath = findAlternateTexture(conversionList, texPath);
+			}
+			if(fileExists(texPath) == true) {
+				textures[mtDiffuse]= textureManager->newTexture2D();
+				textures[mtDiffuse]->load(texPath);
+				texturesOwned[mtDiffuse]=true;
+				textures[mtDiffuse]->init(textureManager->getTextureFilter(),textureManager->getMaxAnisotropy());
+				if(deletePixMapAfterLoad == true) {
+					textures[mtDiffuse]->deletePixels();
+				}
+			}
+			else {
+				SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error v2 model is missing texture [%s] meshIndex = %d\n",__FILE__,__FUNCTION__,__LINE__,texPath.c_str(),meshIndex);
 			}
 		}
 	}
@@ -257,7 +291,7 @@ void Mesh::loadV2(const string &dir, FILE *f, TextureManager *textureManager,boo
 	readBytes = fread(indices, sizeof(uint32)*indexCount, 1, f);
 }

-void Mesh::loadV3(const string &dir, FILE *f, TextureManager *textureManager,bool deletePixMapAfterLoad) {
+void Mesh::loadV3(int meshIndex, const string &dir, FILE *f, TextureManager *textureManager,bool deletePixMapAfterLoad) {
 	this->textureManager = textureManager;

 	//read header
@@ -265,8 +299,10 @@ void Mesh::loadV3(const string &dir, FILE *f, TextureManager *textureManager,boo
 	size_t readBytes = fread(&meshHeader, sizeof(MeshHeaderV3), 1, f);


-	if(meshHeader.normalFrameCount!=meshHeader.vertexFrameCount){
-		throw runtime_error("Old model: vertex frame count different from normal frame count");
+	if(meshHeader.normalFrameCount != meshHeader.vertexFrameCount) {
+		char szBuf[4096]="";
+		sprintf(szBuf,"Old v3 model: vertex frame count different from normal frame count [v = %d, n = %d] meshIndex = %d",meshHeader.vertexFrameCount,meshHeader.normalFrameCount,meshIndex);
+		throw runtime_error(szBuf);
 	}

 	//init
@@ -286,7 +322,7 @@ void Mesh::loadV3(const string &dir, FILE *f, TextureManager *textureManager,boo
 		textureFlags= 1;
 	}

-	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Load v3, this = %p Found meshHeader.properties = %d, textureFlags = %d, texName [%s] mtDiffuse = %d\n",this,meshHeader.properties,textureFlags,toLower(reinterpret_cast<char*>(meshHeader.texName)).c_str(),mtDiffuse);
+	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Load v3, this = %p Found meshHeader.properties = %d, textureFlags = %d, texName [%s] mtDiffuse = %d meshIndex = %d\n",this,meshHeader.properties,textureFlags,toLower(reinterpret_cast<char*>(meshHeader.texName)).c_str(),mtDiffuse,meshIndex);

 	//texture
 	if((meshHeader.properties & mp3NoTexture) != mp3NoTexture && textureManager!=NULL){
@@ -294,19 +330,32 @@ void Mesh::loadV3(const string &dir, FILE *f, TextureManager *textureManager,boo

 		string texPath= dir;
        if(texPath != "") {
-            texPath += "/";
+        	endPathWithSlash(texPath);
        }
 		texPath += texturePaths[mtDiffuse];

-		textures[mtDiffuse]= static_cast<Texture2D*>(textureManager->getTexture(texPath));
-		if(textures[mtDiffuse]==NULL){
-			textures[mtDiffuse]= textureManager->newTexture2D();
-			textures[mtDiffuse]->load(texPath);
-			texturesOwned[mtDiffuse]=true;
-			// M.V. Test
-			textures[mtDiffuse]->init(textureManager->getTextureFilter(),textureManager->getMaxAnisotropy());
-			if(deletePixMapAfterLoad == true) {
-				textures[mtDiffuse]->deletePixels();
+		textures[mtDiffuse]= dynamic_cast<Texture2D*>(textureManager->getTexture(texPath));
+		if(textures[mtDiffuse] == NULL) {
+			if(fileExists(texPath) == false) {
+				vector<string> conversionList;
+				conversionList.push_back("png");
+				conversionList.push_back("jpg");
+				conversionList.push_back("tga");
+				conversionList.push_back("bmp");
+				texPath = findAlternateTexture(conversionList, texPath);
+			}
+
+			if(fileExists(texPath) == true) {
+				textures[mtDiffuse]= textureManager->newTexture2D();
+				textures[mtDiffuse]->load(texPath);
+				texturesOwned[mtDiffuse]=true;
+				textures[mtDiffuse]->init(textureManager->getTextureFilter(),textureManager->getMaxAnisotropy());
+				if(deletePixMapAfterLoad == true) {
+					textures[mtDiffuse]->deletePixels();
+				}
+			}
+			else {
+				SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error v3 model is missing texture [%s] meshHeader.properties = %d meshIndex = %d\n",__FILE__,__FUNCTION__,__LINE__,texPath.c_str(),meshHeader.properties,meshIndex);
 			}
 		}
 	}
@@ -325,26 +374,53 @@ void Mesh::loadV3(const string &dir, FILE *f, TextureManager *textureManager,boo
 	readBytes = fread(indices, sizeof(uint32)*indexCount, 1, f);
 }

-Texture2D* Mesh::loadMeshTexture(TextureManager *textureManager, string textureFile,
+Texture2D* Mesh::loadMeshTexture(int meshIndex, int textureIndex, TextureManager *textureManager, string textureFile,
 		int textureChannelCount, bool &textureOwned, bool deletePixMapAfterLoad) {
-	Texture2D* texture = static_cast<Texture2D*>(textureManager->getTexture(textureFile));
+
+	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s] #1 load texture [%s]\n",__FUNCTION__,textureFile.c_str());
+
+	Texture2D* texture = dynamic_cast<Texture2D*>(textureManager->getTexture(textureFile));
 	if(texture == NULL) {
-		texture = textureManager->newTexture2D();
-		if(textureChannelCount != -1) {
-			texture->getPixmap()->init(textureChannelCount);
+		if(fileExists(textureFile) == false) {
+			vector<string> conversionList;
+			conversionList.push_back("png");
+			conversionList.push_back("jpg");
+			conversionList.push_back("tga");
+			conversionList.push_back("bmp");
+			textureFile = findAlternateTexture(conversionList, textureFile);
+
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s] #2 load texture [%s]\n",__FUNCTION__,textureFile.c_str());
 		}
-		texture->load(textureFile);
-		textureOwned = true;
-		texture->init(textureManager->getTextureFilter(),textureManager->getMaxAnisotropy());
-		if(deletePixMapAfterLoad == true) {
-			texture->deletePixels();
+
+		if(fileExists(textureFile) == true) {
+			//if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s] texture exists loading [%s]\n",__FUNCTION__,textureFile.c_str());
+
+			texture = textureManager->newTexture2D();
+			if(textureChannelCount != -1) {
+				texture->getPixmap()->init(textureChannelCount);
+			}
+			texture->load(textureFile);
+
+			//if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s] texture loaded [%s]\n",__FUNCTION__,textureFile.c_str());
+
+			textureOwned = true;
+			texture->init(textureManager->getTextureFilter(),textureManager->getMaxAnisotropy());
+			if(deletePixMapAfterLoad == true) {
+				texture->deletePixels();
+			}
+
+			//if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s] texture inited [%s]\n",__FUNCTION__,textureFile.c_str());
+		}
+		else {
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s] #3 cannot load texture [%s]\n",__FUNCTION__,textureFile.c_str());
+			SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error v4 model is missing texture [%s] textureFlags = %d meshIndex = %d textureIndex = %d\n",__FILE__,__FUNCTION__,__LINE__,textureFile.c_str(),textureFlags,meshIndex,textureIndex);
 		}
 	}

 	return texture;
 }

-void Mesh::load(const string &dir, FILE *f, TextureManager *textureManager,
+void Mesh::load(int meshIndex, const string &dir, FILE *f, TextureManager *textureManager,
 				bool deletePixMapAfterLoad) {
 	this->textureManager = textureManager;

@@ -375,26 +451,28 @@ void Mesh::load(const string &dir, FILE *f, TextureManager *textureManager,

 	textureFlags= meshHeader.textures;

-	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Load v4, this = %p Found meshHeader.textures = %d\n",this,meshHeader.textures);
+	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Load v4, this = %p Found meshHeader.textures = %d meshIndex = %d\n",this,meshHeader.textures,meshIndex);

 	//maps
 	uint32 flag= 1;
-	for(int i=0; i<meshTextureCount; ++i){
-		if((meshHeader.textures & flag) && textureManager!=NULL){
+	for(int i = 0; i < meshTextureCount; ++i) {
+		if((meshHeader.textures & flag) && textureManager != NULL) {
 			uint8 cMapPath[mapPathSize];
 			readBytes = fread(cMapPath, mapPathSize, 1, f);
 			string mapPath= toLower(reinterpret_cast<char*>(cMapPath));

+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("mapPath [%s] meshHeader.textures = %d flag = %d (meshHeader.textures & flag) = %d meshIndex = %d i = %d\n",mapPath.c_str(),meshHeader.textures,flag,(meshHeader.textures & flag),meshIndex,i);
+
 			string mapFullPath= dir;
 			if(mapFullPath != "") {
-                mapFullPath += "/";
+                endPathWithSlash(mapFullPath);
 			}
 			mapFullPath += mapPath;

-			textures[i] = loadMeshTexture(textureManager, mapFullPath,
+			textures[i] = loadMeshTexture(meshIndex, i, textureManager, mapFullPath,
 					meshTextureChannelCount[i],texturesOwned[i],deletePixMapAfterLoad);
 		}
-		flag*= 2;
+		flag *= 2;
 	}

 	//read data
@@ -411,7 +489,7 @@ void Mesh::load(const string &dir, FILE *f, TextureManager *textureManager,
 	}
 }

-void Mesh::save(const string &dir, FILE *f, TextureManager *textureManager,
+void Mesh::save(int meshIndex, const string &dir, FILE *f, TextureManager *textureManager,
 		string convertTextureToFormat, std::map<string,int> &textureDeleteList) {
 	MeshHeader meshHeader;
 	memset(&meshHeader, 0, sizeof(struct MeshHeader));
@@ -439,7 +517,7 @@ void Mesh::save(const string &dir, FILE *f, TextureManager *textureManager,
 	meshHeader.textures = textureFlags;
 	fwrite(&meshHeader, sizeof(MeshHeader), 1, f);

-	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Save, this = %p, Found meshTextureCount = %d, meshHeader.textures = %d\n",this,meshTextureCount,meshHeader.textures);
+	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Save, this = %p, Found meshTextureCount = %d, meshHeader.textures = %d meshIndex = %d\n",this,meshTextureCount,meshHeader.textures,meshIndex);

 	//maps
 	uint32 flag= 1;
@@ -487,7 +565,9 @@ void Mesh::save(const string &dir, FILE *f, TextureManager *textureManager,
 					}

 					//textureManager->endTexture(texture);
-					texture = loadMeshTexture(textureManager,file,
+
+					if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Save, load new texture [%s]\n",file.c_str());
+					texture = loadMeshTexture(meshIndex, i, textureManager,file,
 												meshTextureChannelCount[i],
 												texturesOwned[i],
 												false);
@@ -496,8 +576,16 @@ void Mesh::save(const string &dir, FILE *f, TextureManager *textureManager,

 				file = extractFileFromDirectoryPath(texture->getPath());

+				if(file.length() > mapPathSize) {
+					throw runtime_error("file.length() > mapPathSize, file.length() = " + intToStr(file.length()));
+				}
+				else if(file.length() == 0) {
+					throw runtime_error("file.length() == 0");
+				}
+
 				if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Save, new texture file [%s]\n",file.c_str());

+				memset(&cMapPath[0],0,mapPathSize);
 				memcpy(&cMapPath[0],file.c_str(),file.length());
 			}

@@ -690,32 +778,32 @@ void Model::loadG3d(const string &path, bool deletePixMapAfterLoad) {

 			//load meshes
 			meshes= new Mesh[meshCount];
-			for(uint32 i=0; i<meshCount; ++i){
-				meshes[i].load(dir, f, textureManager,deletePixMapAfterLoad);
+			for(uint32 i = 0; i < meshCount; ++i) {
+				meshes[i].load(i, dir, f, textureManager,deletePixMapAfterLoad);
 				meshes[i].buildInterpolationData();
 			}
 		}
 		//version 3
-		else if(fileHeader.version==3){
+		else if(fileHeader.version == 3) {
 			readBytes = fread(&meshCount, sizeof(meshCount), 1, f);

 			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("meshCount = %d\n",meshCount);

 			meshes= new Mesh[meshCount];
-			for(uint32 i=0; i<meshCount; ++i){
-				meshes[i].loadV3(dir, f, textureManager,deletePixMapAfterLoad);
+			for(uint32 i = 0; i < meshCount; ++i) {
+				meshes[i].loadV3(i, dir, f, textureManager,deletePixMapAfterLoad);
 				meshes[i].buildInterpolationData();
 			}
 		}
 		//version 2
-		else if(fileHeader.version==2) {
+		else if(fileHeader.version == 2) {
 			readBytes = fread(&meshCount, sizeof(meshCount), 1, f);

 			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("meshCount = %d\n",meshCount);

 			meshes= new Mesh[meshCount];
-			for(uint32 i=0; i<meshCount; ++i){
-				meshes[i].loadV2(dir, f, textureManager,deletePixMapAfterLoad);
+			for(uint32 i = 0; i < meshCount; ++i){
+				meshes[i].loadV2(i,dir, f, textureManager,deletePixMapAfterLoad);
 				meshes[i].buildInterpolationData();
 			}
 		}
@@ -733,9 +821,12 @@ void Model::loadG3d(const string &path, bool deletePixMapAfterLoad) {

 //save a model to a g3d file
 void Model::saveG3d(const string &path, string convertTextureToFormat) {
-	FILE *f= fopen(path.c_str(), "wb");
+
+	string tempModelFilename = path + "cvt";
+
+	FILE *f= fopen(tempModelFilename.c_str(), "wb");
 	if(f == NULL) {
-		throw runtime_error("Cant open file for writting: "+path);
+		throw runtime_error("Cant open file for writting: [" + tempModelFilename + "]");
 	}

 	convertTextureToFormat = toLower(convertTextureToFormat);
@@ -760,13 +851,17 @@ void Model::saveG3d(const string &path, string convertTextureToFormat) {

 		std::map<string,int> textureDeleteList;
 		for(uint32 i = 0; i < meshCount; ++i) {
-			meshes[i].save(path, f, textureManager,convertTextureToFormat,textureDeleteList);
+			meshes[i].save(i,tempModelFilename, f, textureManager,
+					convertTextureToFormat,textureDeleteList);
 		}

-		// Now delete old textures since they were converted to a new format
-		for(std::map<string,int>::iterator iterMap = textureDeleteList.begin();
-			iterMap != textureDeleteList.end(); ++iterMap) {
-
+		removeFile(path);
+		if(renameFile(tempModelFilename,path) == true) {
+			// Now delete old textures since they were converted to a new format
+			for(std::map<string,int>::iterator iterMap = textureDeleteList.begin();
+				iterMap != textureDeleteList.end(); ++iterMap) {
+				removeFile(iterMap->first);
+			}
 		}
 	}
 	else {
--- a/source/shared_lib/sources/platform/common/platform_common.cpp
+++ b/source/shared_lib/sources/platform/common/platform_common.cpp
@@ -61,7 +61,7 @@ using namespace Shared::Platform;
 using namespace Shared::Util;
 using namespace std;

-#define _DISABLE MEMORY_VAULT_CHECKS 1
+#define _DISABLE_MEMORY_VAULT_CHECKS 1

 namespace Shared { namespace PlatformCommon {

@@ -214,13 +214,15 @@ void findDirs(const vector<string> &paths, vector<string> &results, bool errorOn
    results.clear();
    size_t pathCount = paths.size();
    for(unsigned int idx = 0; idx < pathCount; idx++) {
-        string path = paths[idx] + "/*.";
+    	string currentPath = paths[idx];
+    	endPathWithSlash(currentPath);
+        string path = currentPath + "*.";
        vector<string> current_results;
        findAll(path, current_results, false, errorOnNotFound);
        if(current_results.size() > 0) {
            for(unsigned int folder_index = 0; folder_index < current_results.size(); folder_index++) {
                const string current_folder = current_results[folder_index];
-                const string current_folder_path = paths[idx] + "/" + current_folder;
+                const string current_folder_path = currentPath + current_folder;

                if(isdir(current_folder_path.c_str()) == true) {
                    if(keepDuplicates == true || std::find(results.begin(),results.end(),current_folder) == results.end()) {
@@ -238,7 +240,10 @@ void findAll(const vector<string> &paths, const string &fileFilter, vector<strin
    results.clear();
    size_t pathCount = paths.size();
    for(unsigned int idx = 0; idx < pathCount; idx++) {
-        string path = paths[idx] + "/" + fileFilter;
+    	string currentPath = paths[idx];
+    	endPathWithSlash(currentPath);
+
+    	string path = currentPath + fileFilter;
        vector<string> current_results;
        findAll(path, current_results, cutExtension, errorOnNotFound);
        if(current_results.size() > 0) {
@@ -401,6 +406,12 @@ bool EndsWith(const string &str, const string& key)
    return result;
 }

+void endPathWithSlash(string &path) {
+	if(EndsWith(path, "/") == false && EndsWith(path, "\\") == false) {
+		path += "/";
+	}
+}
+
 string getCRCCacheFilePath() {
 	return crcCachePath;
 }
@@ -656,8 +667,12 @@ int32 getFolderTreeContentsCheckSumRecursively(const string &path, const string
 		if( S_ISDIR(statStruct.st_mode) == 0)
 			continue;
 #endif
-		const char* p = globbuf.gl_pathv[i];
-        getFolderTreeContentsCheckSumRecursively(string(p) + "/*", filterFileExt, &checksum);
+		const char *p = globbuf.gl_pathv[i];
+
+    	string currentPath = p;
+    	endPathWithSlash(currentPath);
+
+        getFolderTreeContentsCheckSumRecursively(currentPath + "*", filterFileExt, &checksum);
 	}

 	globfree(&globbuf);
@@ -829,7 +844,11 @@ vector<string> getFolderTreeContentsListRecursively(const string &path, const st
 		if(includeFolders == true) {
 			resultFiles.push_back(p);
 		}
-		resultFiles = getFolderTreeContentsListRecursively(string(p) + "/*", filterFileExt, includeFolders,&resultFiles);
+
+    	string currentPath = p;
+    	endPathWithSlash(currentPath);
+
+		resultFiles = getFolderTreeContentsListRecursively(currentPath + "*", filterFileExt, includeFolders,&resultFiles);
 	}

 	globfree(&globbuf);
@@ -953,8 +972,12 @@ vector<std::pair<string,int32> > getFolderTreeContentsCheckSumListRecursively(co
 		if( S_ISDIR(statStruct.st_mode) == 0)
 			continue;
 #endif
-		const char* p = globbuf.gl_pathv[i];
-        checksumFiles = getFolderTreeContentsCheckSumListRecursively(string(p) + "/*", filterFileExt, &checksumFiles);
+		const char *p = globbuf.gl_pathv[i];
+
+    	string currentPath = p;
+    	endPathWithSlash(currentPath);
+
+        checksumFiles = getFolderTreeContentsCheckSumListRecursively(currentPath + "*", filterFileExt, &checksumFiles);
 	}

 	globfree(&globbuf);
@@ -972,7 +995,6 @@ vector<std::pair<string,int32> > getFolderTreeContentsCheckSumListRecursively(co

 string extractFileFromDirectoryPath(string filename) {
 	size_t lastDirectory     = filename.find_last_of("/\\");
-    //return filename.substr( 0, filename.rfind("/")+1 );
 	if (lastDirectory == string::npos) {
 		return filename;
 	}
@@ -982,14 +1004,10 @@ string extractFileFromDirectoryPath(string filename) {

 string extractDirectoryPathFromFile(string filename) {
 	size_t lastDirectory     = filename.find_last_of("/\\");
-	//printf("In [%s::%s Line: %d] filename = [%s] lastDirectory= %u\n",__FILE__,__FUNCTION__,__LINE__,filename.c_str(),lastDirectory);
-
 	string path = "";
-    //return filename.substr( 0, filename.rfind("/")+1 );
 	if (lastDirectory != string::npos) {
 		path = filename.substr( 0, lastDirectory + 1);
 	}
-	//printf("In [%s::%s Line: %d] filename = [%s] path = [%s]\n",__FILE__,__FUNCTION__,__LINE__,filename.c_str(),path.c_str());

 	return path;
 }
@@ -1356,6 +1374,16 @@ bool removeFile(string file) {
    return (result == 0);
 }

+bool renameFile(string oldFile, string newFile) {
+#ifdef WIN32
+	int result = _rename(oldFile.c_str(),newFile.c_str());
+#else
+	int result = rename(oldFile.c_str(),newFile.c_str());
+#endif
+
+    return (result == 0);
+}
+
 // =====================================
 //         ModeInfo
 // =====================================
@@ -1371,15 +1399,19 @@ string ModeInfo::getString() const{
 }

 void ValueCheckerVault::addItemToVault(const void *ptr,int value) {
-#ifndef _DISABLE MEMORY_VAULT_CHECKS
+#ifndef _DISABLE_MEMORY_VAULT_CHECKS
+
 	Checksum checksum;
 	vaultList[ptr] = checksum.addInt(value);
+
 #endif
+
 //	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] add vault key [%p] value [%s] [%d]\n",__FILE__,__FUNCTION__,__LINE__,ptr,intToStr(checksum.getSum()).c_str(),value);
 }

 void ValueCheckerVault::checkItemInVault(const void *ptr,int value) const {
-#ifndef _DISABLE MEMORY_VAULT_CHECKS
+#ifndef _DISABLE_MEMORY_VAULT_CHECKS
+
 	map<const void *,int32>::const_iterator iterFind = vaultList.find(ptr);
 	if(iterFind == vaultList.end()) {
 //		if(SystemFlags::VERBOSE_MODE_ENABLED) {
@@ -1402,7 +1434,9 @@ void ValueCheckerVault::checkItemInVault(const void *ptr,int value) const {
 //		}
 		throw std::runtime_error("memory value has been unexpectedly modified (changed)!");
 	}
+
 #endif
+
 }


--- a/source/shared_lib/sources/platform/posix/miniftpclient.cpp
+++ b/source/shared_lib/sources/platform/posix/miniftpclient.cpp
@@ -240,9 +240,7 @@ FTP_Client_ResultType FTPClientThread::getMapFromServer(string mapFileName, stri
    string destFileExt = "";
    string destFile = this->mapsPath.second;

-    if(EndsWith(destFile,"/") == false && EndsWith(destFile,"\\") == false) {
-        destFile += "/";
-    }
+	endPathWithSlash(destFile);
    destFile += mapFileName;

    if(EndsWith(destFile,".mgm") == false && EndsWith(destFile,".gbm") == false) {
@@ -388,34 +386,22 @@ FTP_Client_ResultType FTPClientThread::getTilesetFromServer(string tileSetName,
    string destRootFolder = "";
    if(tileSetNameSubfolder == "") {
        destRootFolder = this->tilesetsPath.second;
-        if( EndsWith(destRootFolder,"/") == false &&
-        	EndsWith(destRootFolder,"\\") == false) {
-             destRootFolder += "/";
-        }
+        endPathWithSlash(destRootFolder);
+
        destRootArchiveFolder = destRootFolder;
        destRootFolder += tileSetName;
-        if( EndsWith(destRootFolder,"/") == false &&
-        	EndsWith(destRootFolder,"\\") == false) {
-             destRootFolder += "/";
-        }
+        endPathWithSlash(destRootFolder);

        createDirectoryPaths(destRootFolder);
    }

-    if(EndsWith(destFile,"/") == false && EndsWith(destFile,"\\") == false) {
-        destFile += "/";
-    }
+    endPathWithSlash(destFile);
    destFile += tileSetName;
-    if(EndsWith(destFile,"/") == false && EndsWith(destFile,"\\") == false) {
-        destFile += "/";
-    }
+    endPathWithSlash(destFile);

    if(tileSetNameSubfolder != "") {
        destFile += tileSetNameSubfolder;
-
-        if(EndsWith(destFile,"/") == false && EndsWith(destFile,"\\") == false) {
-            destFile += "/";
-        }
+        endPathWithSlash(destFile);
    }

    if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> FTP Client thread about to try to RETR into [%s] findArchive = %d\n",destFile.c_str(),findArchive);
@@ -580,26 +566,16 @@ FTP_Client_ResultType FTPClientThread::getTechtreeFromServer(string techtreeName
    string destRootArchiveFolder = "";
    string destRootFolder = "";
 	destRootFolder = this->techtreesPath.second;
-	if( EndsWith(destRootFolder,"/") == false &&
-		EndsWith(destRootFolder,"\\") == false) {
-		 destRootFolder += "/";
-	}
+	endPathWithSlash(destRootFolder);
 	destRootArchiveFolder = destRootFolder;
 	destRootFolder += techtreeName;
-	if( EndsWith(destRootFolder,"/") == false &&
-		EndsWith(destRootFolder,"\\") == false) {
-		 destRootFolder += "/";
-	}
+	endPathWithSlash(destRootFolder);

 	createDirectoryPaths(destRootFolder);

-    if(EndsWith(destFile,"/") == false && EndsWith(destFile,"\\") == false) {
-        destFile += "/";
-    }
+	endPathWithSlash(destFile);
    destFile += techtreeName;
-    if(EndsWith(destFile,"/") == false && EndsWith(destFile,"\\") == false) {
-        destFile += "/";
-    }
+    endPathWithSlash(destFile);

    if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> FTP Client thread about to try to RETR into [%s]\n",destFile.c_str());
    SystemFlags::OutputDebug(SystemFlags::debugNetwork,"===> FTP Client thread about to try to RETR into [%s]\n",destFile.c_str());
--- a/source/shared_lib/sources/util/profiler.cpp
+++ b/source/shared_lib/sources/util/profiler.cpp
@@ -79,9 +79,7 @@ Profiler::~Profiler(){
    else {
        string userData = config.getString("UserData_Root","");
        if(userData != "") {
-            if(userData != "" && EndsWith(userData, "/") == false && EndsWith(userData, "\\") == false) {
-            	userData += "/";
-            }
+        	endPathWithSlash(userData);
        }
        profileLog = userData + profileLog;
    }
--- a/source/shared_lib/sources/util/util.cpp
+++ b/source/shared_lib/sources/util/util.cpp
@@ -322,9 +322,10 @@ void SystemFlags::handleDebug(DebugType type, const char *fmt, ...) {
    vsnprintf(szBuf,max_debug_buffer_size-1,fmt, argList);
    va_end(argList);

-    if(SystemFlags::ENABLE_THREADED_LOGGING &&
-       threadLogger != NULL &&
-       threadLogger->getRunningStatus() == true) {
+    if( currentDebugLog.debugLogFileName != "" &&
+    	SystemFlags::ENABLE_THREADED_LOGGING &&
+    	threadLogger != NULL &&
+        threadLogger->getRunningStatus() == true) {
        threadLogger->addLogEntry(type, szBuf);
    }
    else {