thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Missed these.

Browse source 
svn-id: r17428
This commit is contained in:
Torbjörn Andersson 2005-04-07 08:50:48 +00:00
parent 4d33534938
commit d5b2582aa5
2 changed files with 96 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

152
sword1/control.cpp
View file

@ -262,39 +262,39 @@ uint8 Control::runPanel(void) {
_cursorVisible = false;
}
switch (mode) {
case BUTTON_MAIN_PANEL:
if (fullRefresh)
setupMainPanel();
break;
case BUTTON_SAVE_PANEL:
if (fullRefresh) {
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
setupSaveRestorePanel(true);
}
if (_selectedSavegame < 255) {
bool visible = _cursorVisible;
if (_cursorTick == 0)
_cursorVisible = true;
else if (_cursorTick == 3)
_cursorVisible = false;
if (_keyPressed)
handleSaveKey(_keyPressed);
else if (_cursorVisible != visible)
showSavegameNames();
if (++_cursorTick > 5)
_cursorTick = 0;
}
break;
case BUTTON_RESTORE_PANEL:
if (fullRefresh)
setupSaveRestorePanel(false);
break;
case BUTTON_VOLUME_PANEL:
if (fullRefresh)
setupVolumePanel();
break;
default:
break;
case BUTTON_MAIN_PANEL:
if (fullRefresh)
setupMainPanel();
break;
case BUTTON_SAVE_PANEL:
if (fullRefresh) {
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
setupSaveRestorePanel(true);
}
if (_selectedSavegame < 255) {
bool visible = _cursorVisible;
if (_cursorTick == 0)
_cursorVisible = true;
else if (_cursorTick == 3)
_cursorVisible = false;
if (_keyPressed)
handleSaveKey(_keyPressed);
else if (_cursorVisible != visible)
showSavegameNames();
if (++_cursorTick > 5)
_cursorTick = 0;
}
break;
case BUTTON_RESTORE_PANEL:
if (fullRefresh)
setupSaveRestorePanel(false);
break;
case BUTTON_VOLUME_PANEL:
if (fullRefresh)
setupVolumePanel();
break;
default:
break;
}
if (fullRefresh) {
fullRefresh = false;
@ -363,51 +363,51 @@ uint8 Control::getClicks(uint8 mode, uint8 *retVal) {
}
uint8 Control::handleButtonClick(uint8 id, uint8 mode, uint8 *retVal) {
switch(mode) {
case BUTTON_MAIN_PANEL:
if (id == BUTTON_RESTART) {
if (SwordEngine::_systemVars.controlPanelMode) // if player is dead or has just started, don't ask for confirmation
*retVal |= CONTROL_RESTART_GAME;
else if (getConfirm(_lStrings[STR_RESTART]))
*retVal |= CONTROL_RESTART_GAME;
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;
switch (mode) {
case BUTTON_MAIN_PANEL:
if (id == BUTTON_RESTART) {
if (SwordEngine::_systemVars.controlPanelMode) // if player is dead or has just started, don't ask for confirmation
*retVal |= CONTROL_RESTART_GAME;
else if (getConfirm(_lStrings[STR_RESTART]))
*retVal |= CONTROL_RESTART_GAME;
else
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:
} 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;
}
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;
}

40
sword1/logic.cpp
View file

@ -1679,26 +1679,26 @@ uint16 Logic::inRange(uint16 a, uint16 b, uint16 c) {
void Logic::startPosCallFn(uint8 fnId, uint32 param1, uint32 param2, uint32 param3) {
Object *obj = NULL;
switch(fnId) {
case opcPlaySequence:
fnPlaySequence(NULL, 0, param1, 0, 0, 0, 0, 0);
break;
case opcAddObject:
fnAddObject(NULL, 0, param1, 0, 0, 0, 0, 0);
break;
case opcRemoveObject:
fnRemoveObject(NULL, 0, param1, 0, 0, 0, 0, 0);
break;
case opcMegaSet:
obj = _objMan->fetchObject(param1);
fnMegaSet(obj, param1, param2, param3, 0, 0, 0, 0);
break;
case opcNoSprite:
obj = _objMan->fetchObject(param1);
fnNoSprite(obj, param1, param2, param3, 0, 0, 0, 0);
break;
default:
error("Illegal fnCallfn argument %d", fnId);
switch (fnId) {
case opcPlaySequence:
fnPlaySequence(NULL, 0, param1, 0, 0, 0, 0, 0);
break;
case opcAddObject:
fnAddObject(NULL, 0, param1, 0, 0, 0, 0, 0);
break;
case opcRemoveObject:
fnRemoveObject(NULL, 0, param1, 0, 0, 0, 0, 0);
break;
case opcMegaSet:
obj = _objMan->fetchObject(param1);
fnMegaSet(obj, param1, param2, param3, 0, 0, 0, 0);
break;
case opcNoSprite:
obj = _objMan->fetchObject(param1);
fnNoSprite(obj, param1, param2, param3, 0, 0, 0, 0);
break;
default:
error("Illegal fnCallfn argument %d", fnId);
}
}