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

[drmccoy at users.sourceforge.net]

Revision: 28434
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28434&view=rev
Author:   drmccoy
Date:     2007-08-03 09:21:39 -0700 (Fri, 03 Aug 2007)

Log Message:
-----------
Repaired the cursor and saving in the notebook

Modified Paths:
--------------
    scummvm/trunk/engines/gob/game_v2.cpp
    scummvm/trunk/engines/gob/saveload.h
    scummvm/trunk/engines/gob/saveload_v3.cpp

Modified: scummvm/trunk/engines/gob/game_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v2.cpp	2007-08-03 15:18:00 UTC (rev 28433)
+++ scummvm/trunk/engines/gob/game_v2.cpp	2007-08-03 16:21:39 UTC (rev 28434)
@@ -101,6 +101,7 @@
 			_extTable = 0;
 			_extHandle = -1;
 
+			_vm->_draw->_cursorHotspotXVar = -1;
 			_totToLoad[0] = 0;
 
 			if ((_curTotFile[0] == 0) && (_totFileData == 0))

Modified: scummvm/trunk/engines/gob/saveload.h
===================================================================
--- scummvm/trunk/engines/gob/saveload.h	2007-08-03 15:18:00 UTC (rev 28433)
+++ scummvm/trunk/engines/gob/saveload.h	2007-08-03 16:21:39 UTC (rev 28434)
@@ -152,10 +152,8 @@
 	virtual uint32 getSaveGameSize();
 
 	virtual int32 getSizeGame();
-	virtual int32 getSizeNotes();
 	virtual int32 getSizeScreenshot();
 	virtual bool loadGame(int16 dataVar, int32 size, int32 offset);
-	virtual bool loadNotes(int16 dataVar, int32 size, int32 offset);
 	virtual bool loadScreenshot(int16 dataVar, int32 size, int32 offset);
 	virtual bool saveGame(int16 dataVar, int32 size, int32 offset);
 	virtual bool saveNotes(int16 dataVar, int32 size, int32 offset);

Modified: scummvm/trunk/engines/gob/saveload_v3.cpp
===================================================================
--- scummvm/trunk/engines/gob/saveload_v3.cpp	2007-08-03 15:18:00 UTC (rev 28433)
+++ scummvm/trunk/engines/gob/saveload_v3.cpp	2007-08-03 16:21:39 UTC (rev 28434)
@@ -73,6 +73,8 @@
 		return kSaveScreenshot;
 	if (!scumm_stricmp(fileName, "intro.$$$"))
 		return kSaveTempSprite;
+	if (!scumm_stricmp(fileName, "bloc.inf"))
+		return kSaveNotes;
 	if (!scumm_stricmp(fileName, "prot"))
 		return kSaveIgnore;
 	if (!scumm_stricmp(fileName, "config"))
@@ -91,10 +93,6 @@
 	return size;
 }
 
-int32 SaveLoad_v3::getSizeNotes() {
-	return -1;
-}
-
 int32 SaveLoad_v3::getSizeGame() {
 	if (_firstSizeGame) {
 		_firstSizeGame = false;
@@ -215,10 +213,6 @@
 	return false;
 }
 
-bool SaveLoad_v3::loadNotes(int16 dataVar, int32 size, int32 offset) {
-	return false;
-}
-
 bool SaveLoad_v3::loadScreenshot(int16 dataVar, int32 size, int32 offset) {
 	Common::SaveFileManager *saveMan = g_system->getSavefileManager();
 	Common::InSaveFile *in;
@@ -336,7 +330,7 @@
 }
 
 bool SaveLoad_v3::saveNotes(int16 dataVar, int32 size, int32 offset) {
-	return false;
+	return SaveLoad_v2::saveNotes(dataVar, size - 160, offset);
 }
 
 bool SaveLoad_v3::saveScreenshot(int16 dataVar, int32 size, int32 offset) {


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