ALL: colour -> color

1 files changed, 12 insertions, 13 deletions

diff --git a/engines/m4/graphics.h b/engines/m4/graphics.h
index d58ed69403..dbf6fac8c8 100644
--- a/engines/m4/graphics.h
+++ b/engines/m4/graphics.h
@@ -40,7 +40,7 @@ namespace M4 {
 #define MADS_SCREEN_HEIGHT 200
 #define MADS_Y_OFFSET ((MADS_SCREEN_HEIGHT - MADS_SURFACE_HEIGHT) / 2)
 
-#define TRANSPARENT_COLOUR_INDEX 0xFF
+#define TRANSPARENT_COLOR_INDEX 0xFF
 
 struct BGR8 {
 	uint8 b, g, r;
@@ -89,7 +89,7 @@ struct SpriteInfo {
 	int width, height;
 	int scaleX, scaleY;
 	uint8 encoding;
-	byte *inverseColourTable;
+	byte *inverseColorTable;
 	RGB8 *palette;
 };
 
@@ -141,7 +141,6 @@ public:
 	void madsLoadInterface(const Common::String &filename);
 
 	void setColor(byte value) { _color = value; }
-	void setColour(byte value) { _color = value; }
 	inline byte getColor() const { return _color; }
 	void vLine(int x, int y1, int y2);
 	void hLine(int x1, int x2, int y);
@@ -173,9 +172,9 @@ public:
 	void reset();
 	void frameRect(const Common::Rect &r, uint8 color);
 	void fillRect(const Common::Rect &r, uint8 color);
-	void copyFrom(M4Surface *src, const Common::Rect &srcBounds, int destX, int destY, int transparentColour = -1);
+	void copyFrom(M4Surface *src, const Common::Rect &srcBounds, int destX, int destY, int transparentColor = -1);
 	void copyFrom(M4Surface *src, int destX, int destY, int depth, M4Surface *depthSurface, 
-			int scale, int transparentColour = -1);
+			int scale, int transparentColor = -1);
 
 	void update() {
 		if (_isScreen) {
@@ -185,19 +184,19 @@ public:
 	}
 
 	// copyTo methods
-	inline void copyTo(M4Surface *dest, int transparentColour = -1) {
-		dest->copyFrom(this, Common::Rect(width(), height()), 0, 0, transparentColour);
+	inline void copyTo(M4Surface *dest, int transparentColor = -1) {
+		dest->copyFrom(this, Common::Rect(width(), height()), 0, 0, transparentColor);
 	}
-	inline void copyTo(M4Surface *dest, int x, int y, int transparentColour = -1) {
-		dest->copyFrom(this, Common::Rect(width(), height()), x, y, transparentColour);
+	inline void copyTo(M4Surface *dest, int x, int y, int transparentColor = -1) {
+		dest->copyFrom(this, Common::Rect(width(), height()), x, y, transparentColor);
 	}
 	inline void copyTo(M4Surface *dest, const Common::Rect &srcBounds, int destX, int destY,
-				int transparentColour = -1) {
-		dest->copyFrom(this, srcBounds, destX, destY, transparentColour);
+				int transparentColor = -1) {
+		dest->copyFrom(this, srcBounds, destX, destY, transparentColor);
 	}
 	inline void copyTo(M4Surface *dest, int destX, int destY, int depth, M4Surface *depthsSurface, int scale,
-				int transparentColour = -1) {
-		dest->copyFrom(this, destX, destY, depth, depthsSurface, scale, transparentColour);
+				int transparentColor = -1) {
+		dest->copyFrom(this, destX, destY, depth, depthsSurface, scale, transparentColor);
 	}
 
 	void scrollX(int xAmount);