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

added missing spaces

This commit is contained in:
filux 2017-01-06 23:51:24 +01:00
parent c741c67bf7
commit 6e9b463453
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

@ -1 +1 @@
Subproject commit 6a10670fd56124540f1146b8ae2a2284ac5adbfe
Subproject commit 35fc969fd6f06ba038458386d8f1fa47fb3b7bf7

6
mk/linux/setupBuildDeps.sh
View File

@ -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

4
source/glest_game/gui/gui.cpp
View File

@ -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);

12
source/glest_game/types/command_type.cpp
View File

@ -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