[Scummvm-git-logs] scummvm master -> 105c1045eb4bf42ba7971f1690daae868c979c5d

sev- sev at scummvm.org
Mon Feb 3 11:18:30 UTC 2020


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:
105c1045eb ULTIMA: Amiga compilation fix


Commit: 105c1045eb4bf42ba7971f1690daae868c979c5d
    https://github.com/scummvm/scummvm/commit/105c1045eb4bf42ba7971f1690daae868c979c5d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-03T12:18:12+01:00

Commit Message:
ULTIMA: Amiga compilation fix

Changed paths:
    engines/ultima/ultima8/gumps/item_relative_gump.cpp
    engines/ultima/ultima8/gumps/item_relative_gump.h


diff --git a/engines/ultima/ultima8/gumps/item_relative_gump.cpp b/engines/ultima/ultima8/gumps/item_relative_gump.cpp
index 77b49b9..7db09bb 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(int32 x_, int32 y_) {
+void ItemRelativeGump::Move(int x_, int 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 3d28ce9..fbf951a 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(int32 x, int32 y) override;
+	virtual void        Move(int x, int y) override;
 
 	bool                loadData(IDataSource *ids, uint32 version);
 protected:




More information about the Scummvm-git-logs mailing list