[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.118,1.119 saveload.cpp,1.139,1.140 script_v5.cpp,1.225,1.226 script_v6.cpp,1.285,1.286 script_v8.cpp,2.225,2.226 scumm.h,1.367,1.368 scummvm.cpp,2.562,2.563
Max Horn
fingolfin at users.sourceforge.net
Sat Jan 31 14:12:48 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32394
Modified Files:
debugger.cpp saveload.cpp script_v5.cpp script_v6.cpp
script_v8.cpp scumm.h scummvm.cpp
Log Message:
renamed _saveLoadCompatible to _saveTemporaryState; make use of requestLoad/requestSave
Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- debugger.cpp 16 Jan 2004 10:45:55 -0000 1.118
+++ debugger.cpp 31 Jan 2004 22:11:01 -0000 1.119
@@ -214,9 +214,7 @@
if (argc > 1) {
int slot = atoi(argv[1]);
- _vm->_saveLoadSlot = slot;
- _vm->_saveLoadFlag = 2;
- _vm->_saveLoadCompatible = false;
+ _vm->requestLoad(slot);
_detach_now = true;
return false;
@@ -230,10 +228,7 @@
if (argc > 2) {
int slot = atoi(argv[1]);
- strcpy(_vm->_saveLoadName, argv[2]);
- _vm->_saveLoadSlot = slot;
- _vm->_saveLoadFlag = 1;
- _vm->_saveLoadCompatible = false;
+ _vm->requestSave(slot, argv[2]);
} else
DebugPrintf("Syntax: savegame <slotnum> <name>\n");
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- saveload.cpp 31 Jan 2004 16:07:11 -0000 1.139
+++ saveload.cpp 31 Jan 2004 22:11:01 -0000 1.140
@@ -49,9 +49,9 @@
};
-void ScummEngine::requestSave(int slot, const char *name) {
+void ScummEngine::requestSave(int slot, const char *name, bool compatible) {
_saveLoadSlot = slot;
- _saveLoadCompatible = false;
+ _saveTemporaryState = compatible;
_saveLoadFlag = 1; // 1 for save
assert(name);
strcpy(_saveLoadName, name);
@@ -59,7 +59,7 @@
void ScummEngine::requestLoad(int slot) {
_saveLoadSlot = slot;
- _saveLoadCompatible = false;
+ _saveTemporaryState = false;
_saveLoadFlag = 2; // 2 for load
}
@@ -136,7 +136,7 @@
// If we don't have iMUSE at all we may as well stop the sounds. The previous
// default behavior here was to stopAllSounds on all state restores.
- if (!_imuse || _saveSound || !_saveLoadCompatible)
+ if (!_imuse || _saveSound || !_saveTemporaryState)
_sound->stopAllSounds();
_sound->stopCD();
@@ -767,7 +767,7 @@
AudioCD.play(info.track, info.numLoops, info.start, info.duration);
}
- if (_imuse && (_saveSound || !_saveLoadCompatible)) {
+ if (_imuse && (_saveSound || !_saveTemporaryState)) {
_imuse->save_or_load(s, this);
_imuse->setMasterVolume(ConfMan.getInt("master_volume"));
_imuse->set_music_volume(ConfMan.getInt("music_volume"));
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- script_v5.cpp 16 Jan 2004 10:45:55 -0000 1.225
+++ script_v5.cpp 31 Jan 2004 22:11:01 -0000 1.226
@@ -1158,13 +1158,13 @@
result = 0;
break;
case 0x40: // load
- if (loadState(slot, _saveLoadCompatible))
+ if (loadState(slot, _saveTemporaryState))
result = 3; // sucess
else
result = 5; // failed to load
break;
case 0x80: // save
- if (saveState(slot, _saveLoadCompatible))
+ if (saveState(slot, _saveTemporaryState))
result = 0;
else
result = 2;
@@ -1899,7 +1899,7 @@
_saveLoadFlag = getVarOrDirectByte(PARAM_1);
_saveLoadSlot = getVarOrDirectByte(PARAM_2);
_saveLoadSlot = 99; /* use this slot */
- _saveLoadCompatible = true;
+ _saveTemporaryState = true;
break;
case 10: // SO_ROOM_FADE
a = getVarOrDirectWord(PARAM_1);
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -d -r1.285 -r1.286
--- script_v6.cpp 30 Jan 2004 16:01:08 -0000 1.285
+++ script_v6.cpp 31 Jan 2004 22:11:01 -0000 1.286
@@ -1685,7 +1685,7 @@
break;
case 180: // SO_ROOM_SAVEGAME
- _saveLoadCompatible = true;
+ _saveTemporaryState = true;
_saveLoadSlot = pop();
_saveLoadFlag = pop();
if (_gameId == GID_TENTACLE)
@@ -1768,7 +1768,7 @@
_scriptPointer += len + 1;
_saveLoadFlag = pop();
_saveLoadSlot = 99;
- _saveLoadCompatible = true;
+ _saveTemporaryState = true;
break;
default:
error("o6_roomOps: default case %d", op);
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.225
retrieving revision 2.226
diff -u -d -r2.225 -r2.226
--- script_v8.cpp 19 Jan 2004 20:27:31 -0000 2.225
+++ script_v8.cpp 31 Jan 2004 22:11:01 -0000 2.226
@@ -914,12 +914,12 @@
setPalette(a);
break;
case 0x5D: // SO_ROOM_SAVE_GAME Save game
- _saveLoadCompatible = true;
+ _saveTemporaryState = true;
_saveLoadSlot = 1;
_saveLoadFlag = 1;
break;
case 0x5E: // SO_ROOM_LOAD_GAME Load game
- _saveLoadCompatible = true;
+ _saveTemporaryState = true;
_saveLoadSlot = 1;
_saveLoadFlag = 2;
break;
@@ -1361,7 +1361,7 @@
// saveGameRead
_saveLoadSlot = args[1];
_saveLoadFlag = 2;
- _saveLoadCompatible = false;
+ _saveTemporaryState = false;
warning("Sgl: %d", args[1]);
break;
}
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -d -r1.367 -r1.368
--- scumm.h 25 Jan 2004 12:20:39 -0000 1.367
+++ scumm.h 31 Jan 2004 22:11:01 -0000 1.368
@@ -468,7 +468,7 @@
// Save/Load class - some of this may be GUI
byte _saveLoadFlag, _saveLoadSlot;
uint32 _lastSaveTime;
- bool _saveLoadCompatible;
+ bool _saveTemporaryState;
char _saveLoadName[32];
bool saveState(int slot, bool compat, SaveFileManager *mgr);
@@ -497,7 +497,7 @@
bool getSavegameName(int slot, char *desc, SaveFileManager *mgr);
void listSavegames(bool *marks, int num, SaveFileManager *mgr);
- void requestSave(int slot, const char *name);
+ void requestSave(int slot, const char *name, bool compatible = false);
void requestLoad(int slot);
protected:
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.562
retrieving revision 2.563
diff -u -d -r2.562 -r2.563
--- scummvm.cpp 26 Jan 2004 07:42:16 -0000 2.562
+++ scummvm.cpp 31 Jan 2004 22:11:01 -0000 2.563
@@ -374,7 +374,7 @@
_saveLoadFlag = 0;
_saveLoadSlot = 0;
_lastSaveTime = 0;
- _saveLoadCompatible = false;
+ _saveTemporaryState = false;
memset(_saveLoadName, 0, sizeof(_saveLoadName));
_maxHeapThreshold = 0;
_minHeapThreshold = 0;
@@ -771,9 +771,7 @@
// Load game from specified slot, if any
if (ConfMan.hasKey("save_slot")) {
- _saveLoadSlot = ConfMan.getInt("save_slot");
- _saveLoadFlag = 2;
- _saveLoadCompatible = false;
+ requestLoad(ConfMan.getInt("save_slot"));
}
loadLanguageBundle();
@@ -996,7 +994,7 @@
// If requested, load a save game instead of running the boot script
- if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveLoadCompatible)) {
+ if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveTemporaryState)) {
int args[16];
memset(args, 0, sizeof(args));
args[0] = _bootParam;
@@ -1390,7 +1388,7 @@
_saveLoadSlot = 0;
sprintf(_saveLoadName, "Autosave %d", _saveLoadSlot);
_saveLoadFlag = 1;
- _saveLoadCompatible = false;
+ _saveTemporaryState = false;
}
if (VAR_GAME_LOADED != 0xFF)
@@ -1402,30 +1400,30 @@
char filename[256];
if (_saveLoadFlag == 1) {
- success = saveState(_saveLoadSlot, _saveLoadCompatible);
+ success = saveState(_saveLoadSlot, _saveTemporaryState);
if (!success)
errMsg = "Failed to save game state to file:\n\n%s";
// Ender: Disabled for small_header games, as can overwrite game
// variables (eg, Zak256 cashcard values). Temp disabled for V8
// because of odd timing issue with scripts and the variable reset
- if (success && _saveLoadCompatible && !(_features & GF_SMALL_HEADER) && _version < 8)
+ if (success && _saveTemporaryState && !(_features & GF_SMALL_HEADER) && _version < 8)
VAR(VAR_GAME_LOADED) = 201;
} else {
- success = loadState(_saveLoadSlot, _saveLoadCompatible);
+ success = loadState(_saveLoadSlot, _saveTemporaryState);
if (!success)
errMsg = "Failed to load game state from file:\n\n%s";
// Ender: Disabled for small_header games, as can overwrite game
// variables (eg, Zak256 cashcard values).
- if (success && _saveLoadCompatible && !(_features & GF_SMALL_HEADER))
+ if (success && _saveTemporaryState && !(_features & GF_SMALL_HEADER))
VAR(VAR_GAME_LOADED) = 203;
}
- makeSavegameName(filename, _saveLoadSlot, _saveLoadCompatible);
+ makeSavegameName(filename, _saveLoadSlot, _saveTemporaryState);
if (!success) {
displayError(false, errMsg, filename);
- } else if (_saveLoadFlag == 1 && _saveLoadSlot != 0 && !_saveLoadCompatible) {
+ } else if (_saveLoadFlag == 1 && _saveLoadSlot != 0 && !_saveTemporaryState) {
// Display "Save successful" message, except for auto saves
#ifdef __PALM_OS__
char buf[256]; // 1024 is too big overflow the stack
@@ -1607,7 +1605,7 @@
switch(event.event_code) {
case OSystem::EVENT_KEYDOWN:
- if (event.kbd.keycode >= '0' && event.kbd.keycode<='9'
+ if (event.kbd.keycode >= '0' && event.kbd.keycode <= '9'
&& (event.kbd.flags == OSystem::KBD_ALT ||
event.kbd.flags == OSystem::KBD_CTRL)) {
_saveLoadSlot = event.kbd.keycode - '0';
@@ -1618,7 +1616,7 @@
sprintf(_saveLoadName, "Quicksave %d", _saveLoadSlot);
_saveLoadFlag = (event.kbd.flags == OSystem::KBD_ALT) ? 1 : 2;
- _saveLoadCompatible = false;
+ _saveTemporaryState = false;
} else if (event.kbd.flags == OSystem::KBD_CTRL) {
if (event.kbd.keycode == 'f')
_fastMode ^= 1;
More information about the Scummvm-git-logs
mailing list