Missed these.
svn-id: r17428
This commit is contained in:
Torbjörn Andersson
parent
4d33534938
commit
d5b2582aa5
2 changed files with 96 additions and 96 deletions
|
|
@ -262,39 +262,39 @@ uint8 Control::runPanel(void) {
|
||||||
_cursorVisible = false;
|
_cursorVisible = false;
|
||||||
}
|
}
|
||||||
switch (mode) {
|
switch (mode) {
|
||||||
case BUTTON_MAIN_PANEL:
|
case BUTTON_MAIN_PANEL:
|
||||||
if (fullRefresh)
|
if (fullRefresh)
|
||||||
setupMainPanel();
|
setupMainPanel();
|
||||||
break;
|
break;
|
||||||
case BUTTON_SAVE_PANEL:
|
case BUTTON_SAVE_PANEL:
|
||||||
if (fullRefresh) {
|
if (fullRefresh) {
|
||||||
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
|
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
|
||||||
setupSaveRestorePanel(true);
|
setupSaveRestorePanel(true);
|
||||||
}
|
}
|
||||||
if (_selectedSavegame < 255) {
|
if (_selectedSavegame < 255) {
|
||||||
bool visible = _cursorVisible;
|
bool visible = _cursorVisible;
|
||||||
if (_cursorTick == 0)
|
if (_cursorTick == 0)
|
||||||
_cursorVisible = true;
|
_cursorVisible = true;
|
||||||
else if (_cursorTick == 3)
|
else if (_cursorTick == 3)
|
||||||
_cursorVisible = false;
|
_cursorVisible = false;
|
||||||
if (_keyPressed)
|
if (_keyPressed)
|
||||||
handleSaveKey(_keyPressed);
|
handleSaveKey(_keyPressed);
|
||||||
else if (_cursorVisible != visible)
|
else if (_cursorVisible != visible)
|
||||||
showSavegameNames();
|
showSavegameNames();
|
||||||
if (++_cursorTick > 5)
|
if (++_cursorTick > 5)
|
||||||
_cursorTick = 0;
|
_cursorTick = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case BUTTON_RESTORE_PANEL:
|
case BUTTON_RESTORE_PANEL:
|
||||||
if (fullRefresh)
|
if (fullRefresh)
|
||||||
setupSaveRestorePanel(false);
|
setupSaveRestorePanel(false);
|
||||||
break;
|
break;
|
||||||
case BUTTON_VOLUME_PANEL:
|
case BUTTON_VOLUME_PANEL:
|
||||||
if (fullRefresh)
|
if (fullRefresh)
|
||||||
setupVolumePanel();
|
setupVolumePanel();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (fullRefresh) {
|
if (fullRefresh) {
|
||||||
fullRefresh = false;
|
fullRefresh = false;
|
||||||
|
|
@ -363,51 +363,51 @@ uint8 Control::getClicks(uint8 mode, uint8 *retVal) {
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8 Control::handleButtonClick(uint8 id, uint8 mode, uint8 *retVal) {
|
uint8 Control::handleButtonClick(uint8 id, uint8 mode, uint8 *retVal) {
|
||||||
switch(mode) {
|
switch (mode) {
|
||||||
case BUTTON_MAIN_PANEL:
|
case BUTTON_MAIN_PANEL:
|
||||||
if (id == BUTTON_RESTART) {
|
if (id == BUTTON_RESTART) {
|
||||||
if (SwordEngine::_systemVars.controlPanelMode) // if player is dead or has just started, don't ask for confirmation
|
if (SwordEngine::_systemVars.controlPanelMode) // if player is dead or has just started, don't ask for confirmation
|
||||||
*retVal |= CONTROL_RESTART_GAME;
|
*retVal |= CONTROL_RESTART_GAME;
|
||||||
else if (getConfirm(_lStrings[STR_RESTART]))
|
else if (getConfirm(_lStrings[STR_RESTART]))
|
||||||
*retVal |= CONTROL_RESTART_GAME;
|
*retVal |= CONTROL_RESTART_GAME;
|
||||||
else
|
else
|
||||||
return mode;
|
|
||||||
} else if ((id == BUTTON_RESTORE_PANEL) || (id == BUTTON_SAVE_PANEL) ||
|
|
||||||
(id == BUTTON_DONE) || (id == BUTTON_VOLUME_PANEL))
|
|
||||||
return id;
|
|
||||||
else if (id == BUTTON_TEXT) {
|
|
||||||
SwordEngine::_systemVars.showText ^= 1;
|
|
||||||
_buttons[5]->setSelected(SwordEngine::_systemVars.showText);
|
|
||||||
} else if (id == BUTTON_QUIT) {
|
|
||||||
if (getConfirm(_lStrings[STR_QUIT]))
|
|
||||||
SwordEngine::_systemVars.engineQuit = true;
|
|
||||||
return mode;
|
return mode;
|
||||||
}
|
} else if ((id == BUTTON_RESTORE_PANEL) || (id == BUTTON_SAVE_PANEL) ||
|
||||||
break;
|
(id == BUTTON_DONE) || (id == BUTTON_VOLUME_PANEL))
|
||||||
case BUTTON_SAVE_PANEL:
|
|
||||||
case BUTTON_RESTORE_PANEL:
|
|
||||||
if ((id >= BUTTON_SCROLL_UP_FAST) && (id <= BUTTON_SCROLL_DOWN_FAST))
|
|
||||||
saveNameScroll(id, mode == BUTTON_SAVE_PANEL);
|
|
||||||
else if ((id >= BUTTON_SAVE_SELECT1) && (id <= BUTTON_SAVE_SELECT8))
|
|
||||||
saveNameSelect(id, mode == BUTTON_SAVE_PANEL);
|
|
||||||
else if (id == BUTTON_SAVE_RESTORE_OKAY) {
|
|
||||||
if (mode == BUTTON_SAVE_PANEL) {
|
|
||||||
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
|
|
||||||
if (saveToFile()) // don't go back to main panel if save fails.
|
|
||||||
return BUTTON_MAIN_PANEL;
|
|
||||||
} else {
|
|
||||||
if (restoreFromFile()) { // don't go back to main panel if restore fails.
|
|
||||||
*retVal |= CONTROL_GAME_RESTORED;
|
|
||||||
return BUTTON_MAIN_PANEL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (id == BUTTON_SAVE_CANCEL) {
|
|
||||||
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
|
|
||||||
return BUTTON_MAIN_PANEL; // mode down to main panel
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case BUTTON_VOLUME_PANEL:
|
|
||||||
return id;
|
return id;
|
||||||
|
else if (id == BUTTON_TEXT) {
|
||||||
|
SwordEngine::_systemVars.showText ^= 1;
|
||||||
|
_buttons[5]->setSelected(SwordEngine::_systemVars.showText);
|
||||||
|
} else if (id == BUTTON_QUIT) {
|
||||||
|
if (getConfirm(_lStrings[STR_QUIT]))
|
||||||
|
SwordEngine::_systemVars.engineQuit = true;
|
||||||
|
return mode;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case BUTTON_SAVE_PANEL:
|
||||||
|
case BUTTON_RESTORE_PANEL:
|
||||||
|
if ((id >= BUTTON_SCROLL_UP_FAST) && (id <= BUTTON_SCROLL_DOWN_FAST))
|
||||||
|
saveNameScroll(id, mode == BUTTON_SAVE_PANEL);
|
||||||
|
else if ((id >= BUTTON_SAVE_SELECT1) && (id <= BUTTON_SAVE_SELECT8))
|
||||||
|
saveNameSelect(id, mode == BUTTON_SAVE_PANEL);
|
||||||
|
else if (id == BUTTON_SAVE_RESTORE_OKAY) {
|
||||||
|
if (mode == BUTTON_SAVE_PANEL) {
|
||||||
|
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
|
||||||
|
if (saveToFile()) // don't go back to main panel if save fails.
|
||||||
|
return BUTTON_MAIN_PANEL;
|
||||||
|
} else {
|
||||||
|
if (restoreFromFile()) { // don't go back to main panel if restore fails.
|
||||||
|
*retVal |= CONTROL_GAME_RESTORED;
|
||||||
|
return BUTTON_MAIN_PANEL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (id == BUTTON_SAVE_CANCEL) {
|
||||||
|
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
|
||||||
|
return BUTTON_MAIN_PANEL; // mode down to main panel
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case BUTTON_VOLUME_PANEL:
|
||||||
|
return id;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1679,26 +1679,26 @@ uint16 Logic::inRange(uint16 a, uint16 b, uint16 c) {
|
||||||
|
|
||||||
void Logic::startPosCallFn(uint8 fnId, uint32 param1, uint32 param2, uint32 param3) {
|
void Logic::startPosCallFn(uint8 fnId, uint32 param1, uint32 param2, uint32 param3) {
|
||||||
Object *obj = NULL;
|
Object *obj = NULL;
|
||||||
switch(fnId) {
|
switch (fnId) {
|
||||||
case opcPlaySequence:
|
case opcPlaySequence:
|
||||||
fnPlaySequence(NULL, 0, param1, 0, 0, 0, 0, 0);
|
fnPlaySequence(NULL, 0, param1, 0, 0, 0, 0, 0);
|
||||||
break;
|
break;
|
||||||
case opcAddObject:
|
case opcAddObject:
|
||||||
fnAddObject(NULL, 0, param1, 0, 0, 0, 0, 0);
|
fnAddObject(NULL, 0, param1, 0, 0, 0, 0, 0);
|
||||||
break;
|
break;
|
||||||
case opcRemoveObject:
|
case opcRemoveObject:
|
||||||
fnRemoveObject(NULL, 0, param1, 0, 0, 0, 0, 0);
|
fnRemoveObject(NULL, 0, param1, 0, 0, 0, 0, 0);
|
||||||
break;
|
break;
|
||||||
case opcMegaSet:
|
case opcMegaSet:
|
||||||
obj = _objMan->fetchObject(param1);
|
obj = _objMan->fetchObject(param1);
|
||||||
fnMegaSet(obj, param1, param2, param3, 0, 0, 0, 0);
|
fnMegaSet(obj, param1, param2, param3, 0, 0, 0, 0);
|
||||||
break;
|
break;
|
||||||
case opcNoSprite:
|
case opcNoSprite:
|
||||||
obj = _objMan->fetchObject(param1);
|
obj = _objMan->fetchObject(param1);
|
||||||
fnNoSprite(obj, param1, param2, param3, 0, 0, 0, 0);
|
fnNoSprite(obj, param1, param2, param3, 0, 0, 0, 0);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
error("Illegal fnCallfn argument %d", fnId);
|
error("Illegal fnCallfn argument %d", fnId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue