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

ccawley2011 ccawley2011 at gmail.com
Sun Aug 16 19:20:48 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:
c187d1835a DIRECTOR: Fix mismatched types


Commit: c187d1835aa69645394317faa6e466a8ae814aa6
    https://github.com/scummvm/scummvm/commit/c187d1835aa69645394317faa6e466a8ae814aa6
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-08-16T20:20:27+01:00

Commit Message:
DIRECTOR: Fix mismatched types

Changed paths:
    engines/director/castmember.h


diff --git a/engines/director/castmember.h b/engines/director/castmember.h
index 75c1281b42..61420125b9 100644
--- a/engines/director/castmember.h
+++ b/engines/director/castmember.h
@@ -209,8 +209,8 @@ public:
 	virtual void updateFromWidget(Graphics::MacWidget *widget) override;
 	Graphics::TextAlign getAlignment();
 
-	virtual uint getBackColor() override { return _bgcolor; }
-	virtual uint getForeColor() override { return _fgcolor; }
+	virtual uint32 getBackColor() override { return _bgcolor; }
+	virtual uint32 getForeColor() override { return _fgcolor; }
 
 	bool hasField(int field) override;
 	Datum getField(int field) override;




More information about the Scummvm-git-logs mailing list