aboutsummaryrefslogtreecommitdiff
path: root/sword1/control.cpp
diff options
context:
space:
mode:
authorRobert Göffringmann2004-01-04 05:21:22 +0000
committerRobert Göffringmann2004-01-04 05:21:22 +0000
commitf0d0e4d4b337a9d39e384634d6ef1d1b23e329f3 (patch)
tree1116a7e40e9d8221589c7da79dab38fded10a033 /sword1/control.cpp
parent7cc972791683c232338f01818b8ccef1fccae62d (diff)
downloadscummvm-rg350-f0d0e4d4b337a9d39e384634d6ef1d1b23e329f3.tar.gz
scummvm-rg350-f0d0e4d4b337a9d39e384634d6ef1d1b23e329f3.tar.bz2
scummvm-rg350-f0d0e4d4b337a9d39e384634d6ef1d1b23e329f3.zip
removed speed button from control panel and made the game do a full screen refresh after leaving the control panel
svn-id: r12127
Diffstat (limited to 'sword1/control.cpp')
-rw-r--r--sword1/control.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/sword1/control.cpp b/sword1/control.cpp
index 5fc2508cec..8c248e8452 100644
--- a/sword1/control.cpp
+++ b/sword1/control.cpp
@@ -317,7 +317,7 @@ uint8 SwordControl::handleButtonClick(uint8 id, uint8 mode, uint8 *retVal) {
return id;
else if (id == BUTTON_TEXT) {
SwordEngine::_systemVars.showText ^= 1;
- _buttons[6]->setSelected(SwordEngine::_systemVars.showText);
+ _buttons[5]->setSelected(SwordEngine::_systemVars.showText);
}
break;
case BUTTON_SAVE_PANEL:
@@ -365,8 +365,8 @@ void SwordControl::setupMainPanel(void) {
if (SwordEngine::_systemVars.deathScreenFlag)
createButtons(_deathButtons, 3);
else {
- createButtons(_panelButtons, 8);
- _buttons[6]->setSelected(SwordEngine::_systemVars.showText);
+ createButtons(_panelButtons, 7);
+ _buttons[5]->setSelected(SwordEngine::_systemVars.showText);
}
if (SwordEngine::_systemVars.deathScreenFlag == 2) // end of game
@@ -379,9 +379,8 @@ void SwordControl::setupMainPanel(void) {
renderText(_lStrings[STR_RESTART], 180, 260 + 40, TEXT_LEFT_ALIGN);
renderText(_lStrings[STR_QUIT], 180, 296 + 40, TEXT_LEFT_ALIGN);
- renderText(_lStrings[STR_SPEED], 460, 188 + 40, TEXT_RIGHT_ALIGN);
- renderText(_lStrings[STR_VOLUME], 460, 224 + 40, TEXT_RIGHT_ALIGN);
- renderText(_lStrings[STR_TEXT], 460, 260 + 40, TEXT_RIGHT_ALIGN);
+ renderText(_lStrings[STR_VOLUME], 460, 188 + 40, TEXT_RIGHT_ALIGN);
+ renderText(_lStrings[STR_TEXT], 460, 224 + 40, TEXT_RIGHT_ALIGN);
} else {
renderText(_lStrings[STR_RESTORE], 285, 224 + 40, TEXT_LEFT_ALIGN);
if (SwordEngine::_systemVars.deathScreenFlag == 3) // just started game
@@ -794,14 +793,13 @@ const ButtonInfo SwordControl::_deathButtons[3] = {
{250, 296 + 40, SR_BUTTON, BUTTON_QUIT }
};
-const ButtonInfo SwordControl::_panelButtons[8] = {
+const ButtonInfo SwordControl::_panelButtons[7] = {
{145, 188 + 40, SR_BUTTON, BUTTON_SAVE_PANEL },
{145, 224 + 40, SR_BUTTON, BUTTON_RESTORE_PANEL },
{145, 260 + 40, SR_BUTTON, BUTTON_RESTART },
{145, 296 + 40, SR_BUTTON, BUTTON_QUIT },
- {475, 188 + 40, SR_BUTTON, BUTTON_SPEED },
- {475, 224 + 40, SR_BUTTON, BUTTON_VOLUME_PANEL },
- {475, 260 + 40, SR_TEXT_BUTTON, BUTTON_TEXT },
+ {475, 188 + 40, SR_BUTTON, BUTTON_VOLUME_PANEL },
+ {475, 224 + 40, SR_TEXT_BUTTON, BUTTON_TEXT },
{475, 332 + 40, SR_BUTTON, BUTTON_DONE }
};