[Scummvm-git-logs] scummvm master -> ba18026103b6be3a6d4a5844663b299bd6c5835e

[mgerhardy]

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

Summary:
f64a2d0db0 TWINE: minor tweak in struct size
ba18026103 TWINE: BonusParameter must be 4 bytes, too


Commit: f64a2d0db02c5e80a3aeaef27df698ade4be7877
    https://github.com/scummvm/scummvm/commit/f64a2d0db02c5e80a3aeaef27df698ade4be7877
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-02-08T21:34:06+01:00

Commit Message:
TWINE: minor tweak in struct size

Changed paths:
    engines/twine/scene/scene.h


diff --git a/engines/twine/scene/scene.h b/engines/twine/scene/scene.h
index b08f7b81a0..9c6da43a22 100644
--- a/engines/twine/scene/scene.h
+++ b/engines/twine/scene/scene.h
@@ -58,6 +58,7 @@ struct ZoneStruct {
 	ScenePoint bottomLeft;
 	ScenePoint topRight;
 	int16 type = 0;
+	int16 snap = 0;
 	union {
 		struct {
 			int32 newSceneIdx;
@@ -103,7 +104,6 @@ struct ZoneStruct {
 			int32 info7;
 		} generic;
 	} infoData;
-	int16 snap = 0;
 };
 
 enum ZoneType {


Commit: ba18026103b6be3a6d4a5844663b299bd6c5835e
    https://github.com/scummvm/scummvm/commit/ba18026103b6be3a6d4a5844663b299bd6c5835e
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-02-08T22:03:21+01:00

Commit Message:
TWINE: BonusParameter must be 4 bytes, too

see previous change in scene infodata

Changed paths:
    engines/twine/scene/actor.h


diff --git a/engines/twine/scene/actor.h b/engines/twine/scene/actor.h
index c296d8bff8..074afa4bcc 100644
--- a/engines/twine/scene/actor.h
+++ b/engines/twine/scene/actor.h
@@ -134,16 +134,16 @@ struct DynamicFlagsStruct {
  * will be chosen randomly each time player uses Action.
  */
 struct BonusParameter {
-	uint16 unk1 : 1;
-	uint16 unk2 : 1;
-	uint16 unk3 : 1;
-	uint16 unk4 : 1;
-	uint16 kashes : 1;
-	uint16 lifepoints : 1;
-	uint16 magicpoints : 1;
-	uint16 key : 1;
-	uint16 cloverleaf : 1;
-	uint16 unused : 7;
+	uint32 unk1 : 1;
+	uint32 unk2 : 1;
+	uint32 unk3 : 1;
+	uint32 unk4 : 1;
+	uint32 kashes : 1;
+	uint32 lifepoints : 1;
+	uint32 magicpoints : 1;
+	uint32 key : 1;
+	uint32 cloverleaf : 1;
+	uint32 unused : 23;
 };
 
 #define kAnimationTypeLoop 0