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

- bugfix for language files in scenarios and tutorials

Browse Source 
- added numerous performance profiling statements
This commit is contained in:
Mark Vejvoda
2010-05-06 21:29:46 +00:00
parent 304b6653e9
commit 1a6bb489b8
7 changed files with 125 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/shared_lib/sources/platform/common/platform_common.cpp
View File

@@ -574,16 +574,18 @@ string extractFileFromDirectoryPath(string filename)
string extractDirectoryPathFromFile(string filename)
{
size_t lastDirectory_Win = filename.find_last_of('\\');
size_t lastDirectory_Lin = filename.find_last_of('/');
size_t lastDirectory = (lastDirectory_Win<lastDirectory_Lin)?lastDirectory_Lin:lastDirectory_Win;
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) {
return "";
if (lastDirectory != string::npos) {
path = filename.substr( 0, lastDirectory + 1);
}
return 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;
}
string extractExtension(const string& filepath) {

2
source/shared_lib/sources/platform/sdl/gl_wrap.cpp
View File

@@ -96,6 +96,8 @@ int CALLBACK EnumFontFamExProc(ENUMLOGFONTEX *lpelfe,
void createGlFontBitmaps(uint32 &base, const string &type, int size, int width,
int charCount, FontMetrics &metrics) {
// -adecw-screen-medium-r-normal--18-180-75-75-m-160-gb2312.1980-1 this is a Chinese font
#ifdef X11_AVAILABLE
Display* display = glXGetCurrentDisplay();
if(display == 0) {

4
source/shared_lib/sources/util/util.cpp
View File

@@ -203,12 +203,12 @@ void SystemFlags::OutputDebug(DebugType type, const char *fmt, ...) {
assert(currentDebugLog.fileStream != NULL);
//currentDebugLog.mutex->p();
currentDebugLog.mutex->p();
(*currentDebugLog.fileStream) << "[" << szBuf2 << "] " << szBuf;
(*currentDebugLog.fileStream).flush();
//currentDebugLog.mutex->v();
currentDebugLog.mutex->v();
}
// output to console
else {