[Scummvm-cvs-logs] SF.net SVN: scummvm:[35289] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 35289
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35289&view=rev
Author:   drmccoy
Date:     2008-12-09 14:55:21 +0000 (Tue, 09 Dec 2008)

Log Message:
-----------
Some dummy changes for Urban Runner

Modified Paths:
--------------
    scummvm/trunk/engines/gob/gob.cpp
    scummvm/trunk/engines/gob/inter_v1.cpp
    scummvm/trunk/engines/gob/inter_v6.cpp
    scummvm/trunk/engines/gob/saveload.cpp
    scummvm/trunk/engines/gob/saveload.h

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2008-12-08 22:07:14 UTC (rev 35288)
+++ scummvm/trunk/engines/gob/gob.cpp	2008-12-09 14:55:21 UTC (rev 35289)
@@ -410,7 +410,7 @@
 			_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:

Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp	2008-12-08 22:07:14 UTC (rev 35288)
+++ scummvm/trunk/engines/gob/inter_v1.cpp	2008-12-09 14:55:21 UTC (rev 35289)
@@ -1517,7 +1517,7 @@
 
 	case 61:
 		if (_vm->_global->_fakeVideoMode < 0x13) {
-			*_vm->_global->_inter_execPtr += 4;
+			_vm->_global->_inter_execPtr += 4;
 			return false;
 		}
 		break;

Modified: scummvm/trunk/engines/gob/inter_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v6.cpp	2008-12-08 22:07:14 UTC (rev 35288)
+++ scummvm/trunk/engines/gob/inter_v6.cpp	2008-12-09 14:55:21 UTC (rev 35289)
@@ -208,7 +208,7 @@
 		{NULL, ""},
 		{NULL, ""},
 		/* 80 */
-		OPCODE(o4_initScreen),
+		OPCODE(o5_initScreen),
 		OPCODE(o2_scroll),
 		OPCODE(o2_setScrollOffset),
 		OPCODE(o4_playVmdOrMusic),

Modified: scummvm/trunk/engines/gob/saveload.cpp
===================================================================
--- scummvm/trunk/engines/gob/saveload.cpp	2008-12-08 22:07:14 UTC (rev 35288)
+++ scummvm/trunk/engines/gob/saveload.cpp	2008-12-09 14:55:21 UTC (rev 35289)
@@ -870,4 +870,10 @@
 	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

Modified: scummvm/trunk/engines/gob/saveload.h
===================================================================
--- scummvm/trunk/engines/gob/saveload.h	2008-12-08 22:07:14 UTC (rev 35288)
+++ scummvm/trunk/engines/gob/saveload.h	2008-12-09 14:55:21 UTC (rev 35289)
@@ -172,7 +172,7 @@
 	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 @@
 
 	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 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.