Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- stop internet lobby chat from overflowing into other UI elements

This commit is contained in:
Mark Vejvoda 2012-11-09 18:09:32 +00:00
parent 0e0aa52f17
commit cc8b983b99
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7865,7 +7865,7 @@ void Renderer::init2dList() {
} }
void Renderer::render2dMenuSetup() { void Renderer::render2dMenuSetup() {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
const Metrics &metrics= Metrics::getInstance(); const Metrics &metrics= Metrics::getInstance();
//projection //projection
@ -7874,13 +7874,13 @@ void Renderer::render2dMenuSetup() {
glLoadIdentity(); glLoadIdentity();
glOrtho(0, metrics.getVirtualW(), 0, metrics.getVirtualH(), 0, 1); glOrtho(0, metrics.getVirtualW(), 0, metrics.getVirtualH(), 0, 1);
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
//modelview //modelview
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
//disable everything //disable everything
glDisable(GL_BLEND); glDisable(GL_BLEND);
@ -7892,7 +7892,7 @@ void Renderer::render2dMenuSetup() {
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
glFrontFace(GL_CCW); glFrontFace(GL_CCW);
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
if(glActiveTexture != NULL) { if(glActiveTexture != NULL) {
glActiveTexture(baseTexUnit); glActiveTexture(baseTexUnit);
@ -7903,12 +7903,12 @@ void Renderer::render2dMenuSetup() {
throw megaglest_runtime_error(szBuf); throw megaglest_runtime_error(szBuf);
} }
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
//blend func //blend func
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@ -7916,7 +7916,7 @@ void Renderer::render2dMenuSetup() {
//color //color
glColor4f(1.f, 1.f, 1.f, 1.f); glColor4f(1.f, 1.f, 1.f, 1.f);
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
} }
void Renderer::init3dListMenu(const MainMenu *mm) { void Renderer::init3dListMenu(const MainMenu *mm) {
@ -8026,7 +8026,7 @@ void Renderer::init3dListMenu(const MainMenu *mm) {
} }
void Renderer::render3dMenuSetup(const MainMenu *mm) { void Renderer::render3dMenuSetup(const MainMenu *mm) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
const Metrics &metrics= Metrics::getInstance(); const Metrics &metrics= Metrics::getInstance();
const MenuBackground *mb = NULL; const MenuBackground *mb = NULL;

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

@ -721,7 +721,7 @@ void MenuStateMasterserver::render(){
ircClient->getHasJoinedChannel() == true) { ircClient->getHasJoinedChannel() == true) {
renderer.renderChatManager(&chatManager); renderer.renderChatManager(&chatManager);
} }
renderer.renderConsole(&consoleIRC,true,true); renderer.renderConsole(&consoleIRC,false,true,21);
} }
if(program != NULL) program->renderProgramMsgBox(); if(program != NULL) program->renderProgramMsgBox();