From 3959b96c9a84829e931a53a99846c04f0b1c792a Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Thu, 25 Dec 2003 22:05:02 +0000
Subject: [PATCH] Fix for bug #734154 (DIG: Savegame/Island names)

svn-id: r11928
---
 scumm/saveload.cpp | 7 +++++++
 scumm/saveload.h   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index d477063ef56..fd27ed2a244 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -135,6 +135,7 @@ bool ScummEngine::loadState(int slot, bool compat, SaveFileManager *mgr) {
 	CHECK_HEAP
 	closeRoom();
 	memset(_inventory, 0, sizeof(_inventory[0]) * _numInventory);
+	memset(_newNames, 0, sizeof(_newNames[0]) * _numNewNames);
 
 	/* Nuke all resources */
 	for (i = rtFirst; i <= rtLast; i++)
@@ -728,6 +729,9 @@ void ScummEngine::saveLoadResource(Serializer *ser, int type, int idx) {
 			if (type == rtInventory) {
 				ser->saveWord(_inventory[idx]);
 			}
+			if (type == rtObjectName && ser->getVersion() >= VER(25)) {
+				ser->saveWord(_newNames[idx]);
+			}
 		} else {
 			size = ser->loadUint32();
 			if (size) {
@@ -736,6 +740,9 @@ void ScummEngine::saveLoadResource(Serializer *ser, int type, int idx) {
 				if (type == rtInventory) {
 					_inventory[idx] = ser->loadWord();
 				}
+				if (type == rtObjectName && ser->getVersion() >= VER(25)) {
+					_newNames[idx] = ser->loadWord();
+				}
 			}
 		}
 	} else if (res.mode[type] == 2 && ser->getVersion() >= VER(23)) {
diff --git a/scumm/saveload.h b/scumm/saveload.h
index 89f5978fe07..7c330d4f4c1 100644
--- a/scumm/saveload.h
+++ b/scumm/saveload.h
@@ -32,7 +32,7 @@ namespace Scumm {
 // Can be useful for other ports too :)
 
 #define VER(x) x
-#define CURRENT_VER 24
+#define CURRENT_VER 25
 
 // To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types,
 // we use a small trick: instead of 0 we use 42. Why? Well, it seems newer GCC