diff --git a/data/glest_game b/data/glest_game index 6a10670f..35fc969f 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 6a10670fd56124540f1146b8ae2a2284ac5adbfe +Subproject commit 35fc969fd6f06ba038458386d8f1fa47fb3b7bf7 diff --git a/mk/linux/setupBuildDeps.sh b/mk/linux/setupBuildDeps.sh index daa75d1a..41b8201a 100755 --- a/mk/linux/setupBuildDeps.sh +++ b/mk/linux/setupBuildDeps.sh @@ -183,12 +183,6 @@ case $distribution in SuSE|SUSE?LINUX|Opensuse*|openSUSE*) case $release in - 13.1) - #LTS - installcommand="zypper install gcc gcc-c++ cmake libSDL2-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel" - $installcommand - if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi - ;; 42.1) installcommand="zypper install gcc gcc-c++ cmake libSDL2-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxWidgets-devel lua-devel libjpeg8-devel libpng16-devel libcurl-devel openal-soft-devel libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel libminiupnpc-devel vlc-devel" $installcommand diff --git a/source/glest_game/gui/gui.cpp b/source/glest_game/gui/gui.cpp index a94c8a9a..3658e26d 100644 --- a/source/glest_game/gui/gui.cpp +++ b/source/glest_game/gui/gui.cpp @@ -841,11 +841,11 @@ void Gui::computeInfoString(int posDisplay){ bool translatedValue= game->showTranslatedTechTree(); const UnitType *building=bct->getBuilding(posDisplay); string str= lang.getString("BuildSpeed",(translatedValue == true ? "" : "english"))+": "+ intToStr(bct->getBuildSkillType()->getSpeed())+"\n"; - str+=""+Lang::getInstance().getString("TimeSteps",(translatedValue == true ? "" : "english"))+":"+intToStr(building->getProductionTime())+"\n"; + str+=""+Lang::getInstance().getString("TimeSteps",(translatedValue == true ? "" : "english"))+": "+intToStr(building->getProductionTime())+"\n"; int64 speed=bct->getBuildSkillType()->getSpeed()+bct->getBuildSkillType()->getTotalSpeed(unit->getTotalUpgrade()); int64 time=building->getProductionTime(); int64 seconds=time*100/speed; - str+=""+Lang::getInstance().getString("Time",(translatedValue == true ? "" : "english"))+":"+intToStr(seconds); + str+=""+Lang::getInstance().getString("Time",(translatedValue == true ? "" : "english"))+": "+intToStr(seconds); str+="\n\n"; str+=building->getReqDesc(translatedValue); display.setInfoText(str); diff --git a/source/glest_game/types/command_type.cpp b/source/glest_game/types/command_type.cpp index b0aa079f..b254a368 100644 --- a/source/glest_game/types/command_type.cpp +++ b/source/glest_game/types/command_type.cpp @@ -749,11 +749,11 @@ 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"; + str+=""+Lang::getInstance().getString("TimeSteps",(translatedValue == true ? "" : "english"))+": "+intToStr(getProducedUnit()->getProductionTime())+"\n"; int64 speed=produceSkillType->getSpeed()+totalUpgrade->getProdSpeed(produceSkillType); int64 time=getProducedUnit()->getProductionTime(); int64 seconds=time*100/speed; - str+=""+Lang::getInstance().getString("Time",(translatedValue == true ? "" : "english"))+":"+intToStr(seconds); + str+=""+Lang::getInstance().getString("Time",(translatedValue == true ? "" : "english"))+": "+intToStr(seconds); str+="\n"; //mpcost @@ -825,11 +825,11 @@ string UpgradeCommandType::getDesc(const TotalUpgrade *totalUpgrade, bool transl str+= "+" + intToStr(totalUpgrade->getProdSpeed(upgradeSkillType)); } str+="\n"; - str+=""+Lang::getInstance().getString("TimeSteps",(translatedValue == true ? "" : "english"))+":"+intToStr(getProducedUpgrade()->getProductionTime())+"\n"; + str+=""+Lang::getInstance().getString("TimeSteps",(translatedValue == true ? "" : "english"))+": "+intToStr(getProducedUpgrade()->getProductionTime())+"\n"; int64 speed=upgradeSkillType->getSpeed()+totalUpgrade->getProdSpeed(upgradeSkillType); int64 time=getProducedUpgrade()->getProductionTime(); int64 seconds=time*100/speed; - str+=""+Lang::getInstance().getString("Time",(translatedValue == true ? "" : "english"))+":"+intToStr(seconds); + str+=""+Lang::getInstance().getString("Time",(translatedValue == true ? "" : "english"))+": "+intToStr(seconds); str+="\n"; if(upgradeSkillType->getEpCost()!=0) @@ -911,11 +911,11 @@ string MorphCommandType::getDesc(const TotalUpgrade *totalUpgrade, bool translat str+="+" + intToStr(totalUpgrade->getProdSpeed(morphSkillType)); } str+="\n"; - str+=""+Lang::getInstance().getString("TimeSteps",(translatedValue == true ? "" : "english"))+":"+intToStr(getMorphUnit()->getProductionTime())+"\n"; + str+=""+Lang::getInstance().getString("TimeSteps",(translatedValue == true ? "" : "english"))+": "+intToStr(getMorphUnit()->getProductionTime())+"\n"; int64 speed=morphSkillType->getSpeed()+totalUpgrade->getProdSpeed(morphSkillType); int64 time=getMorphUnit()->getProductionTime(); int64 seconds=time*100/speed; - str+=""+Lang::getInstance().getString("Time",(translatedValue == true ? "" : "english"))+":"+intToStr(seconds); + str+=""+Lang::getInstance().getString("Time",(translatedValue == true ? "" : "english"))+": "+intToStr(seconds); str+="\n"; //mpcost