From 2f45ffc59dbe493a75571c446de0cc9203587f86 Mon Sep 17 00:00:00 2001 From: titiger Date: Sun, 11 Dec 2016 19:41:08 +0100 Subject: [PATCH] display "time" value for upgrades/build or produced things --- source/glest_game/gui/gui.cpp | 5 ++++- source/glest_game/types/command_type.cpp | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/source/glest_game/gui/gui.cpp b/source/glest_game/gui/gui.cpp index 87aa2cad..8de8eeee 100644 --- a/source/glest_game/gui/gui.cpp +++ b/source/glest_game/gui/gui.cpp @@ -838,7 +838,10 @@ void Gui::computeInfoString(int posDisplay){ if(unit->getFaction()->isUnitLocked(bct->getBuilding(posDisplay))){ display.setInfoText(lang.getString("LockedByScenario")+"\n\n"+bct->getBuilding(posDisplay)->getReqDesc(game->showTranslatedTechTree())); } else { - display.setInfoText(bct->getBuilding(posDisplay)->getReqDesc(game->showTranslatedTechTree())); + bool translatedValue= game->showTranslatedTechTree(); + string str=""+Lang::getInstance().getString("TimeSteps",(translatedValue == true ? "" : "english"))+":"+intToStr(bct->getBuilding(posDisplay)->getProductionTime())+"\n\n"; + str+=bct->getBuilding(posDisplay)->getReqDesc(translatedValue); + display.setInfoText(str); } } } diff --git a/source/glest_game/types/command_type.cpp b/source/glest_game/types/command_type.cpp index 1c5f58cd..5fa0ecc0 100644 --- a/source/glest_game/types/command_type.cpp +++ b/source/glest_game/types/command_type.cpp @@ -749,6 +749,7 @@ string ProduceCommandType::getDesc(const TotalUpgrade *totalUpgrade, bool transl str+="+" + intToStr(totalUpgrade->getProdSpeed(produceSkillType)); } str+="\n"; + str+=""+Lang::getInstance().getString("TimeSteps",(translatedValue == true ? "" : "english"))+":"+intToStr(getProducedUnit()->getProductionTime())+"\n\n"; //mpcost if(produceSkillType->getEpCost()!=0){ @@ -815,6 +816,7 @@ string UpgradeCommandType::getDesc(const TotalUpgrade *totalUpgrade, bool transl str=getName(translatedValue)+"\n"; str+= lang.getString("UpgradeSpeed",(translatedValue == true ? "" : "english"))+": "+ intToStr(upgradeSkillType->getSpeed())+"\n"; + str+=""+Lang::getInstance().getString("TimeSteps",(translatedValue == true ? "" : "english"))+":"+intToStr(getProducedUpgrade()->getProductionTime())+"\n\n"; if(upgradeSkillType->getEpCost()!=0) str+= lang.getString("EpCost",(translatedValue == true ? "" : "english"))+": "+intToStr(upgradeSkillType->getEpCost())+"\n"; if(upgradeSkillType->getHpCost()!=0) @@ -890,6 +892,7 @@ string MorphCommandType::getDesc(const TotalUpgrade *totalUpgrade, bool translat //prod speed str+= lang.getString("MorphSpeed",(translatedValue == true ? "" : "english"))+": "+ intToStr(morphSkillType->getSpeed())+"\n"; + str+=""+Lang::getInstance().getString("TimeSteps",(translatedValue == true ? "" : "english"))+":"+intToStr(getMorphUnit()->getProductionTime())+"\n\n"; //mpcost if(morphSkillType->getEpCost()!=0){