From 8315d5d2c8939a147419f30d6bcc09afd15af9d3 Mon Sep 17 00:00:00 2001 From: athrxx Date: Tue, 1 Nov 2011 17:03:33 +0100 Subject: SCUMM: fix save file incompatibility between DS and other ports for non FM-TOWNS games --- engines/scumm/saveload.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/saveload.h') diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 16c225d20e..d55ec2d047 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -47,7 +47,7 @@ namespace Scumm { * only saves/loads those which are valid for the version of the savegame * which is being loaded/saved currently. */ -#define CURRENT_VER 86 +#define CURRENT_VER 87 /** * An auxillary macro, used to specify savegame versions. We use this instead -- cgit v1.2.3 From ae5192c5d396b6ab3caf57adabeb03a832966dd3 Mon Sep 17 00:00:00 2001 From: athrxx Date: Thu, 24 Nov 2011 21:27:22 +0100 Subject: SCUMM: make FM-Towns save files compatible between DS and other platforms (only applies to new save files) --- engines/scumm/saveload.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/saveload.h') diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index d55ec2d047..064bdf1406 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -47,7 +47,7 @@ namespace Scumm { * only saves/loads those which are valid for the version of the savegame * which is being loaded/saved currently. */ -#define CURRENT_VER 87 +#define CURRENT_VER 88 /** * An auxillary macro, used to specify savegame versions. We use this instead -- cgit v1.2.3 From e331421eae305fe857c1b630d5764e35635eaa7e Mon Sep 17 00:00:00 2001 From: segrax Date: Fri, 20 Jan 2012 07:47:43 +1100 Subject: SCUMM: Save the new variables, move the setting of the unknown variable to after the setDirection call --- engines/scumm/saveload.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/saveload.h') diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 064bdf1406..898f80f867 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -47,7 +47,7 @@ namespace Scumm { * only saves/loads those which are valid for the version of the savegame * which is being loaded/saved currently. */ -#define CURRENT_VER 88 +#define CURRENT_VER 89 /** * An auxillary macro, used to specify savegame versions. We use this instead -- cgit v1.2.3 From f99dab78e401608e45da672355ecac468f8e5e1d Mon Sep 17 00:00:00 2001 From: Tobias Gunkel Date: Thu, 26 Jan 2012 18:42:35 +0100 Subject: SCUMM: fix for old savegames --- engines/scumm/saveload.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/saveload.h') diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 898f80f867..931b56f137 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -47,7 +47,7 @@ namespace Scumm { * only saves/loads those which are valid for the version of the savegame * which is being loaded/saved currently. */ -#define CURRENT_VER 89 +#define CURRENT_VER 90 /** * An auxillary macro, used to specify savegame versions. We use this instead -- cgit v1.2.3 From 2b657283d763b23a3263485924c43d5e86aefcc9 Mon Sep 17 00:00:00 2001 From: Tobias Gunkel Date: Sun, 29 Jan 2012 17:26:16 +0100 Subject: SCUMM: forward savegame version is needed due to previous savegame changes) --- engines/scumm/saveload.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/saveload.h') diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 931b56f137..a316670e3d 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -47,7 +47,7 @@ namespace Scumm { * only saves/loads those which are valid for the version of the savegame * which is being loaded/saved currently. */ -#define CURRENT_VER 90 +#define CURRENT_VER 91 /** * An auxillary macro, used to specify savegame versions. We use this instead -- cgit v1.2.3 From 8d3b27293965ea17a4a34a1258688f9eeb3410d1 Mon Sep 17 00:00:00 2001 From: Tobias Gunkel Date: Sat, 4 Feb 2012 17:35:59 +0100 Subject: SCUMM: save complete v0 state and initialize actors correctly --- engines/scumm/saveload.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/saveload.h') diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index a316670e3d..90feee6dc0 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -47,7 +47,7 @@ namespace Scumm { * only saves/loads those which are valid for the version of the savegame * which is being loaded/saved currently. */ -#define CURRENT_VER 91 +#define CURRENT_VER 92 /** * An auxillary macro, used to specify savegame versions. We use this instead -- cgit v1.2.3 From 65fc7225bb31e72120dcdf16e91ae377c657548d Mon Sep 17 00:00:00 2001 From: Tobias Gunkel Date: Sat, 11 Feb 2012 00:10:58 +0100 Subject: SCUMM: revert savegame version to 89 Previous versions 89-92 are merged into version 89. --- engines/scumm/saveload.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/saveload.h') diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 90feee6dc0..898f80f867 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -47,7 +47,7 @@ namespace Scumm { * only saves/loads those which are valid for the version of the savegame * which is being loaded/saved currently. */ -#define CURRENT_VER 92 +#define CURRENT_VER 89 /** * An auxillary macro, used to specify savegame versions. We use this instead -- cgit v1.2.3 From 784472a6690f4be0ba7af4841dcd6b167c639a64 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Sat, 11 Feb 2012 10:55:55 +0100 Subject: Revert "SCUMM: revert savegame version to 89" This reverts commit 65fc7225bb31e72120dcdf16e91ae377c657548d. Increasing the savegame version on a branch and then decreasing it again leads to problems with loading current savegames in old commits during a bisect. --- engines/scumm/saveload.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/saveload.h') diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 898f80f867..90feee6dc0 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -47,7 +47,7 @@ namespace Scumm { * only saves/loads those which are valid for the version of the savegame * which is being loaded/saved currently. */ -#define CURRENT_VER 89 +#define CURRENT_VER 92 /** * An auxillary macro, used to specify savegame versions. We use this instead -- cgit v1.2.3 From a4798602d7a025dc13fd253d584dbf29dbec488d Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Wed, 15 Feb 2012 09:53:31 -0600 Subject: JANITORIAL: Fix missing whitespace in pointer cast find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g' This seems to have caught some params as well which is not undesirable IMO. It also caught some strings containing this which is undesirable so I excluded them manually. (engines/sci/engine/kernel_tables.h) --- engines/scumm/saveload.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/scumm/saveload.h') diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 90feee6dc0..d5f7ea526e 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -74,13 +74,13 @@ namespace Scumm { * what POD means refer to or * to ) */ -#define OFFS(type,item) (((ptrdiff_t)(&((type*)42)->type::item))-42) +#define OFFS(type,item) (((ptrdiff_t)(&((type *)42)->type::item))-42) /** * Similar to the OFFS macro, this macro computes the size (in bytes) of a * member of a given struct/class type. */ -#define SIZE(type,item) sizeof(((type*)42)->type::item) +#define SIZE(type,item) sizeof(((type *)42)->type::item) // Any item that is still in use automatically gets a maxVersion equal to CURRENT_VER #define MKLINE(type,item,saveas,minVer) {OFFS(type,item),saveas,SIZE(type,item),minVer,CURRENT_VER} -- cgit v1.2.3