diff --git a/source/glest_game/ai/route_planner.cpp b/source/glest_game/ai/route_planner.cpp index 88948d37..67c9e3dc 100644 --- a/source/glest_game/ai/route_planner.cpp +++ b/source/glest_game/ai/route_planner.cpp @@ -107,7 +107,7 @@ RoutePlanner::RoutePlanner(World *world) , nodeStore(NULL) , tSearchEngine(NULL) , tNodeStore(NULL) { -#ifdef _GAE_DEBUG_EDITION_ +#ifdef DEBUG_SEARCH_TEXTURES debug_texture_action=SHOW_PATH_ONLY; #endif const int &w = world->getMap()->getW(); diff --git a/source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp b/source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp index 56e205c3..5bea479d 100644 --- a/source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp @@ -523,10 +523,6 @@ void TextRenderer3DGl::internalRender(const string &text, float x, float y, boo //assertGl(); - float scaleX = Font::scaleFontValue; - float scaleY = Font::scaleFontValue; - float scaleZ = 1.0; - //int scaleWidthX = (font->getTextHandler()->Advance(renderText.c_str()) * scaleX) / 2.0; //glTranslatef(translatePos.x + scaleWidthX, 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); if(font->getTextHandler() != NULL) { + float scaleX = Font::scaleFontValue; + float scaleY = Font::scaleFontValue; + float scaleZ = 1.0; + glScalef(scaleX, scaleY, scaleZ); if(text.find("\n") == renderText.npos && renderText.find("\t") == renderText.npos) { //assertGl(); diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp index d49886f6..7614a354 100644 --- a/source/shared_lib/sources/platform/posix/socket.cpp +++ b/source/shared_lib/sources/platform/posix/socket.cpp @@ -2320,7 +2320,7 @@ void BroadCastSocketThread::execute() { /* get my host name */ gethostname(myhostname,100); - struct hostent*myhostent = gethostbyname(myhostname); + //struct hostent*myhostent = gethostbyname(myhostname); // get all host IP addresses std::vector ipList = Socket::getLocalIPAddressList();