[Scummvm-cvs-logs] CVS: scummvm/sword1 control.cpp,1.48,1.49 logic.cpp,1.49,1.50
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Thu Apr 7 01:51:24 CEST 2005
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30239
Modified Files:
control.cpp logic.cpp
Log Message:
Missed these.
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- control.cpp 10 Jan 2005 22:18:39 -0000 1.48
+++ control.cpp 7 Apr 2005 08:50:48 -0000 1.49
@@ -262,39 +262,39 @@
_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::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) {
+ } 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);
- return BUTTON_MAIN_PANEL; // mode down to main panel
+ 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;
+ }
}
- break;
- case BUTTON_VOLUME_PANEL:
- return id;
+ } 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;
}
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- logic.cpp 7 Apr 2005 08:42:32 -0000 1.49
+++ logic.cpp 7 Apr 2005 08:50:48 -0000 1.50
@@ -1679,26 +1679,26 @@
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);
}
}
More information about the Scummvm-git-logs
mailing list