aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/gob/gob.cpp2
-rw-r--r--engines/gob/inter_v1.cpp2
-rw-r--r--engines/gob/inter_v6.cpp2
-rw-r--r--engines/gob/saveload.cpp6
-rw-r--r--engines/gob/saveload.h10
5 files changed, 14 insertions, 8 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index f341c3e0a8..81d4ae19ae 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -410,7 +410,7 @@ bool GobEngine::initGameParts() {
_map = new Map_v4(this);
_goblin = new Goblin_v4(this);
_scenery = new Scenery_v2(this);
- _saveLoad = new SaveLoad_v4(this, _targetName.c_str());
+ _saveLoad = new SaveLoad(this, _targetName.c_str());
break;
default:
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 0355091c77..cd3fab944d 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -1517,7 +1517,7 @@ bool Inter_v1::o1_palLoad(OpFuncParams &params) {
case 61:
if (_vm->_global->_fakeVideoMode < 0x13) {
- *_vm->_global->_inter_execPtr += 4;
+ _vm->_global->_inter_execPtr += 4;
return false;
}
break;
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index 048f3da191..05782e8f4f 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -208,7 +208,7 @@ void Inter_v6::setupOpcodes() {
{NULL, ""},
{NULL, ""},
/* 80 */
- OPCODE(o4_initScreen),
+ OPCODE(o5_initScreen),
OPCODE(o2_scroll),
OPCODE(o2_setScrollOffset),
OPCODE(o4_playVmdOrMusic),
diff --git a/engines/gob/saveload.cpp b/engines/gob/saveload.cpp
index e3212ac8ff..3d711ed0b5 100644
--- a/engines/gob/saveload.cpp
+++ b/engines/gob/saveload.cpp
@@ -870,4 +870,10 @@ bool SaveLoad::saveDataEndian(Common::WriteStream &out,
return retVal;
}
+SaveLoad::SaveMode SaveLoad::getSaveMode(const char *fileName) { return kSaveModeNone; }
+int SaveLoad::getSaveType(const char *fileName) { return -1; }
+int32 SaveLoad::getSizeVersioned(int type) { return -1; }
+bool SaveLoad::loadVersioned(int type, int16 dataVar, int32 size, int32 offset) { return false; }
+bool SaveLoad::saveVersioned(int type, int16 dataVar, int32 size, int32 offset) { return false; }
+
} // End of namespace Gob
diff --git a/engines/gob/saveload.h b/engines/gob/saveload.h
index 52c3a9b260..447cb901b5 100644
--- a/engines/gob/saveload.h
+++ b/engines/gob/saveload.h
@@ -172,7 +172,7 @@ public:
SaveLoad(GobEngine *vm, const char *targetName);
virtual ~SaveLoad();
- virtual SaveMode getSaveMode(const char *fileName) = 0;
+ virtual SaveMode getSaveMode(const char *fileName);
int32 getSize(const char *fileName);
bool load(const char *fileName, int16 dataVar, int32 size, int32 offset);
@@ -202,11 +202,11 @@ protected:
char *_targetName;
- virtual int getSaveType(const char *fileName) = 0;
+ virtual int getSaveType(const char *fileName);
- virtual int32 getSizeVersioned(int type) = 0;
- virtual bool loadVersioned(int type, int16 dataVar, int32 size, int32 offset) = 0;
- virtual bool saveVersioned(int type, int16 dataVar, int32 size, int32 offset) = 0;
+ virtual int32 getSizeVersioned(int type);
+ virtual bool loadVersioned(int type, int16 dataVar, int32 size, int32 offset);
+ virtual bool saveVersioned(int type, int16 dataVar, int32 size, int32 offset);
};
class SaveLoad_v2 : public SaveLoad {