[Scummvm-cvs-logs] scummvm master -> 03965ba855c510eecb0dfd653aef0cc9b67541dc

digitall dgturner at iee.org
Sun Sep 29 01:43:15 CEST 2013


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:
03965ba855 SWORD25: Even more fixes for Amiga OS 4 compilation.


Commit: 03965ba855c510eecb0dfd653aef0cc9b67541dc
    https://github.com/scummvm/scummvm/commit/03965ba855c510eecb0dfd653aef0cc9b67541dc
Author: D G Turner (digitall at scummvm.org)
Date: 2013-09-28T16:45:43-07:00

Commit Message:
SWORD25: Even more fixes for Amiga OS 4 compilation.

Changed paths:
    engines/sword25/gfx/text.cpp
    engines/sword25/gfx/text.h



diff --git a/engines/sword25/gfx/text.cpp b/engines/sword25/gfx/text.cpp
index d4aaa90..65add60 100644
--- a/engines/sword25/gfx/text.cpp
+++ b/engines/sword25/gfx/text.cpp
@@ -98,8 +98,8 @@ void Text::setText(const Common::String &text) {
 	}
 }
 
-void Text::setColor(uint modulationColor) {
-	uint newModulationColor = (modulationColor & 0x00ffffff) | (_modulationColor & 0xff000000);
+void Text::setColor(uint32 modulationColor) {
+	uint32 newModulationColor = (modulationColor & 0x00ffffff) | (_modulationColor & 0xff000000);
 	if (newModulationColor != _modulationColor) {
 		_modulationColor = newModulationColor;
 		forceRefresh();
@@ -108,7 +108,7 @@ void Text::setColor(uint modulationColor) {
 
 void Text::setAlpha(int alpha) {
 	assert(alpha >= 0 && alpha < 256);
-	uint newModulationColor = (_modulationColor & 0x00ffffff) | alpha << 24;
+	uint32 newModulationColor = (_modulationColor & 0x00ffffff) | alpha << 24;
 	if (newModulationColor != _modulationColor) {
 		_modulationColor = newModulationColor;
 		forceRefresh();
diff --git a/engines/sword25/gfx/text.h b/engines/sword25/gfx/text.h
index 94e7a30..e82c24d 100644
--- a/engines/sword25/gfx/text.h
+++ b/engines/sword25/gfx/text.h
@@ -100,7 +100,7 @@ public:
 	    @brief Setzt die Farbe des Textes.
 	    @param Color eine 24-Bit RGB Farbe, die die Farbe des Textes festlegt.
 	*/
-	void setColor(uint modulationColor);
+	void setColor(uint32 modulationColor);
 
 	/**
 	    @brief Gibt den Alphawert des Textes zurück.
@@ -142,7 +142,7 @@ private:
 	Text(RenderObjectPtr<RenderObject> parentPtr);
 	Text(InputPersistenceBlock &reader, RenderObjectPtr<RenderObject> parentPtr, uint handle);
 
-	uint _modulationColor;
+	uint32 _modulationColor;
 	Common::String _font;
 	Common::String _text;
 	bool _autoWrap;






More information about the Scummvm-git-logs mailing list