diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp index a62b82ce..4830f54b 100644 --- a/source/glest_game/game/game.cpp +++ b/source/glest_game/game/game.cpp @@ -3768,6 +3768,11 @@ void Game::render2d() { } } + // clock + if(photoModeEnabled == false) { + renderer.renderClock(); + } + //resource info if(photoModeEnabled == false) { if(this->masterserverMode == false) { diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index 4eca3858..31576354 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -2241,6 +2241,36 @@ void Renderer::renderChatManager(const ChatManager *chatManager) { } } +void Renderer::renderClock() { + if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) { + return; + } + + const Metrics &metrics = Metrics::getInstance(); + const World *world = game->getWorld(); + const Vec4f fontColor = game->getGui()->getDisplay()->getColor(); + + int hours = world->getTimeFlow()->getTime(); + int minutes = (world->getTimeFlow()->getTime() - hours) * 100 * 0.6; // scale 100 to 60 + + char szBuf[100]=""; + sprintf(szBuf,"%.2d:%.2d",hours,minutes); + string str = szBuf; + + if(renderText3DEnabled == true) { + renderTextShadow3D( + str, CoreData::getInstance().getDisplayFontSmall3D(), + fontColor, + 10, metrics.getVirtualH()-160, false); + } + else { + renderTextShadow( + str, CoreData::getInstance().getDisplayFontSmall(), + fontColor, + 10, metrics.getVirtualH()-160, false); + } +} + void Renderer::renderResourceStatus() { if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) { return; diff --git a/source/glest_game/graphics/renderer.h b/source/glest_game/graphics/renderer.h index a9d5c597..11b61dfe 100644 --- a/source/glest_game/graphics/renderer.h +++ b/source/glest_game/graphics/renderer.h @@ -478,6 +478,7 @@ public: void renderConsoleLine(int lineIndex, int xPosition, int yPosition, int lineHeight, Font2D* font, string stringToHightlight, const ConsoleLineInfo *lineInfo); void renderChatManager(const ChatManager *chatManager); + void renderClock(); void renderResourceStatus(); void renderSelectionQuad(); void renderText(const string &text, Font2D *font, float alpha, int x, int y, bool centered= false);