[Scummvm-git-logs] scummvm master -> 165c8d14f246b6279150935814b30a37cd82f9fe

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
165c8d14f2 SCUMM: add newly introduced var to saving/loading


Commit: 165c8d14f246b6279150935814b30a37cd82f9fe
    https://github.com/scummvm/scummvm/commit/165c8d14f246b6279150935814b30a37cd82f9fe
Author: athrxx (athrxx at scummvm.org)
Date: 2023-11-21T22:50:02+01:00

Commit Message:
SCUMM: add newly introduced var to saving/loading

(also do some minor cleanup to that new code)

Changed paths:
    engines/scumm/actor.cpp
    engines/scumm/actor.h
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 896b5c453bc..5ed68b9b723 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -182,7 +182,6 @@ void Actor::initActor(int mode) {
 	_charset = 0;
 	memset(_sound, 0, sizeof(_sound));
 	_targetFacing = _facing;
-	_walkdata.nextDir = -1;
 	_lastValidX = 0;
 	_lastValidY = 0;
 
@@ -3868,6 +3867,7 @@ void Actor::saveLoadWithSerializer(Common::Serializer &s) {
 	s.syncAsSint32LE(_walkdata.deltaYFactor, VER(8));
 	s.syncAsUint16LE(_walkdata.xfrac, VER(8));
 	s.syncAsUint16LE(_walkdata.yfrac, VER(8));
+	s.syncAsSint16LE(_walkdata.nextDir, VER(111));
 
 	s.syncAsUint16LE(_walkdata.point3.x, VER(42));
 	s.syncAsUint16LE(_walkdata.point3.y, VER(42));
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 7e765f884f6..6a35204d6fa 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -151,7 +151,7 @@ protected:
 		int32 deltaXFactor, deltaYFactor;
 		uint16 xfrac, yfrac;
 		uint16 xAdd, yAdd;
-		int32 nextDir;
+		int16 nextDir;
 
 		void reset() {
 			dest.x = dest.y = 0;
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index e1bf4eadddf..c316975cc48 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -68,7 +68,7 @@ struct SaveInfoSection {
 
 #define SaveInfoSectionSize (4+4+4 + 4+4 + 4+2)
 
-#define CURRENT_VER 110
+#define CURRENT_VER 111
 #define INFOSECTION_VERSION 2
 
 #pragma mark -