[Scummvm-git-logs] scummvm master -> 399c5d63e22003511a45655ff8c6c0c80d0cfbf7

[sev-]

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:
399c5d63e2 ULTIMA: Another attempt to fix Amiga compilation


Commit: 399c5d63e22003511a45655ff8c6c0c80d0cfbf7
    https://github.com/scummvm/scummvm/commit/399c5d63e22003511a45655ff8c6c0c80d0cfbf7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-03T12:26:04+01:00

Commit Message:
ULTIMA: Another attempt to fix Amiga compilation

Changed paths:
    engines/ultima/nuvie/gui/widgets/gui_widget.cpp
    engines/ultima/nuvie/gui/widgets/gui_widget.h
    engines/ultima/ultima8/gumps/item_relative_gump.cpp
    engines/ultima/ultima8/gumps/item_relative_gump.h


diff --git a/engines/ultima/nuvie/gui/widgets/gui_widget.cpp b/engines/ultima/nuvie/gui/widgets/gui_widget.cpp
index e9422f9..b80b8de 100644
--- a/engines/ultima/nuvie/gui/widgets/gui_widget.cpp
+++ b/engines/ultima/nuvie/gui/widgets/gui_widget.cpp
@@ -111,7 +111,7 @@ void GUI_Widget::MoveRelative(int dx, int dy) {
 	return;
 }
 
-void GUI_Widget::Move(int new_x, int new_y) {
+void GUI_Widget::Move(int32 new_x, int32 new_y) {
 	Std::list<GUI_Widget *>::iterator child;
 
 	area.moveTo(new_x + offset_x, new_y + offset_y);
diff --git a/engines/ultima/nuvie/gui/widgets/gui_widget.h b/engines/ultima/nuvie/gui/widgets/gui_widget.h
index 4c59007..32bd882 100644
--- a/engines/ultima/nuvie/gui/widgets/gui_widget.h
+++ b/engines/ultima/nuvie/gui/widgets/gui_widget.h
@@ -29,7 +29,7 @@
 #include "ultima/nuvie/gui/gui_drag_area.h"
 #include "ultima/nuvie/gui/gui_drag_manager.h"
 #include "ultima/nuvie/screen/screen.h"
-#include "ultima/nuvie/core/events.h" 
+#include "ultima/nuvie/core/events.h"
 
 namespace Ultima {
 namespace Nuvie {
@@ -99,7 +99,7 @@ public:
 	virtual void Delete(void);
 
 	virtual void MoveRelative(int dx, int dy);
-	virtual void Move(int new_x, int new_y);
+	virtual void Move(int32 new_x, int32 new_y);
 	void MoveRelativeToParent(int dx, int dy);
 	bool has_focus() {
 		return focused;
diff --git a/engines/ultima/ultima8/gumps/item_relative_gump.cpp b/engines/ultima/ultima8/gumps/item_relative_gump.cpp
index 7db09bb..77b49b9 100644
--- a/engines/ultima/ultima8/gumps/item_relative_gump.cpp
+++ b/engines/ultima/ultima8/gumps/item_relative_gump.cpp
@@ -167,7 +167,7 @@ void ItemRelativeGump::GetItemLocation(int32 lerp_factor) {
 		MoveOnScreen();
 }
 
-void ItemRelativeGump::Move(int x_, int y_) {
+void ItemRelativeGump::Move(int32 x_, int32 y_) {
 	ParentToGump(x_, y_);
 	x += x_;
 	y += y_;
diff --git a/engines/ultima/ultima8/gumps/item_relative_gump.h b/engines/ultima/ultima8/gumps/item_relative_gump.h
index fbf951a..3d28ce9 100644
--- a/engines/ultima/ultima8/gumps/item_relative_gump.h
+++ b/engines/ultima/ultima8/gumps/item_relative_gump.h
@@ -51,7 +51,7 @@ public:
 	virtual void        GumpToParent(int32 &gx, int32 &gy,
 	                                 PointRoundDir r = ROUND_TOPLEFT) override;
 
-	virtual void        Move(int x, int y) override;
+	virtual void        Move(int32 x, int32 y) override;
 
 	bool                loadData(IDataSource *ids, uint32 version);
 protected: