diff options
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/surface.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/surface.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp index b8ceae25cb..2090a334a1 100644 --- a/engines/sherlock/surface.cpp +++ b/engines/sherlock/surface.cpp @@ -262,11 +262,11 @@ void Surface::setPixels(byte *pixels, int width, int height, Graphics::PixelForm _surface.setPixels(pixels); } -void Surface::writeString(const Common::String &str, const Common::Point &pt, byte overrideColor) { +void Surface::writeString(const Common::String &str, const Common::Point &pt, uint overrideColor) { Fonts::writeString(this, str, pt, overrideColor); } -void Surface::writeFancyString(const Common::String &str, const Common::Point &pt, byte overrideColor1, byte overrideColor2) { +void Surface::writeFancyString(const Common::String &str, const Common::Point &pt, uint overrideColor1, uint overrideColor2) { writeString(str, Common::Point(pt.x, pt.y), overrideColor1); writeString(str, Common::Point(pt.x + 1, pt.y), overrideColor1); writeString(str, Common::Point(pt.x + 2, pt.y), overrideColor1); diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h index 97424a1ed4..64b57f644a 100644 --- a/engines/sherlock/surface.h +++ b/engines/sherlock/surface.h @@ -165,8 +165,8 @@ public: /** * Draws the given string into the back buffer using the images stored in _font */ - virtual void writeString(const Common::String &str, const Common::Point &pt, byte overrideColor); - void writeFancyString(const Common::String &str, const Common::Point &pt, byte overrideColor1, byte overrideColor2); + virtual void writeString(const Common::String &str, const Common::Point &pt, uint overrideColor); + void writeFancyString(const Common::String &str, const Common::Point &pt, uint overrideColor1, uint overrideColor2); inline uint16 w() const { return _surface.w; } inline uint16 h() const { return _surface.h; } @@ -175,8 +175,8 @@ public: inline byte *getBasePtr(int x, int y) { return (byte *)_surface.getBasePtr(x, y); } inline const byte *getBasePtr(int x, int y) const { return (const byte *)_surface.getBasePtr(x, y); } inline Graphics::Surface &getRawSurface() { return _surface; } - inline void hLine(int x, int y, int x2, uint32 color) { _surface.hLine(x, y, x2, color); } - inline void vLine(int x, int y, int y2, uint32 color) { _surface.vLine(x, y, y2, color); } + inline void hLine(int x, int y, int x2, uint color) { _surface.hLine(x, y, x2, color); } + inline void vLine(int x, int y, int y2, uint color) { _surface.vLine(x, y, y2, color); } }; } // End of namespace Sherlock |