[Scummvm-git-logs] scummvm master -> 3a937f19c0a5e347c801c62d345475be082f9e41

dreammaster dreammaster at scummvm.org
Sun Jan 28 04:04:19 CET 2018


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:
3a937f19c0 XEEN: Second compilation fix


Commit: 3a937f19c0a5e347c801c62d345475be082f9e41
    https://github.com/scummvm/scummvm/commit/3a937f19c0a5e347c801c62d345475be082f9e41
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-01-27T22:02:35-05:00

Commit Message:
XEEN: Second compilation fix

Changed paths:
    engines/xeen/dialogs.cpp
    engines/xeen/dialogs.h


diff --git a/engines/xeen/dialogs.cpp b/engines/xeen/dialogs.cpp
index 72f20d8..500f0f7 100644
--- a/engines/xeen/dialogs.cpp
+++ b/engines/xeen/dialogs.cpp
@@ -51,7 +51,7 @@ void ButtonContainer::addButton(const Common::Rect &bounds, int val,
 }
 
 void ButtonContainer::addButton(const Common::Rect &bounds, int val,
-		uint frameNum, SpriteResource *sprites) {
+		int frameNum, SpriteResource *sprites) {
 	_buttons.push_back(UIButton(bounds, val, frameNum, sprites, sprites != nullptr));
 }
 
diff --git a/engines/xeen/dialogs.h b/engines/xeen/dialogs.h
index 6117fbd..b4ad772 100644
--- a/engines/xeen/dialogs.h
+++ b/engines/xeen/dialogs.h
@@ -92,15 +92,9 @@ public:
 	void restoreButtons();
 
 	void addButton(const Common::Rect &bounds, int val,
-		SpriteResource *sprites);
+		SpriteResource *sprites = nullptr);
 	void addButton(const Common::Rect &bounds, int val,
-		uint frameNum, SpriteResource *sprites);
-	void addButton(const Common::Rect &bounds, int val) {
-		addButton(bounds, val, nullptr);
-	}
-	void addButton(const Common::Rect &bounds, int val, uint frameNum) {
-		addButton(bounds, val, frameNum, nullptr);
-	}
+		int frameNum, SpriteResource *sprites = nullptr);
 
 	void addPartyButtons(XeenEngine *vm);
 





More information about the Scummvm-git-logs mailing list