diff options
author | D G Turner | 2013-09-29 00:45:43 +0100 |
---|---|---|
committer | D G Turner | 2013-09-29 00:45:43 +0100 |
commit | 03965ba855c510eecb0dfd653aef0cc9b67541dc (patch) | |
tree | 83e0737af8bdbc44c35bf97e405612159323a8f5 | |
parent | 9220d331e2761a7f5a69a6a68617fce4b7fece18 (diff) | |
download | scummvm-rg350-03965ba855c510eecb0dfd653aef0cc9b67541dc.tar.gz scummvm-rg350-03965ba855c510eecb0dfd653aef0cc9b67541dc.tar.bz2 scummvm-rg350-03965ba855c510eecb0dfd653aef0cc9b67541dc.zip |
SWORD25: Even more fixes for Amiga OS 4 compilation.
-rw-r--r-- | engines/sword25/gfx/text.cpp | 6 | ||||
-rw-r--r-- | engines/sword25/gfx/text.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword25/gfx/text.cpp b/engines/sword25/gfx/text.cpp index d4aaa90682..65add60e97 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 94e7a30865..e82c24d93c 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; |