Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- final phase of cppcheck verbose fixes (outstanding items should be left alone)

Browse Source
This commit is contained in:
Mark Vejvoda 2011-09-01 18:51:43 +00:00
parent bb68106912
commit 4a5a7f010d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/ai/route_planner.cpp
View File

@ -107,7 +107,7 @@ RoutePlanner::RoutePlanner(World *world)
, nodeStore(NULL) , nodeStore(NULL)
, tSearchEngine(NULL) , tSearchEngine(NULL)
, tNodeStore(NULL) { , tNodeStore(NULL) {
#ifdef _GAE_DEBUG_EDITION_ #ifdef DEBUG_SEARCH_TEXTURES
debug_texture_action=SHOW_PATH_ONLY; debug_texture_action=SHOW_PATH_ONLY;
#endif #endif
const int &w = world->getMap()->getW(); const int &w = world->getMap()->getW();

8
source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp
View File

@ -523,10 +523,6 @@ void TextRenderer3DGl::internalRender(const string &text, float x, float y, boo
//assertGl(); //assertGl();
float scaleX = Font::scaleFontValue;
float scaleY = Font::scaleFontValue;
float scaleZ = 1.0;
//int scaleWidthX = (font->getTextHandler()->Advance(renderText.c_str()) * scaleX) / 2.0; //int scaleWidthX = (font->getTextHandler()->Advance(renderText.c_str()) * scaleX) / 2.0;
//glTranslatef(translatePos.x + scaleWidthX, translatePos.y, translatePos.z); //glTranslatef(translatePos.x + scaleWidthX, translatePos.y, translatePos.z);
glTranslatef(translatePos.x, translatePos.y, translatePos.z); glTranslatef(translatePos.x, translatePos.y, translatePos.z);
@ -544,6 +540,10 @@ void TextRenderer3DGl::internalRender(const string &text, float x, float y, boo
// specialFTGLErrorCheckWorkaround(text); // specialFTGLErrorCheckWorkaround(text);
if(font->getTextHandler() != NULL) { if(font->getTextHandler() != NULL) {
float scaleX = Font::scaleFontValue;
float scaleY = Font::scaleFontValue;
float scaleZ = 1.0;
glScalef(scaleX, scaleY, scaleZ); glScalef(scaleX, scaleY, scaleZ);
if(text.find("\n") == renderText.npos && renderText.find("\t") == renderText.npos) { if(text.find("\n") == renderText.npos && renderText.find("\t") == renderText.npos) {
//assertGl(); //assertGl();

2
source/shared_lib/sources/platform/posix/socket.cpp
View File

@ -2320,7 +2320,7 @@ void BroadCastSocketThread::execute() {
/* get my host name */ /* get my host name */
gethostname(myhostname,100); gethostname(myhostname,100);
struct hostent*myhostent = gethostbyname(myhostname); //struct hostent*myhostent = gethostbyname(myhostname);
// get all host IP addresses // get all host IP addresses
std::vector<std::string> ipList = Socket::getLocalIPAddressList(); std::vector<std::string> ipList = Socket::getLocalIPAddressList();