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

- menu lobbies uses real player color 

-  chat console no longer prefixes with *
This commit is contained in:
Mark Vejvoda 2010-11-02 20:19:56 +00:00
parent cb52b4895d
commit 6b015964bb
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -861,7 +861,8 @@ void Renderer::RenderConsoleLine(int lineIndex, int xPosition, const ConsoleLine
} }
//printf("playerName [%s], line [%s]\n",playerName.c_str(),line.c_str()); //printf("playerName [%s], line [%s]\n",playerName.c_str(),line.c_str());
string headerLine = "*" + playerName + ":"; //string headerLine = "*" + playerName + ":";
string headerLine = playerName + ":";
renderTextShadow( renderTextShadow(
headerLine, headerLine,
@ -870,7 +871,7 @@ void Renderer::RenderConsoleLine(int lineIndex, int xPosition, const ConsoleLine
xPosition, lineIndex * 20 + 20); xPosition, lineIndex * 20 + 20);
fontColor = defaultFontColor; fontColor = defaultFontColor;
xPosition += (7 * (playerName.length() + 2)); xPosition += (8 * (playerName.length() + 2));
} }
} }
else { else {

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

@ -232,7 +232,7 @@ private:
float waterAnim; float waterAnim;
bool allowRenderUnitTitles; bool allowRenderUnitTitles;
std::vector<std::pair<Unit *,Vec3f> > renderUnitTitleList; //std::vector<std::pair<Unit *,Vec3f> > renderUnitTitleList;
std::vector<Unit *> visibleFrameUnitList; std::vector<Unit *> visibleFrameUnitList;
bool no2DMouseRendering; bool no2DMouseRendering;

4
source/glest_game/menu/menu_state_connected_game.cpp
View File

@ -550,8 +550,8 @@ void MenuStateConnectedGame::render() {
renderer.renderLabel(&labelPlayers[i],&playerColor); renderer.renderLabel(&labelPlayers[i],&playerColor);
// Blend the color with white so make it more readable // Blend the color with white so make it more readable
Vec4f newColor(1.f, 1.f, 1.f, 0.57f); //Vec4f newColor(1.f, 1.f, 1.f, 0.57f);
renderer.renderLabel(&labelPlayers[i],&newColor); //renderer.renderLabel(&labelPlayers[i],&newColor);
//int quadWidth = labelPlayerNames[i].getX() - labelPlayers[i].getX() - 5; //int quadWidth = labelPlayerNames[i].getX() - labelPlayers[i].getX() - 5;
//renderer.renderTextureQuad(labelPlayers[i].getX(), labelPlayers[i].getY(), quadWidth, labelPlayers[i].getH(), crcPlayerTextureCache[i],1.0f,&playerColor); //renderer.renderTextureQuad(labelPlayers[i].getX(), labelPlayers[i].getY(), quadWidth, labelPlayers[i].getH(), crcPlayerTextureCache[i],1.0f,&playerColor);

4
source/glest_game/menu/menu_state_custom_game.cpp
View File

@ -1147,8 +1147,8 @@ void MenuStateCustomGame::render() {
renderer.renderLabel(&labelPlayers[i],&playerColor); renderer.renderLabel(&labelPlayers[i],&playerColor);
// Blend the color with white so make it more readable // Blend the color with white so make it more readable
Vec4f newColor(1.f, 1.f, 1.f, 0.57f); //Vec4f newColor(1.f, 1.f, 1.f, 0.57f);
renderer.renderLabel(&labelPlayers[i],&newColor); //renderer.renderLabel(&labelPlayers[i],&newColor);
//int quadWidth = labelPlayerNames[i].getX() - labelPlayers[i].getX() - 5; //int quadWidth = labelPlayerNames[i].getX() - labelPlayers[i].getX() - 5;
//renderer.renderTextureQuad(labelPlayers[i].getX(), labelPlayers[i].getY(), quadWidth, labelPlayers[i].getH(), crcPlayerTextureCache[i],1.0f,&playerColor); //renderer.renderTextureQuad(labelPlayers[i].getX(), labelPlayers[i].getY(), quadWidth, labelPlayers[i].getH(), crcPlayerTextureCache[i],1.0f,&playerColor);