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

- updated unit already in cell error with more detail

Browse Source
This commit is contained in:
Mark Vejvoda
2012-10-11 14:23:31 +00:00
parent 6b324cbb4e
commit a9d5af5261
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/world/map.cpp
View File

@@ -1294,7 +1294,9 @@ void Map::putUnitCellsPrivate(Unit *unit, const Vec2i &pos, const UnitType *ut,
} }
} }
else { else {
throw megaglest_runtime_error("trying to move into occupied cell and field"); char szBuf[8096]="";
sprintf(szBuf,"Trying to move unit [%d - %s] into occupied cell [%s] and field = %d, unit already in cell [%d - %s] ",unit->getId(),unit->getType()->getName().c_str(),pos.getString().c_str(),field,getCell(currPos)->getUnit(field)->getId(),getCell(currPos)->getUnit(field)->getType()->getName().c_str());
throw megaglest_runtime_error(szBuf);
} }
} }

8
source/shared_lib/sources/graphics/font.cpp
View File

@@ -147,7 +147,7 @@ float FontMetrics::getTextWidth(const string &str) {
float width= 0.f; float width= 0.f;
for(unsigned int i=0; i< longestLine.size() && (int)i < Font::charCount; ++i){ for(unsigned int i=0; i< longestLine.size() && (int)i < Font::charCount; ++i){
if(longestLine[i] >= Font::charCount) { if(longestLine[i] >= Font::charCount) {
string sError = "str[i] >= Font::charCount, [" + longestLine + "] i = " + intToStr(i); string sError = "str[i] >= Font::charCount, [" + longestLine + "] i = " + uIntToStr(i);
throw megaglest_runtime_error(sError); throw megaglest_runtime_error(sError);
} }
//Treat 2 byte characters as spaces //Treat 2 byte characters as spaces
@@ -316,7 +316,7 @@ string findFontFamily(const char* font, const char *fontFamily) {
fs = FcFontSetCreate(); fs = FcFontSetCreate();
match = FcFontMatch(0, pat, &result); match = FcFontMatch(0, pat, &result);
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Trying fontconfig for fontfamily [%s]\n",fontFamily); if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Trying fontconfig for fontfamily [%s]\n",(fontFamily != NULL ? fontFamily : "null"));
if (match) FcFontSetAdd(fs, match); if (match) FcFontSetAdd(fs, match);
if (pat) FcPatternDestroy(pat); if (pat) FcPatternDestroy(pat);
@@ -347,7 +347,7 @@ const char* findFont(const char *firstFontToTry,const char *firstFontFamilyToTry
if( font == NULL && path != NULL && strlen(path) > 0 && fileExists(path) == true ) { \ if( font == NULL && path != NULL && strlen(path) > 0 && fileExists(path) == true ) { \
font = strdup(path); \ font = strdup(path); \
} \ } \
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("#1 Searching for font file [%s] result [%s]\n",path,font); \ if(SystemFlags::VERBOSE_MODE_ENABLED) printf("#1 Searching for font file [%s] result [%s]\n",(path != NULL ? path : "null"),(font != NULL ? font : "null")); \
if( font != NULL && fontFamily != NULL && strlen(fontFamily) > 0) { \ if( font != NULL && fontFamily != NULL && strlen(fontFamily) > 0) { \
string fileFound = findFontFamily(font, fontFamily); \ string fileFound = findFontFamily(font, fontFamily); \
if(fileFound != "") { \ if(fileFound != "") { \
@@ -356,7 +356,7 @@ const char* findFont(const char *firstFontToTry,const char *firstFontFamilyToTry
font = strdup(path); \ font = strdup(path); \
} \ } \
} \ } \
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("#2 Searching for font family [%s] result [%s]\n",fontFamily,font); \ if(SystemFlags::VERBOSE_MODE_ENABLED) printf("#2 Searching for font family [%s] result [%s]\n",(fontFamily != NULL ? fontFamily : "null"),(font != NULL ? font : "null")); \
} \ } \
} }