[Scummvm-cvs-logs] scummvm master -> 1a92f869b8b34f70eb41ed6cad0937f9d45ba46a

[dreammaster]

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:
1a92f869b8 SHERLOCK: 3DO: Change more color method params from byte to uint


Commit: 1a92f869b8b34f70eb41ed6cad0937f9d45ba46a
    https://github.com/scummvm/scummvm/commit/1a92f869b8b34f70eb41ed6cad0937f9d45ba46a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-09-09T08:15:59-04:00

Commit Message:
SHERLOCK: 3DO: Change more color method params from byte to uint

Changed paths:
    engines/sherlock/surface.cpp
    engines/sherlock/surface.h



diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index b8ceae2..2090a33 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 97424a1..64b57f6 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