aboutsummaryrefslogtreecommitdiff
path: root/engines/zvision
diff options
context:
space:
mode:
authorRichieSams2013-10-01 17:56:35 -0500
committerRichieSams2013-10-02 09:09:55 -0500
commit0deb84522988488b8b93d57bb525fd4a6f8e4588 (patch)
tree4a1537c2731e05a114321fa19a2a671223b09446 /engines/zvision
parentafe8cba1a1d161062a54400258467167cab76776 (diff)
downloadscummvm-rg350-0deb84522988488b8b93d57bb525fd4a6f8e4588.tar.gz
scummvm-rg350-0deb84522988488b8b93d57bb525fd4a6f8e4588.tar.bz2
scummvm-rg350-0deb84522988488b8b93d57bb525fd4a6f8e4588.zip
ZVISION: Remove global const variable
Replace with ColorMasks
Diffstat (limited to 'engines/zvision')
-rw-r--r--engines/zvision/string_manager.cpp5
-rw-r--r--engines/zvision/string_manager.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/engines/zvision/string_manager.cpp b/engines/zvision/string_manager.cpp
index 9ff1dd2e87..cac6858ef0 100644
--- a/engines/zvision/string_manager.cpp
+++ b/engines/zvision/string_manager.cpp
@@ -27,6 +27,7 @@
#include "common/debug.h"
#include "graphics/fontman.h"
+#include "graphics/colormasks.h"
#include "zvision/string_manager.h"
#include "zvision/truetype_font.h"
@@ -34,8 +35,6 @@
namespace ZVision {
-const Graphics::PixelFormat StringManager::_pixelFormat565 = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);
-
StringManager::StringManager(ZVision *engine)
: _engine(engine) {
}
@@ -206,7 +205,7 @@ void StringManager::parseTag(const Common::String &tagString, uint lineNumber) {
}
fragment.style.align = align;
- fragment.style.color = _pixelFormat565.ARGBToColor(0, red, green, blue);
+ fragment.style.color = Graphics::ARGBToColor<Graphics::ColorMasks<565>>(0, red, green, blue);
_inGameText[lineNumber].fragments.push_back(fragment);
_lastStyle = fragment.style;
diff --git a/engines/zvision/string_manager.h b/engines/zvision/string_manager.h
index b67573b3a3..74d13cd994 100644
--- a/engines/zvision/string_manager.h
+++ b/engines/zvision/string_manager.h
@@ -69,8 +69,6 @@ private:
InGameText _inGameText[NUM_TEXT_LINES];
Common::HashMap<Common::String, TruetypeFont *> _fonts;
- static const Graphics::PixelFormat _pixelFormat565;
-
TextStyle _lastStyle;
public: