[Scummvm-git-logs] scummvm master -> 1b0bb7ebaaac43ab0ba63c2bc59fe8d6c1f063be

[OMGPizzaGuy]

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:
1b0bb7ebaa ULTIMA8: Fix pause on modal gumps.


Commit: 1b0bb7ebaaac43ab0ba63c2bc59fe8d6c1f063be
    https://github.com/scummvm/scummvm/commit/1b0bb7ebaaac43ab0ba63c2bc59fe8d6c1f063be
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-05-09T21:33:20-05:00

Commit Message:
ULTIMA8: Fix pause on modal gumps.
Previous change had unintended effects due to parameter position in constructor

Changed paths:
    engines/ultima/ultima8/gumps/modal_gump.cpp
    engines/ultima/ultima8/gumps/modal_gump.h
    engines/ultima/ultima8/gumps/target_gump.cpp


diff --git a/engines/ultima/ultima8/gumps/modal_gump.cpp b/engines/ultima/ultima8/gumps/modal_gump.cpp
index 7c66e7f671d..14f4b1c30bb 100644
--- a/engines/ultima/ultima8/gumps/modal_gump.cpp
+++ b/engines/ultima/ultima8/gumps/modal_gump.cpp
@@ -35,8 +35,8 @@ ModalGump::ModalGump() : Gump() {
 }
 
 
-ModalGump::ModalGump(int x, int y, int width, int height, bool pauseGame,
-					 uint16 owner, uint32 flags, int32 layer)
+ModalGump::ModalGump(int x, int y, int width, int height, uint16 owner,
+					 uint32 flags, int32 layer, bool pauseGame)
 	: Gump(x, y, width, height, owner, flags, layer), _pauseGame(pauseGame) {
 
 }
diff --git a/engines/ultima/ultima8/gumps/modal_gump.h b/engines/ultima/ultima8/gumps/modal_gump.h
index 6ec1557225d..2310b94558c 100644
--- a/engines/ultima/ultima8/gumps/modal_gump.h
+++ b/engines/ultima/ultima8/gumps/modal_gump.h
@@ -39,8 +39,9 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	ModalGump();
-	ModalGump(int x, int y, int width, int height, bool pauseGame = true, uint16 owner = 0,
-			  uint32 flags = FLAG_DONT_SAVE | FLAG_PREVENT_SAVE, int32 layer = LAYER_MODAL);
+	ModalGump(int x, int y, int width, int height, uint16 owner = 0,
+			  uint32 flags = FLAG_DONT_SAVE | FLAG_PREVENT_SAVE, int32 layer = LAYER_MODAL,
+			  bool pauseGame = true);
 
 	~ModalGump() override;
 
diff --git a/engines/ultima/ultima8/gumps/target_gump.cpp b/engines/ultima/ultima8/gumps/target_gump.cpp
index c509cde5b4a..8ffe57ad7c3 100644
--- a/engines/ultima/ultima8/gumps/target_gump.cpp
+++ b/engines/ultima/ultima8/gumps/target_gump.cpp
@@ -38,7 +38,8 @@ TargetGump::TargetGump() : ModalGump(), _targetTracing(false) {
 
 // Skip pause as usecode processes need to complete & matches orginal game
 TargetGump::TargetGump(int x, int y)
-	: ModalGump(x, y, 0, 0, false), _targetTracing(false) {
+	: ModalGump(x, y, 0, 0, 0, FLAG_DONT_SAVE | FLAG_PREVENT_SAVE, LAYER_MODAL, false),
+	_targetTracing(false) {
 
 }