[Scummvm-cvs-logs] SF.net SVN: scummvm:[42870] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 42870
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42870&view=rev
Author:   fingolfin
Date:     2009-07-28 23:19:33 +0000 (Tue, 28 Jul 2009)

Log Message:
-----------
SCUMM: Moved _inventoryOffset to ScummEngine_v2 and save it.
Fixes bug #2828417: Zak V2: inventory position isn't reset when loading.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/saveload.cpp
    scummvm/trunk/engines/scumm/saveload.h
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/scumm/scumm.h
    scummvm/trunk/engines/scumm/scumm_v2.h

Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp	2009-07-28 22:43:04 UTC (rev 42869)
+++ scummvm/trunk/engines/scumm/saveload.cpp	2009-07-28 23:19:33 UTC (rev 42870)
@@ -1382,7 +1382,7 @@
 }
 
 void ScummEngine_v0::saveOrLoad(Serializer *s) {
-	ScummEngine::saveOrLoad(s);
+	ScummEngine_v2::saveOrLoad(s);
 
 	const SaveLoadEntry v0Entrys[] = {
 		MKLINE(ScummEngine_v0, _currentMode, sleByte, VER(78)),
@@ -1392,6 +1392,23 @@
  	s->saveLoadEntries(this, v0Entrys);
 }
 
+
+void ScummEngine_v2::saveOrLoad(Serializer *s) {
+	ScummEngine::saveOrLoad(s);
+
+	const SaveLoadEntry v2Entrys[] = {
+		MKLINE(ScummEngine_v2, _inventoryOffset, sleUint16, VER(79)),
+		MKEND()
+	};
+	s->saveLoadEntries(this, v2Entrys);
+
+	// In old saves we didn't store _inventoryOffset -> reset it to
+	// a sane default when loading one of those.
+	if (s->getVersion() < 79 && s->isLoading()) {
+		_inventoryOffset = 0;
+	}
+}
+
 void ScummEngine_v5::saveOrLoad(Serializer *s) {
 	ScummEngine::saveOrLoad(s);
 

Modified: scummvm/trunk/engines/scumm/saveload.h
===================================================================
--- scummvm/trunk/engines/scumm/saveload.h	2009-07-28 22:43:04 UTC (rev 42869)
+++ scummvm/trunk/engines/scumm/saveload.h	2009-07-28 23:19:33 UTC (rev 42870)
@@ -50,7 +50,7 @@
  * only saves/loads those which are valid for the version of the savegame
  * which is being loaded/saved currently.
  */
-#define CURRENT_VER 78
+#define CURRENT_VER 79
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2009-07-28 22:43:04 UTC (rev 42869)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2009-07-28 23:19:33 UTC (rev 42870)
@@ -217,7 +217,6 @@
 	_roomResource = 0;
 	OF_OWNER_ROOM = 0;
 	_verbMouseOver = 0;
-	_inventoryOffset = 0;
 	_classData = NULL;
 	_actorToPrintStrFor = 0;
 	_sentenceNum = 0;
@@ -649,6 +648,8 @@
 ScummEngine_v2::ScummEngine_v2(OSystem *syst, const DetectorResult &dr)
 	: ScummEngine_v3old(syst, dr) {
 
+	_inventoryOffset = 0;
+
 	_activeInventory = 0;
 	_activeObject = 0;
 	_activeVerb = 0;

Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h	2009-07-28 22:43:04 UTC (rev 42869)
+++ scummvm/trunk/engines/scumm/scumm.h	2009-07-28 23:19:33 UTC (rev 42870)
@@ -889,7 +889,6 @@
 protected:
 	/* Should be in Verb class */
 	uint16 _verbMouseOver;
-	int _inventoryOffset;
 	int8 _userPut;
 	uint16 _userState;
 

Modified: scummvm/trunk/engines/scumm/scumm_v2.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm_v2.h	2009-07-28 22:43:04 UTC (rev 42869)
+++ scummvm/trunk/engines/scumm/scumm_v2.h	2009-07-28 23:19:33 UTC (rev 42870)
@@ -45,6 +45,7 @@
 	int8 _mouseOverBoxV2;
 
 	char _sentenceBuf[256];
+	uint16 _inventoryOffset;
 
 	int _activeInventory;
 	int _activeObject;
@@ -66,6 +67,8 @@
 	virtual void resetScummVars();
 	virtual void decodeParseString();
 
+	virtual void saveOrLoad(Serializer *s);
+
 	virtual void processKeyboard(Common::KeyState lastKeyHit);
 
 	virtual void readIndexFile();


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