[Scummvm-cvs-logs] SF.net SVN: scummvm: [30348] scummvm/branches/branch-0-11-0/engines/lure

[dreammaster at users.sourceforge.net]

Revision: 30348
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30348&view=rev
Author:   dreammaster
Date:     2008-01-09 01:15:05 -0800 (Wed, 09 Jan 2008)

Log Message:
-----------
Backport of r30347: Fix for #1866777 - adds saving of hotspot layer to savegames

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/engines/lure/lure.cpp
    scummvm/branches/branch-0-11-0/engines/lure/luredefs.h
    scummvm/branches/branch-0-11-0/engines/lure/res_struct.cpp

Modified: scummvm/branches/branch-0-11-0/engines/lure/lure.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/lure/lure.cpp	2008-01-09 09:13:39 UTC (rev 30347)
+++ scummvm/branches/branch-0-11-0/engines/lure/lure.cpp	2008-01-09 09:15:05 UTC (rev 30348)
@@ -169,7 +169,7 @@
 
 	f->write("lure", 5);
 	f->writeByte(getLanguage());
-	f->writeByte(LURE_DAT_MINOR);
+	f->writeByte(LURE_SAVEGAME_MINOR);
 	f->writeString(caption);
 	f->writeByte(0); // End of string terminator
 

Modified: scummvm/branches/branch-0-11-0/engines/lure/luredefs.h
===================================================================
--- scummvm/branches/branch-0-11-0/engines/lure/luredefs.h	2008-01-09 09:13:39 UTC (rev 30347)
+++ scummvm/branches/branch-0-11-0/engines/lure/luredefs.h	2008-01-09 09:15:05 UTC (rev 30348)
@@ -36,6 +36,7 @@
 #define LURE_DAT_MAJOR 1
 #define LURE_DAT_MINOR 28
 #define LURE_MIN_SAVEGAME_MINOR 25 
+#define LURE_SAVEGAME_MINOR 29
 
 #define LURE_DEBUG 1
 

Modified: scummvm/branches/branch-0-11-0/engines/lure/res_struct.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/lure/res_struct.cpp	2008-01-09 09:13:39 UTC (rev 30347)
+++ scummvm/branches/branch-0-11-0/engines/lure/res_struct.cpp	2008-01-09 09:15:05 UTC (rev 30348)
@@ -25,6 +25,7 @@
 
 #include "lure/res.h"
 #include "lure/disk.h"
+#include "lure/lure.h"
 #include "lure/scripts.h"
 #include "common/endian.h"
 
@@ -446,6 +447,7 @@
 	stream->writeSint16LE(startX);
 	stream->writeSint16LE(startY);
 	stream->writeUint16LE(roomNumber);
+	stream->writeByte(layer);
 
 	stream->writeUint16LE(width);
 	stream->writeUint16LE(height);
@@ -490,6 +492,10 @@
 	startY = stream->readSint16LE();
 	roomNumber = stream->readUint16LE();
 
+	uint8 saveVersion = LureEngine::getReference().saveVersion();
+	if (saveVersion >= 29)
+		layer = stream->readByte();
+
 	width = stream->readUint16LE();
 	height = stream->readUint16LE();
 	widthCopy = stream->readUint16LE();


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