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

its "Healthbar" in translation, not "HealthBar"

This commit is contained in:
titiger 2014-11-23 01:52:38 +01:00
parent c798f87504
commit 6b35fa1918
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/glest_game/game/game.cpp
View File

@ -4662,27 +4662,27 @@ void Game::keyDown(SDL_KeyboardEvent key) {
switch (healthbarMode) { switch (healthbarMode) {
case hbvUndefined: case hbvUndefined:
healthbarMode=hbvOff; healthbarMode=hbvOff;
console.addLine(lang.getString("HealthBar")+": "+lang.getString("HealthbarsOff")); console.addLine(lang.getString("Healthbar")+": "+lang.getString("HealthbarsOff"));
break; break;
case hbvOff: case hbvOff:
healthbarMode=hbvAlways; healthbarMode=hbvAlways;
console.addLine(lang.getString("HealthBar")+": "+lang.getString("HealthbarsAlways")); console.addLine(lang.getString("Healthbar")+": "+lang.getString("HealthbarsAlways"));
break; break;
case hbvAlways: case hbvAlways:
healthbarMode=hbvIfNeeded; healthbarMode=hbvIfNeeded;
console.addLine(lang.getString("HealthBar")+": "+lang.getString("HealthbarsIfNeeded")); console.addLine(lang.getString("Healthbar")+": "+lang.getString("HealthbarsIfNeeded"));
break; break;
case hbvIfNeeded: case hbvIfNeeded:
healthbarMode=hbvSelected; healthbarMode=hbvSelected;
console.addLine(lang.getString("HealthBar")+": "+lang.getString("HealthbarsSelected")); console.addLine(lang.getString("Healthbar")+": "+lang.getString("HealthbarsSelected"));
break; break;
case hbvSelected: case hbvSelected:
healthbarMode=hbvSelected | hbvIfNeeded; healthbarMode=hbvSelected | hbvIfNeeded;
console.addLine(lang.getString("HealthBar")+": "+lang.getString("HealthbarsSelectedOrNeeded")); console.addLine(lang.getString("Healthbar")+": "+lang.getString("HealthbarsSelectedOrNeeded"));
break; break;
case (hbvSelected | hbvIfNeeded): case (hbvSelected | hbvIfNeeded):
healthbarMode=hbvUndefined; healthbarMode=hbvUndefined;
console.addLine(lang.getString("HealthBar")+": "+lang.getString("HealthbarsFactionDefault")); console.addLine(lang.getString("Healthbar")+": "+lang.getString("HealthbarsFactionDefault"));
break; break;
default: default:
printf("In [%s::%s Line: %d] Toggle Healthbars Hotkey - Invalid Value. Setting to default.\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); printf("In [%s::%s Line: %d] Toggle Healthbars Hotkey - Invalid Value. Setting to default.\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);

2
source/glest_game/menu/menu_state_options.cpp
View File

@ -229,7 +229,7 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu, Program
labelHealthBars.registerGraphicComponent(containerName,"labelHealthBars"); labelHealthBars.registerGraphicComponent(containerName,"labelHealthBars");
labelHealthBars.init(currentLabelStart ,currentLine); labelHealthBars.init(currentLabelStart ,currentLine);
labelHealthBars.setText(lang.getString("HealthBar")); labelHealthBars.setText(lang.getString("Healthbar"));
listBoxHealthBars.registerGraphicComponent(containerName,"lisBoxtHealthBars"); listBoxHealthBars.registerGraphicComponent(containerName,"lisBoxtHealthBars");
listBoxHealthBars.init(currentColumnStart ,currentLine, 300 ); listBoxHealthBars.init(currentColumnStart ,currentLine, 300 );