[Scummvm-cvs-logs] SF.net SVN: scummvm: [26851] scummvm/trunk/engines/agos
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Wed May 16 11:39:36 CEST 2007
Revision: 26851
http://scummvm.svn.sourceforge.net/scummvm/?rev=26851&view=rev
Author: kirben
Date: 2007-05-16 02:39:36 -0700 (Wed, 16 May 2007)
Log Message:
-----------
Ooops, correct inheritance of load/save functions.
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/saveload.cpp
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2007-05-16 08:27:15 UTC (rev 26850)
+++ scummvm/trunk/engines/agos/agos.h 2007-05-16 09:39:36 UTC (rev 26851)
@@ -1280,9 +1280,6 @@
};
const OpcodeEntryElvira1 *_opcodesElvira1;
-
- virtual bool loadGame(const char *filename, bool restartMode = false);
- virtual bool saveGame(uint slot, const char *caption);
};
class AGOSEngine_Elvira2 : public AGOSEngine_Elvira1 {
@@ -1347,6 +1344,9 @@
const OpcodeEntryElvira2 *_opcodesElvira2;
+ virtual bool loadGame(const char *filename, bool restartMode = false);
+ virtual bool saveGame(uint slot, const char *caption);
+
virtual void drawIcon(WindowBlock *window, uint icon, uint x, uint y);
virtual void addArrows(WindowBlock *window);
Modified: scummvm/trunk/engines/agos/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agos/saveload.cpp 2007-05-16 08:27:15 UTC (rev 26850)
+++ scummvm/trunk/engines/agos/saveload.cpp 2007-05-16 09:39:36 UTC (rev 26851)
@@ -557,7 +557,7 @@
f->writeUint32BE(val - 1);
}
-bool AGOSEngine_Elvira1::loadGame(const char *filename, bool restartMode) {
+bool AGOSEngine::loadGame(const char *filename, bool restartMode) {
char ident[100];
Common::SeekableReadStream *f = NULL;
uint num, item_index, i;
@@ -654,7 +654,7 @@
return true;
}
-bool AGOSEngine_Elvira1::saveGame(uint slot, const char *caption) {
+bool AGOSEngine::saveGame(uint slot, const char *caption) {
Common::OutSaveFile *f;
uint item_index, num_item, i;
TimeEvent *te;
@@ -734,7 +734,7 @@
return result;
}
-bool AGOSEngine::loadGame(const char *filename, bool restartMode) {
+bool AGOSEngine_Elvira2::loadGame(const char *filename, bool restartMode) {
char ident[100];
Common::SeekableReadStream *f = NULL;
uint num, item_index, i, j;
@@ -882,7 +882,7 @@
return true;
}
-bool AGOSEngine::saveGame(uint slot, const char *caption) {
+bool AGOSEngine_Elvira2::saveGame(uint slot, const char *caption) {
Common::OutSaveFile *f;
uint item_index, num_item, i, j;
TimeEvent *te;
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