Repaired the cursor and saving in the notebook

svn-id: r28434

3 files changed, 4 insertions, 11 deletions

diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp
index f7f7a10b92..7e87b9e8f8 100644
--- a/engines/gob/game_v2.cpp
+++ b/engines/gob/game_v2.cpp
@@ -101,6 +101,7 @@ void Game_v2::playTot(int16 skipPlay) {
 			_extTable = 0;
 			_extHandle = -1;
 
+			_vm->_draw->_cursorHotspotXVar = -1;
 			_totToLoad[0] = 0;
 
 			if ((_curTotFile[0] == 0) && (_totFileData == 0))
diff --git a/engines/gob/saveload.h b/engines/gob/saveload.h
index 28cd458442..d7e45246ad 100644
--- a/engines/gob/saveload.h
+++ b/engines/gob/saveload.h
@@ -152,10 +152,8 @@ protected:
 	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);
diff --git a/engines/gob/saveload_v3.cpp b/engines/gob/saveload_v3.cpp
index 5e540cfdc8..d0f791d8df 100644
--- a/engines/gob/saveload_v3.cpp
+++ b/engines/gob/saveload_v3.cpp
@@ -73,6 +73,8 @@ SaveType SaveLoad_v3::getSaveType(const char *fileName) {
 		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 @@ uint32 SaveLoad_v3::getSaveGameSize() {
 	return size;
 }
 
-int32 SaveLoad_v3::getSizeNotes() {
-	return -1;
-}
-
 int32 SaveLoad_v3::getSizeGame() {
 	if (_firstSizeGame) {
 		_firstSizeGame = false;
@@ -215,10 +213,6 @@ bool SaveLoad_v3::loadGame(int16 dataVar, int32 size, int32 offset) {
 	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::saveGame(int16 dataVar, int32 size, int32 offset) {
 }
 
 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) {