aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2007-05-16 09:39:36 +0000
committerTravis Howell2007-05-16 09:39:36 +0000
commit22e3afc4090144cd792e66df09b0c3790d5875e4 (patch)
tree85596e7d3b788fa14d734581b34684811c42515e
parent27b56c23f6a6b374cde4a06bfd4f60c4a6a78d1f (diff)
downloadscummvm-rg350-22e3afc4090144cd792e66df09b0c3790d5875e4.tar.gz
scummvm-rg350-22e3afc4090144cd792e66df09b0c3790d5875e4.tar.bz2
scummvm-rg350-22e3afc4090144cd792e66df09b0c3790d5875e4.zip
Ooops, correct inheritance of load/save functions.
svn-id: r26851
-rw-r--r--engines/agos/agos.h6
-rw-r--r--engines/agos/saveload.cpp8
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 162bc6d11d..38d7e50d44 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -1280,9 +1280,6 @@ protected:
};
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 @@ protected:
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);
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index f63cca3e92..40205ea53a 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -557,7 +557,7 @@ void writeItemID(Common::WriteStream *f, uint16 val) {
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 @@ bool AGOSEngine_Elvira1::loadGame(const char *filename, bool restartMode) {
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 @@ bool AGOSEngine_Elvira1::saveGame(uint slot, const char *caption) {
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 @@ bool AGOSEngine::loadGame(const char *filename, bool restartMode) {
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;