diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index 9ca84f24c..e50454b93 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -1007,7 +1007,8 @@ void Renderer::renderConsoleLine(int lineIndex, int xPosition, int yPosition, in xPosition, (lineIndex * lineHeight) + yPosition); } -void Renderer::renderConsole(const Console *console,const bool showFullConsole,const bool showMenuConsole){ +void Renderer::renderConsole(const Console *console,const bool showFullConsole, + const bool showMenuConsole, int overrideMaxConsoleLines){ if(console == NULL) { throw runtime_error("console == NULL"); } @@ -1023,7 +1024,8 @@ void Renderer::renderConsole(const Console *console,const bool showFullConsole,c } } else if(showMenuConsole) { - for(int i = 0; i < console->getStoredLineCount() && i < maxConsoleLines; ++i) { + int allowedMaxLines = (overrideMaxConsoleLines >= 0 ? overrideMaxConsoleLines : maxConsoleLines); + for(int i = 0; i < console->getStoredLineCount() && i < allowedMaxLines; ++i) { const ConsoleLineInfo &lineInfo = console->getStoredLineItem(i); renderConsoleLine(i, console->getXPos(), console->getYPos(), console->getLineHeight(), console->getFont(), console->getStringToHighlight(), &lineInfo); diff --git a/source/glest_game/graphics/renderer.h b/source/glest_game/graphics/renderer.h index b1f102b88..05c7bfa13 100644 --- a/source/glest_game/graphics/renderer.h +++ b/source/glest_game/graphics/renderer.h @@ -341,7 +341,7 @@ public: void renderMouse3d(); void renderBackground(const Texture2D *texture); void renderTextureQuad(int x, int y, int w, int h, const Texture2D *texture, float alpha=1.f,const Vec3f *color=NULL); - void renderConsole(const Console *console, const bool showAll=false, const bool showMenuConsole=false); + void renderConsole(const Console *console, const bool showAll=false, const bool showMenuConsole=false, int overrideMaxConsoleLines=-1); void renderConsoleLine(int lineIndex, int xPosition, int yPosition, int lineHeight, const Font2D* font, string stringToHightlight, const ConsoleLineInfo *lineInfo); void renderChatManager(const ChatManager *chatManager); void renderResourceStatus(); diff --git a/source/glest_game/menu/menu_state_mods.cpp b/source/glest_game/menu/menu_state_mods.cpp index 746b668d2..810716a8d 100644 --- a/source/glest_game/menu/menu_state_mods.cpp +++ b/source/glest_game/menu/menu_state_mods.cpp @@ -1887,7 +1887,7 @@ void MenuStateMods::render() { } safeMutexFTPProgress.ReleaseLock(); - renderer.renderConsole(&console,showFullConsole,true); + renderer.renderConsole(&console,showFullConsole,true,3); if(mainMessageBox.getEnabled()) { renderer.renderMessageBox(&mainMessageBox);