diff --git a/mk/linux/configure.ac b/mk/linux/configure.ac index 9978eb8a..18b88531 100644 --- a/mk/linux/configure.ac +++ b/mk/linux/configure.ac @@ -4,7 +4,7 @@ #---------------------------------------------------------------------------- AC_PREREQ([2.54]) -AC_INIT([megaglest], [3.3.3], [matze@braunis.de]) +AC_INIT([megaglest], [3.3.4-dev], [matze@braunis.de]) AC_CONFIG_SRCDIR([mk/jam/build.jam]) AC_CONFIG_AUX_DIR([mk/autoconf]) diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp index 4db52c11..ae8ecc33 100644 --- a/source/glest_game/facilities/game_util.cpp +++ b/source/glest_game/facilities/game_util.cpp @@ -25,7 +25,7 @@ using namespace Shared::Platform; namespace Glest{ namespace Game{ const string mailString= "contact_game@glest.org"; -const string glestVersionString= "v3.3.3"; +const string glestVersionString= "v3.3.4-dev"; string getCrashDumpFileName(){ return "glest"+glestVersionString+".dmp"; diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index ae60cc25..7c88ab25 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -689,18 +689,26 @@ void Renderer::renderTextureQuad(int x, int y, int w, int h, const Texture2D *te } void Renderer::renderConsole(const Console *console){ - const Gui *gui= game->getGui(); glPushAttrib(GL_ENABLE_BIT); glEnable(GL_BLEND); + Vec4f fontColor; + + if(game!=NULL){ + fontColor=game->getGui()->getDisplay()->getColor(); + } + else { + // white shadowed is default ( in the menu for example ) + fontColor=Vec4f(1.f, 1.f, 1.f, 0.0f); + } for(int i=0; igetLineCount(); ++i){ renderTextShadow( console->getLine(i), CoreData::getInstance().getConsoleFont(), - gui->getDisplay()->getColor(), + fontColor, 20, i*20+20); } - + glPopAttrib(); } @@ -728,10 +736,9 @@ void Renderer::renderChatManager(const ChatManager *chatManager){ void Renderer::renderResourceStatus(){ const Metrics &metrics= Metrics::getInstance(); - const Gui *gui= game->getGui(); const World *world= game->getWorld(); const Faction *thisFaction= world->getFaction(world->getThisFactionIndex()); - + const Vec4f fontColor=game->getGui()->getDisplay()->getColor(); assertGl(); glPushAttrib(GL_ENABLE_BIT); @@ -777,7 +784,7 @@ void Renderer::renderResourceStatus(){ renderTextShadow( str, CoreData::getInstance().getDisplayFontSmall(), - gui->getDisplay()->getColor(), + fontColor, j*100+220, metrics.getVirtualH()-30, false); ++j; }