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

- winner has a small crown under their name now :)

This commit is contained in:
Mark Vejvoda 2011-04-05 13:34:54 +00:00
parent 5add2da254
commit f694c745f7
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/global/core_data.cpp
View File

@ -119,6 +119,10 @@ void CoreData::load() {
checkedCheckBoxTexture->setForceCompressionDisabled(true);
checkedCheckBoxTexture->getPixmap()->load(dir+"/menu/textures/checkbox_checked.tga");
gameWinnerTexture= renderer.newTexture2D(rsGlobal);
gameWinnerTexture->setForceCompressionDisabled(true);
gameWinnerTexture->getPixmap()->load(dir+"/misc_textures/game_winner.png");
//display font
Config &config= Config::getInstance();
string displayFontNamePrefix=config.getString("FontDisplayPrefix");

3
source/glest_game/global/core_data.h
View File

@ -58,6 +58,7 @@ private:
Texture2D *verticalLineTexture;
Texture2D *checkBoxTexture;
Texture2D *checkedCheckBoxTexture;
Texture2D *gameWinnerTexture;
Font2D *displayFont;
Font2D *menuFontNormal;
@ -85,6 +86,8 @@ public:
Texture2D *getCheckBoxTexture() const {return checkBoxTexture;}
Texture2D *getCheckedCheckBoxTexture() const {return checkedCheckBoxTexture;}
Texture2D *getGameWinnerTexture() const {return gameWinnerTexture;}
size_t getLogoTextureExtraCount() const {return logoTextureList.size();}
Texture2D *getLogoTextureExtra(int idx) const {return logoTextureList[idx];}

34
source/glest_game/main/battle_end.cpp
View File

@ -79,13 +79,30 @@ void BattleEnd::render(){
renderer.reset2d();
renderer.renderBackground(CoreData::getInstance().getBackgroundTexture());
int winnerIndex = -1;
int bestScore = -1;
for(int i=0; i<stats.getFactionCount(); ++i){
int team= stats.getTeam(i) + 1;
int kills= stats.getKills(i);
int enemykills= stats.getEnemyKills(i);
int deaths= stats.getDeaths(i);
int unitsProduced= stats.getUnitsProduced(i);
int resourcesHarvested= stats.getResourcesHarvested(i);
int score= enemykills*100 + unitsProduced*50 + resourcesHarvested/10;
if(score > bestScore) {
bestScore = score;
winnerIndex = i;
}
}
textRenderer->begin(CoreData::getInstance().getMenuFontNormal());
int lm= 20;
int bm= 100;
for(int i=0; i<stats.getFactionCount(); ++i){
for(int i = 0; i < stats.getFactionCount(); ++i) {
int textX= lm+160+i*100;
int team= stats.getTeam(i) + 1;
int kills= stats.getKills(i);
@ -139,17 +156,22 @@ void BattleEnd::render(){
};
}
if(stats.getControl(i)!=ctHuman && stats.getControl(i)!=ctNetwork ){
controlString+=" x "+floatToStr(stats.getResourceMultiplier(i),1);
if(stats.getControl(i) != ctHuman && stats.getControl(i) != ctNetwork ) {
controlString += " x " + floatToStr(stats.getResourceMultiplier(i),1);
}
if(i == winnerIndex) {
if(CoreData::getInstance().getGameWinnerTexture() != NULL) {
renderer.renderTextureQuad(textX, bm+380,-1,-1,CoreData::getInstance().getGameWinnerTexture(),0.7f);
}
}
Vec3f color = stats.getPlayerColor(i);
if(stats.getPlayerName(i) != "") {
textRenderer->render(stats.getPlayerName(i).c_str(), textX, bm+400, false, &color);
}
else {
textRenderer->render((lang.get("Player")+" "+intToStr(i+1)).c_str(), textX, bm+400,false, &color);
textRenderer->render((lang.get("Player") + " " + intToStr(i+1)).c_str(), textX, bm+400,false, &color);
}
if(stats.getPersonalityType(i) == fpt_Observer) {