mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-17 21:51:17 +02:00
Code Issues Projects Releases Wiki Activity

mod menu now only shows 3 lines max for console messages

Browse Source
This commit is contained in:
Mark Vejvoda
2011-04-14 23:13:44 +00:00
parent 04d9bc5992
commit 431ca8e6fb
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_game/graphics/renderer.cpp
View File

@@ -1007,7 +1007,8 @@ void Renderer::renderConsoleLine(int lineIndex, int xPosition, int yPosition, in
xPosition, (lineIndex * lineHeight) + yPosition); 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) { if(console == NULL) {
throw runtime_error("console == NULL"); throw runtime_error("console == NULL");
} }
@@ -1023,7 +1024,8 @@ void Renderer::renderConsole(const Console *console,const bool showFullConsole,c
} }
} }
else if(showMenuConsole) { 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); const ConsoleLineInfo &lineInfo = console->getStoredLineItem(i);
renderConsoleLine(i, console->getXPos(), console->getYPos(), renderConsoleLine(i, console->getXPos(), console->getYPos(),
console->getLineHeight(), console->getFont(), console->getStringToHighlight(), &lineInfo); console->getLineHeight(), console->getFont(), console->getStringToHighlight(), &lineInfo);

2
source/glest_game/graphics/renderer.h
View File

@@ -341,7 +341,7 @@ public:
void renderMouse3d(); void renderMouse3d();
void renderBackground(const Texture2D *texture); 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 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 renderConsoleLine(int lineIndex, int xPosition, int yPosition, int lineHeight, const Font2D* font, string stringToHightlight, const ConsoleLineInfo *lineInfo);
void renderChatManager(const ChatManager *chatManager); void renderChatManager(const ChatManager *chatManager);
void renderResourceStatus(); void renderResourceStatus();

2
source/glest_game/menu/menu_state_mods.cpp
View File

@@ -1887,7 +1887,7 @@ void MenuStateMods::render() {
} }
safeMutexFTPProgress.ReleaseLock(); safeMutexFTPProgress.ReleaseLock();
renderer.renderConsole(&console,showFullConsole,true); renderer.renderConsole(&console,showFullConsole,true,3);
if(mainMessageBox.getEnabled()) { if(mainMessageBox.getEnabled()) {
renderer.renderMessageBox(&mainMessageBox); renderer.renderMessageBox(&mainMessageBox);