Healthbars in ingame options
This commit is contained in:
parent
94f120a0a4
commit
49e55209da
|
@ -4662,23 +4662,23 @@ void Game::keyDown(SDL_KeyboardEvent key) {
|
||||||
switch (healthbarMode) {
|
switch (healthbarMode) {
|
||||||
case hbvUndefined:
|
case hbvUndefined:
|
||||||
healthbarMode=hbvOff;
|
healthbarMode=hbvOff;
|
||||||
console.addLine(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("HealthbarsAlways"));
|
console.addLine(lang.getString("HealthBar")+": "+lang.getString("HealthbarsAlways"));
|
||||||
break;
|
break;
|
||||||
case hbvAlways:
|
case hbvAlways:
|
||||||
healthbarMode=hbvDamaged;
|
healthbarMode=hbvDamaged;
|
||||||
console.addLine(lang.getString("HealthbarsDamaged"));
|
console.addLine(lang.getString("HealthBar")+": "+lang.getString("HealthbarsDamaged"));
|
||||||
break;
|
break;
|
||||||
case hbvDamaged:
|
case hbvDamaged:
|
||||||
healthbarMode=hbvSelected;
|
healthbarMode=hbvSelected;
|
||||||
console.addLine(lang.getString("HealthbarsSelected"));
|
console.addLine(lang.getString("HealthBar")+": "+lang.getString("HealthbarsSelected"));
|
||||||
break;
|
break;
|
||||||
case hbvSelected:
|
case hbvSelected:
|
||||||
healthbarMode=hbvUndefined;
|
healthbarMode=hbvUndefined;
|
||||||
console.addLine(lang.getString("HealthbarsDefault"));
|
console.addLine(lang.getString("HealthBar")+": "+lang.getString("HealthbarsDefault"));
|
||||||
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__);
|
||||||
|
|
|
@ -227,6 +227,45 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu, Program
|
||||||
|
|
||||||
currentLine-=lineOffset;
|
currentLine-=lineOffset;
|
||||||
|
|
||||||
|
labelHealthBars.registerGraphicComponent(containerName,"labelHealthBars");
|
||||||
|
labelHealthBars.init(currentLabelStart ,currentLine);
|
||||||
|
labelHealthBars.setText(lang.getString("HealthBar"));
|
||||||
|
|
||||||
|
listBoxHealthBars.registerGraphicComponent(containerName,"lisBoxtHealthBars");
|
||||||
|
listBoxHealthBars.init(currentColumnStart ,currentLine, 300 );
|
||||||
|
listBoxHealthBars.pushBackItem(lang.getString("HealthbarsDefault"));
|
||||||
|
listBoxHealthBars.pushBackItem(lang.getString("HealthbarsOff"));
|
||||||
|
listBoxHealthBars.pushBackItem(lang.getString("HealthbarsAlways"));
|
||||||
|
listBoxHealthBars.pushBackItem(lang.getString("HealthbarsDamaged"));
|
||||||
|
listBoxHealthBars.pushBackItem(lang.getString("HealthbarsSelected"));
|
||||||
|
|
||||||
|
int hpMode=config.getInt("HealthBarMode","0");
|
||||||
|
int hpIndex=0;
|
||||||
|
switch (hpMode) {
|
||||||
|
case hbvUndefined:
|
||||||
|
hpIndex = 0;
|
||||||
|
break;
|
||||||
|
case hbvOff:
|
||||||
|
hpIndex = 1;
|
||||||
|
break;
|
||||||
|
case hbvAlways:
|
||||||
|
hpIndex = 2;
|
||||||
|
break;
|
||||||
|
case hbvDamaged:
|
||||||
|
hpIndex = 3;
|
||||||
|
break;
|
||||||
|
case hbvSelected:
|
||||||
|
hpIndex = 4;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
hpIndex = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
listBoxHealthBars.setSelectedItemIndex(hpIndex);
|
||||||
|
|
||||||
|
currentLine-=lineOffset;
|
||||||
|
|
||||||
labelChatStaysActive.registerGraphicComponent(containerName,"labelChatStaysActive");
|
labelChatStaysActive.registerGraphicComponent(containerName,"labelChatStaysActive");
|
||||||
labelChatStaysActive.init(currentLabelStart ,currentLine);
|
labelChatStaysActive.init(currentLabelStart ,currentLine);
|
||||||
labelChatStaysActive.setText(lang.getString("ChatStaysActive"));
|
labelChatStaysActive.setText(lang.getString("ChatStaysActive"));
|
||||||
|
@ -368,6 +407,7 @@ void MenuStateOptions::reloadUI() {
|
||||||
buttonKeyboardSetup.setText(lang.getString("Keyboardsetup"));
|
buttonKeyboardSetup.setText(lang.getString("Keyboardsetup"));
|
||||||
|
|
||||||
labelVisibleHud.setText(lang.getString("VisibleHUD"));
|
labelVisibleHud.setText(lang.getString("VisibleHUD"));
|
||||||
|
labelHealthBars.setText(lang.getString("HealthBars"));
|
||||||
labelChatStaysActive.setText(lang.getString("ChatStaysActive"));
|
labelChatStaysActive.setText(lang.getString("ChatStaysActive"));
|
||||||
labelTimeDisplay.setText(lang.getString("TimeDisplay"));
|
labelTimeDisplay.setText(lang.getString("TimeDisplay"));
|
||||||
|
|
||||||
|
@ -922,6 +962,7 @@ void MenuStateOptions::mouseClick(int x, int y, MouseButton mouseButton){
|
||||||
checkBoxMouseMoveScrollsWorld.mouseClick(x, y);
|
checkBoxMouseMoveScrollsWorld.mouseClick(x, y);
|
||||||
listCameraMoveSpeed.mouseClick(x, y);
|
listCameraMoveSpeed.mouseClick(x, y);
|
||||||
checkBoxVisibleHud.mouseClick(x, y);
|
checkBoxVisibleHud.mouseClick(x, y);
|
||||||
|
listBoxHealthBars.mouseClick(x, y);
|
||||||
checkBoxChatStaysActive.mouseClick(x, y);
|
checkBoxChatStaysActive.mouseClick(x, y);
|
||||||
checkBoxTimeDisplay.mouseClick(x, y);
|
checkBoxTimeDisplay.mouseClick(x, y);
|
||||||
checkBoxLuaDisableSecuritySandbox.mouseClick(x, y);
|
checkBoxLuaDisableSecuritySandbox.mouseClick(x, y);
|
||||||
|
@ -952,6 +993,7 @@ void MenuStateOptions::mouseMove(int x, int y, const MouseState *ms){
|
||||||
checkBoxDisableScreenshotConsoleText.mouseMove(x, y);
|
checkBoxDisableScreenshotConsoleText.mouseMove(x, y);
|
||||||
checkBoxMouseMoveScrollsWorld.mouseMove(x, y);
|
checkBoxMouseMoveScrollsWorld.mouseMove(x, y);
|
||||||
listCameraMoveSpeed.mouseMove(x, y);
|
listCameraMoveSpeed.mouseMove(x, y);
|
||||||
|
listBoxHealthBars.mouseMove(x, y);
|
||||||
checkBoxVisibleHud.mouseMove(x, y);
|
checkBoxVisibleHud.mouseMove(x, y);
|
||||||
checkBoxChatStaysActive.mouseMove(x, y);
|
checkBoxChatStaysActive.mouseMove(x, y);
|
||||||
checkBoxTimeDisplay.mouseMove(x, y);
|
checkBoxTimeDisplay.mouseMove(x, y);
|
||||||
|
@ -1039,6 +1081,8 @@ void MenuStateOptions::render(){
|
||||||
renderer.renderListBox(&listCameraMoveSpeed);
|
renderer.renderListBox(&listCameraMoveSpeed);
|
||||||
|
|
||||||
renderer.renderLabel(&labelVisibleHud);
|
renderer.renderLabel(&labelVisibleHud);
|
||||||
|
renderer.renderLabel(&labelHealthBars);
|
||||||
|
renderer.renderListBox(&listBoxHealthBars);
|
||||||
renderer.renderLabel(&labelChatStaysActive);
|
renderer.renderLabel(&labelChatStaysActive);
|
||||||
renderer.renderLabel(&labelTimeDisplay);
|
renderer.renderLabel(&labelTimeDisplay);
|
||||||
|
|
||||||
|
@ -1077,6 +1121,11 @@ void MenuStateOptions::saveConfig(){
|
||||||
config.setBool("DisableScreenshotConsoleText", !checkBoxDisableScreenshotConsoleText.getValue());
|
config.setBool("DisableScreenshotConsoleText", !checkBoxDisableScreenshotConsoleText.getValue());
|
||||||
config.setBool("MouseMoveScrollsWorld", checkBoxMouseMoveScrollsWorld.getValue());
|
config.setBool("MouseMoveScrollsWorld", checkBoxMouseMoveScrollsWorld.getValue());
|
||||||
config.setString("CameraMoveSpeed", listCameraMoveSpeed.getSelectedItem());
|
config.setString("CameraMoveSpeed", listCameraMoveSpeed.getSelectedItem());
|
||||||
|
int hpModeHelp=0;
|
||||||
|
if(listBoxHealthBars.getSelectedItemIndex()!=0){
|
||||||
|
hpModeHelp=pow(2,listBoxHealthBars.getSelectedItemIndex()-1);
|
||||||
|
}
|
||||||
|
config.setInt("HealthBarMode",hpModeHelp );
|
||||||
config.setBool("VisibleHud", checkBoxVisibleHud.getValue());
|
config.setBool("VisibleHud", checkBoxVisibleHud.getValue());
|
||||||
config.setBool("ChatStaysActive", checkBoxChatStaysActive.getValue());
|
config.setBool("ChatStaysActive", checkBoxChatStaysActive.getValue());
|
||||||
config.setBool("TimeDisplay", checkBoxTimeDisplay.getValue());
|
config.setBool("TimeDisplay", checkBoxTimeDisplay.getValue());
|
||||||
|
|
|
@ -63,6 +63,9 @@ private:
|
||||||
|
|
||||||
GraphicLabel labelVisibleHud;
|
GraphicLabel labelVisibleHud;
|
||||||
GraphicCheckBox checkBoxVisibleHud;
|
GraphicCheckBox checkBoxVisibleHud;
|
||||||
|
GraphicLabel labelHealthBars;
|
||||||
|
GraphicListBox listBoxHealthBars;
|
||||||
|
|
||||||
GraphicLabel labelTimeDisplay;
|
GraphicLabel labelTimeDisplay;
|
||||||
GraphicCheckBox checkBoxTimeDisplay;
|
GraphicCheckBox checkBoxTimeDisplay;
|
||||||
GraphicLabel labelChatStaysActive;
|
GraphicLabel labelChatStaysActive;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user