[Scummvm-cvs-logs] SF.net SVN: scummvm:[43421] scummvm/branches/gsoc2009-16bit/engines/scumm

[Kirben at users.sourceforge.net]

Revision: 43421
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43421&view=rev
Author:   Kirben
Date:     2009-08-16 01:46:47 +0000 (Sun, 16 Aug 2009)

Log Message:
-----------
Update branch specific save game changes, to prevent conflicts.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/engines/scumm/actor.cpp
    scummvm/branches/gsoc2009-16bit/engines/scumm/saveload.h

Modified: scummvm/branches/gsoc2009-16bit/engines/scumm/actor.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/scumm/actor.cpp	2009-08-16 01:43:18 UTC (rev 43420)
+++ scummvm/branches/gsoc2009-16bit/engines/scumm/actor.cpp	2009-08-16 01:46:47 UTC (rev 43421)
@@ -2553,8 +2553,8 @@
 
 		// Actor palette grew from 64 to 256 bytes and switched to uint16 in HE games
 		MKARRAY_OLD(Actor, _palette[0], sleByte, 64, VER(8), VER(9)),
-		MKARRAY_OLD(Actor, _palette[0], sleByte, 256, VER(10), VER(77)),
-		MKARRAY(Actor, _palette[0], sleUint16, 256, VER(78)),
+		MKARRAY_OLD(Actor, _palette[0], sleByte, 256, VER(10), VER(79)),
+		MKARRAY(Actor, _palette[0], sleUint16, 256, VER(80)),
 
 		MK_OBSOLETE(Actor, _mask, sleByte, VER(8), VER(9)),
 		MKLINE(Actor, _shadowMode, sleByte, VER(8)),

Modified: scummvm/branches/gsoc2009-16bit/engines/scumm/saveload.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/scumm/saveload.h	2009-08-16 01:43:18 UTC (rev 43420)
+++ scummvm/branches/gsoc2009-16bit/engines/scumm/saveload.h	2009-08-16 01:46:47 UTC (rev 43421)
@@ -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 79
+#define CURRENT_VER 80
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead


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