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

[OMGPizzaGuy]

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:
ba75abeb14 ULTIMA8: Fix positions on slider gump to better match original
efcddb3397 ULTIMA8: Use frame id to define shape for sliding widget


Commit: ba75abeb14e833b160108533ca1c98b73a0c155b
    https://github.com/scummvm/scummvm/commit/ba75abeb14e833b160108533ca1c98b73a0c155b
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2022-12-23T16:58:05-06:00

Commit Message:
ULTIMA8: Fix positions on slider gump to better match original

Changed paths:
    engines/ultima/ultima8/gumps/slider_gump.cpp


diff --git a/engines/ultima/ultima8/gumps/slider_gump.cpp b/engines/ultima/ultima8/gumps/slider_gump.cpp
index 7e421963a83..9c6edf43355 100644
--- a/engines/ultima/ultima8/gumps/slider_gump.cpp
+++ b/engines/ultima/ultima8/gumps/slider_gump.cpp
@@ -68,7 +68,7 @@ static const int sliderframe = 0;
 static const int slidery = 17;
 static const int sliderminx = 55;
 static const int slidermaxx = 130;
-static const int labelx = 161;
+static const int labelx = 18;
 static const int labely = 26;
 static const int labelfont = 0;
 
@@ -135,12 +135,12 @@ void SliderGump::InitGump(Gump *newparent, bool take_focus) {
 	FrameID button_up(GameData::GUMPS, okshape, 0);
 	FrameID button_down(GameData::GUMPS, okshape, 1);
 
-	widget = new ButtonWidget(14, 17, button_up, button_down);
+	widget = new ButtonWidget(158, 17, button_up, button_down);
 	widget->SetIndex(OK_INDEX);
 	widget->InitGump(this);
 
 	FrameID buttonleft_up(GameData::GUMPS, leftshape, 0);
-	FrameID buttonleft_down(GameData::GUMPS, leftshape, 1);
+	FrameID buttonleft_down(GameData::GUMPS, leftshape, 0);
 
 	widget = new ButtonWidget(36, 17, buttonleft_up, buttonleft_down);
 	widget->SetIndex(LEFT_INDEX);
@@ -148,7 +148,7 @@ void SliderGump::InitGump(Gump *newparent, bool take_focus) {
 
 
 	FrameID buttonright_up(GameData::GUMPS, rightshape, 0);
-	FrameID buttonright_down(GameData::GUMPS, rightshape, 1);
+	FrameID buttonright_down(GameData::GUMPS, rightshape, 0);
 
 	widget = new ButtonWidget(141, 17, buttonright_up, buttonright_down);
 	widget->SetIndex(RIGHT_INDEX);


Commit: efcddb3397448d79b7fff62ba7912f8a6dc978f4
    https://github.com/scummvm/scummvm/commit/efcddb3397448d79b7fff62ba7912f8a6dc978f4
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2022-12-23T16:58:05-06:00

Commit Message:
ULTIMA8: Use frame id to define shape for sliding widget

Changed paths:
    engines/ultima/ultima8/gumps/slider_gump.cpp
    engines/ultima/ultima8/gumps/widgets/sliding_widget.cpp
    engines/ultima/ultima8/gumps/widgets/sliding_widget.h


diff --git a/engines/ultima/ultima8/gumps/slider_gump.cpp b/engines/ultima/ultima8/gumps/slider_gump.cpp
index 9c6edf43355..642697df4bb 100644
--- a/engines/ultima/ultima8/gumps/slider_gump.cpp
+++ b/engines/ultima/ultima8/gumps/slider_gump.cpp
@@ -123,12 +123,9 @@ void SliderGump::InitGump(Gump *newparent, bool take_focus) {
 	_shape = GameData::get_instance()->getGumps()->getShape(gumpshape);
 	UpdateDimsFromShape();
 
-	const Shape *childshape = GameData::get_instance()->
-	                    getGumps()->getShape(slidershape);
-
 	// Create the SlidingWidget
-	Gump *widget = new SlidingWidget(getSliderPos(), slidery,
-	                                 childshape, sliderframe);
+	FrameID frame(GameData::GUMPS, slidershape, sliderframe);
+	Gump *widget = new SlidingWidget(getSliderPos(), slidery, frame);
 	widget->SetIndex(SLIDER_INDEX);
 	widget->InitGump(this);
 
diff --git a/engines/ultima/ultima8/gumps/widgets/sliding_widget.cpp b/engines/ultima/ultima8/gumps/widgets/sliding_widget.cpp
index 41f089a6a51..11dc8171e7b 100644
--- a/engines/ultima/ultima8/gumps/widgets/sliding_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/sliding_widget.cpp
@@ -30,10 +30,9 @@ SlidingWidget::SlidingWidget()
 	: Gump() {
 }
 
-SlidingWidget::SlidingWidget(int x, int y, const Shape *shape, uint32 frameNum)
+SlidingWidget::SlidingWidget(int x, int y, FrameID frame)
 	: Gump(x, y, 5, 5, 0, FLAG_DRAGGABLE) {
-	_shape = shape;
-	_frameNum = frameNum;
+	SetShape(frame, true);
 }
 
 SlidingWidget::~SlidingWidget() {
diff --git a/engines/ultima/ultima8/gumps/widgets/sliding_widget.h b/engines/ultima/ultima8/gumps/widgets/sliding_widget.h
index f0db83876cf..b8f5c326d33 100644
--- a/engines/ultima/ultima8/gumps/widgets/sliding_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/sliding_widget.h
@@ -33,7 +33,7 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	SlidingWidget();
-	SlidingWidget(int x, int y, const Shape *shape, uint32 frameNum);
+	SlidingWidget(int x, int y, FrameID frame);
 	~SlidingWidget() override;
 
 	void InitGump(Gump *newparent, bool take_focus = true) override;