Yet another code cleanup

This commit is contained in:
mathusummut
2018-11-03 15:26:37 +01:00
parent 8db9ad9e9f
commit 0cfe7e81d1
312 changed files with 140658 additions and 141390 deletions

View File

@@ -73,22 +73,19 @@ const char *folderDelimiter = "/";
// Because g3d should always support alpha transparency
string fileFormat = "png";
namespace ZetaGlest {
namespace Game {
string getGameReadWritePath(const string &lookupKey) {
string path = "";
if (path == "" && getenv("GLESTHOME") != NULL) {
path = safeCharPtrCopy(getenv("GLESTHOME"), 8096);
if (path != "" && EndsWith(path, "/") == false && EndsWith(path, "\\") == false) {
path += "/";
}
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] path to be used for read/write files [%s]\n",__FILE__,__FUNCTION__,__LINE__,path.c_str());
namespace Game {
string getGameReadWritePath(const string &lookupKey) {
string path = "";
if (path == "" && getenv("GLESTHOME") != NULL) {
path = safeCharPtrCopy(getenv("GLESTHOME"), 8096);
if (path != "" && EndsWith(path, "/") == false && EndsWith(path, "\\") == false) {
path += "/";
}
return path;
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] path to be used for read/write files [%s]\n",__FILE__,__FUNCTION__,__LINE__,path.c_str());
}
return path;
}
}
@@ -2555,7 +2552,7 @@ namespace Shared {
return 0;
}
}
}//end namespace
}
} //end namespace
IMPLEMENT_APP_CONSOLE(Shared::G3dViewer::App)

View File

@@ -38,7 +38,7 @@
#include "unit_particle_type.h"
using std::string;
using namespace ZetaGlest::Game;
using namespace Game;
namespace Shared {
namespace G3dViewer {
@@ -242,7 +242,7 @@ namespace Shared {
};
}
}//end namespace
} //end namespace
DECLARE_APP(Shared::G3dViewer::App)

View File

@@ -27,7 +27,7 @@
using namespace Shared::Graphics;
using namespace Shared::Graphics::Gl;
using namespace ZetaGlest::Game;
using namespace Game;
using namespace Shared::Util;
namespace Shared {
@@ -502,4 +502,4 @@ namespace Shared {
}
}
}//end namespace
} //end namespace

View File

@@ -163,6 +163,6 @@ namespace Shared {
};
}
}//end namespace
} //end namespace
#endif