[Scummvm-cvs-logs] SF.net SVN: scummvm: [31919] scummvm/trunk/engines/made
john_doe at users.sourceforge.net
john_doe at users.sourceforge.net
Wed May 7 10:25:14 CEST 2008
Revision: 31919
http://scummvm.svn.sourceforge.net/scummvm/?rev=31919&view=rev
Author: john_doe
Date: 2008-05-07 01:25:13 -0700 (Wed, 07 May 2008)
Log Message:
-----------
Added patch #1956516: MADE: Fix Save File Names by clone2727 (with some modifications)
Modified Paths:
--------------
scummvm/trunk/engines/made/made.cpp
scummvm/trunk/engines/made/made.h
scummvm/trunk/engines/made/scriptfuncs_rtz.cpp
Modified: scummvm/trunk/engines/made/made.cpp
===================================================================
--- scummvm/trunk/engines/made/made.cpp 2008-05-07 08:19:36 UTC (rev 31918)
+++ scummvm/trunk/engines/made/made.cpp 2008-05-07 08:25:13 UTC (rev 31919)
@@ -107,6 +107,8 @@
debug(1, "Music disabled.");
}
+ _quit = false;
+
_soundRate = 8000;
}
@@ -157,6 +159,12 @@
_timers[timerNum] = -1;
}
+Common::String MadeEngine::getSavegameFilename(int16 saveNum) {
+ char filename[256];
+ snprintf(filename, 256, "%s.%03d", getTargetName().c_str(), saveNum);
+ return filename;
+}
+
int MadeEngine::go() {
for (int i = 0; i < ARRAYSIZE(_timers); i++)
@@ -191,7 +199,7 @@
error ("Unknown MADE game");
}
- _eventMouseX = _eventMouseY = 0;
+ _eventKey = _eventMouseX = _eventMouseY = 0;
_script->runScript(_dat->getMainCodeObjectIndex());
return 0;
Modified: scummvm/trunk/engines/made/made.h
===================================================================
--- scummvm/trunk/engines/made/made.h 2008-05-07 08:19:36 UTC (rev 31918)
+++ scummvm/trunk/engines/made/made.h 2008-05-07 08:25:13 UTC (rev 31919)
@@ -102,6 +102,8 @@
ScriptInterpreter *_script;
MusicPlayer *_music;
+ bool _quit;
+
int _eventMouseX, _eventMouseY;
uint16 _eventKey;
int _soundRate;
@@ -118,6 +120,9 @@
int16 allocTimer();
void freeTimer(int16 timerNum);
+ const Common::String getTargetName() { return _targetName; }
+ Common::String getSavegameFilename(int16 saveNum);
+
};
} // End of namespace Made
Modified: scummvm/trunk/engines/made/scriptfuncs_rtz.cpp
===================================================================
--- scummvm/trunk/engines/made/scriptfuncs_rtz.cpp 2008-05-07 08:19:36 UTC (rev 31918)
+++ scummvm/trunk/engines/made/scriptfuncs_rtz.cpp 2008-05-07 08:25:13 UTC (rev 31919)
@@ -778,12 +778,10 @@
Object *obj = _vm->_dat->getObject(descObjectIndex);
const char *description = obj->getString();
- // TODO: Use better filename
- char filename[256];
- snprintf(filename, 256, "rtz.%03d", saveNum);
+ Common::String filename = _vm->getSavegameFilename(saveNum);
+
+ return _vm->_dat->savegame(filename.c_str(), description, version);
- return _vm->_dat->savegame(filename, description, version);
-
}
int16 ScriptFunctionsRtz::o1_LOADGAME(int16 argc, int16 *argv) {
@@ -794,11 +792,9 @@
if (saveNum > 999)
return 1;
- // TODO: Use better filename
- char filename[256];
- snprintf(filename, 256, "rtz.%03d", saveNum);
+ Common::String filename = _vm->getSavegameFilename(saveNum);
- return _vm->_dat->loadgame(filename, version);
+ return _vm->_dat->loadgame(filename.c_str(), version);
}
@@ -812,13 +808,11 @@
if (saveNum > 999)
return 1;
- // TODO: Use better filename
- char filename[256];
- snprintf(filename, 256, "rtz.%03d", saveNum);
+ Common::String filename = _vm->getSavegameFilename(saveNum);
Object *obj = _vm->_dat->getObject(descObjectIndex);
- if (_vm->_dat->getSavegameDescription(filename, description)) {
+ if (_vm->_dat->getSavegameDescription(filename.c_str(), description)) {
obj->setString(description.c_str());
return 0;
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list