ENGINES: Change 'colour' to 'color'

Only changed this in engines where 'color' was/is already used
almost exclusively

svn-id: r54288

10 files changed, 34 insertions, 34 deletions

diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 17f476cb50..4cdd56dc8d 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -1927,7 +1927,7 @@ public:
 	void off_setPathValues();
 	void off_stopClock();
 	void off_restartClock();
-	void off_setColour();
+	void off_setColor();
 	void off_b3Set();
 	void off_b3Clear();
 	void off_b3Zero();
diff --git a/engines/agos/script_dp.cpp b/engines/agos/script_dp.cpp
index 96e4beb880..57610017a1 100644
--- a/engines/agos/script_dp.cpp
+++ b/engines/agos/script_dp.cpp
@@ -281,7 +281,7 @@ void AGOSEngine_DIMP::setupOpcodes() {
 		OPCODE(opp_setPathValues),
 		OPCODE(off_stopClock),
 		OPCODE(off_restartClock),
-		OPCODE(off_setColour),
+		OPCODE(off_setColor),
 	};
 
 	_opcodesDIMP = opcodes;
diff --git a/engines/agos/script_ff.cpp b/engines/agos/script_ff.cpp
index c1cc8ca9a0..5d640af6ad 100644
--- a/engines/agos/script_ff.cpp
+++ b/engines/agos/script_ff.cpp
@@ -282,7 +282,7 @@ void AGOSEngine_Feeble::setupOpcodes() {
 		OPCODE(off_setPathValues),
 		OPCODE(off_stopClock),
 		OPCODE(off_restartClock),
-		OPCODE(off_setColour),
+		OPCODE(off_setColor),
 		/* 196 */
 		OPCODE(off_b3Set),
 		OPCODE(off_b3Clear),
@@ -638,8 +638,8 @@ void AGOSEngine_Feeble::off_restartClock() {
 	_clockStopped = 0;
 }
 
-void AGOSEngine_Feeble::off_setColour() {
-	// 195: set palette colour
+void AGOSEngine_Feeble::off_setColor() {
+	// 195: set palette color
 	uint16 c = getVarOrByte() * 4;
 	uint8 r = getVarOrByte();
 	uint8 g = getVarOrByte();
diff --git a/engines/agos/script_pp.cpp b/engines/agos/script_pp.cpp
index bded0f69dd..624a1bbeba 100644
--- a/engines/agos/script_pp.cpp
+++ b/engines/agos/script_pp.cpp
@@ -281,7 +281,7 @@ void AGOSEngine_PuzzlePack::setupOpcodes() {
 		OPCODE(opp_setPathValues),
 		OPCODE(off_restartClock),
 		OPCODE(opp_pauseClock),
-		OPCODE(off_setColour),
+		OPCODE(off_setColor),
 	};
 
 	_opcodesPuzzlePack = opcodes;
diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp
index e99f3bf701..d4567ad737 100644
--- a/engines/kyra/items_lol.cpp
+++ b/engines/kyra/items_lol.cpp
@@ -521,10 +521,10 @@ int LoLEngine::checkDrawObjectSpace(int itemX, int itemY, int partyX, int partyY
 	return a + b;
 }
 
-int LoLEngine::checkSceneForItems(uint16 *blockDrawObjects, int colour) {
+int LoLEngine::checkSceneForItems(uint16 *blockDrawObjects, int color) {
 	while (*blockDrawObjects) {
 		if (!(*blockDrawObjects & 0x8000)) {
-			if (!--colour)
+			if (!--color)
 				return *blockDrawObjects;
 		}
 
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index f2c93f83fc..d24f3b427f 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -1223,7 +1223,7 @@ private:
 
 	void assignItemToBlock(uint16 *assignedBlockObjects, int id);
 	int checkDrawObjectSpace(int itemX, int itemY, int partyX, int partyY);
-	int checkSceneForItems(uint16 *blockDrawObjects, int colour);
+	int checkSceneForItems(uint16 *blockDrawObjects, int color);
 
 	uint8 _moneyColumnHeight[5];
 	uint16 _credits;
diff --git a/engines/lastexpress/data/background.h b/engines/lastexpress/data/background.h
index fc1cc26fa4..5fbdbc13ed 100644
--- a/engines/lastexpress/data/background.h
+++ b/engines/lastexpress/data/background.h
@@ -34,14 +34,14 @@
 	    uint32 {4}   - position Y on screen
 	    uint32 {4}   - image width
 	    uint32 {4}   - image height
-	    uint32 {4}   - red colour channel data size
-	    uint32 {4}   - blue colour channel data size
-	    uint32 {4}   - green colour channel data size
+	    uint32 {4}   - red color channel data size
+	    uint32 {4}   - blue color channel data size
+	    uint32 {4}   - green color channel data size
 
 	data:
-	    byte {x}     - red colour channel data
-	    byte {x}     - blue colour channel data
-	    byte {x}     - green colour channel data
+	    byte {x}     - red color channel data
+	    byte {x}     - blue color channel data
+	    byte {x}     - green color channel data
 */
 
 #include "lastexpress/drawable.h"
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index 672af1e191..509547984a 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -1092,7 +1092,7 @@ void ScummEngine::updatePalette() {
 		else
 			data = _currentPalette + i * 3;
 
-		// Sam & Max film noir mode. Convert the colours to grayscale
+		// Sam & Max film noir mode. Convert the colors to grayscale
 		// before uploading them to the backend.
 
 		if (noir_mode) {
diff --git a/engines/sword25/gfx/graphicengine.h b/engines/sword25/gfx/graphicengine.h
index e1ae0d2d62..3f3e111f74 100644
--- a/engines/sword25/gfx/graphicengine.h
+++ b/engines/sword25/gfx/graphicengine.h
@@ -79,24 +79,24 @@ public:
 	// Enums
 	// -----
 
-	// Colour formats
+	// Color formats
 	//
 	/**
-	 * The colour format used by the engine
+	 * The color format used by the engine
 	 */
 	enum COLOR_FORMATS {
-		/// Undefined/unknown colour format
+		/// Undefined/unknown color format
 		CF_UNKNOWN = 0,
 		/**
-		 * 24-bit colour format (R8G8B8)
+		 * 24-bit color format (R8G8B8)
 		 */
 		CF_RGB24,
 		/**
-		 * 32-bit colour format (A8R8G8B8) (little endian)
+		 * 32-bit color format (A8R8G8B8) (little endian)
 		*/
 		CF_ARGB32,
 		/**
-		    32-bit colour format (A8B8G8R8) (little endian)
+		    32-bit color format (A8B8G8R8) (little endian)
 		*/
 		CF_ABGR32
 	};
@@ -149,7 +149,7 @@ public:
 	 * called for every frame.
 	* @param Start      The starting point of the line
 	* @param End        The ending point of the line
-	* @param Color      The colour of the line. The default is BS_RGB (255,255,255) (White)
+	* @param Color      The color of the line. The default is BS_RGB (255,255,255) (White)
 	*/
 	void drawDebugLine(const Vertex &start, const Vertex &end, uint color = BS_RGB(255, 255, 255));
 
@@ -168,7 +168,7 @@ public:
 	 * after a call to EndFrame(), and before the next call to StartFrame().
 	 * @param Width     Returns the width of the frame buffer
 	 * @param Height    Returns the height of the frame buffer
-	 * @param Data      Returns the raw data of the frame buffer as an array of 32-bit colour values.
+	 * @param Data      Returns the raw data of the frame buffer as an array of 32-bit color values.
 	*/
 	Graphics::Surface *getScreenshot();
 
@@ -256,12 +256,12 @@ public:
 	}
 
 	/**
-	 * Fills a rectangular area of the frame buffer with a colour.
-	 * Notes: It is possible to create transparent rectangles by passing a colour with an Alpha value of 255.
+	 * Fills a rectangular area of the frame buffer with a color.
+	 * Notes: It is possible to create transparent rectangles by passing a color with an Alpha value of 255.
 	 * @param FillRectPtr   Pointer to a Common::Rect, which specifies the section of the frame buffer to be filled.
 	 * If the rectangle falls partly off-screen, then it is automatically trimmed.
 	 * If a NULL value is passed, then the entire image is to be filled.
-	 * @param Color         The 32-bit colour with which the area is to be filled. The default is BS_RGB(0, 0, 0) (black)
+	 * @param Color         The 32-bit color with which the area is to be filled. The default is BS_RGB(0, 0, 0) (black)
 	 * @note FIf the rectangle is not completely inside the screen, it is automatically clipped.
 	 */
 	bool fill(const Common::Rect *fillRectPtr = 0, uint color = BS_RGB(0, 0, 0));
@@ -287,9 +287,9 @@ public:
 	// Access methods
 
 	/**
-	 * Returns the size of a pixel entry in bytes for a particular colour format
-	 * @param ColorFormat   The desired colour format. The parameter must be of type COLOR_FORMATS
-	 * @return              Returns the size of a pixel in bytes. If the colour format is unknown, -1 is returned.
+	 * Returns the size of a pixel entry in bytes for a particular color format
+	 * @param ColorFormat   The desired color format. The parameter must be of type COLOR_FORMATS
+	 * @return              Returns the size of a pixel in bytes. If the color format is unknown, -1 is returned.
 	 */
 	static int getPixelSize(GraphicEngine::COLOR_FORMATS colorFormat) {
 		switch (colorFormat) {
@@ -301,10 +301,10 @@ public:
 	}
 
 	/**
-	 * Calculates the length of an image line in bytes, depending on a given colour format.
-	 * @param ColorFormat   The colour format
+	 * Calculates the length of an image line in bytes, depending on a given color format.
+	 * @param ColorFormat   The color format
 	 * @param Width         The width of the line in pixels
-	 * @return              Reflects the length of the line in bytes. If the colour format is
+	 * @return              Reflects the length of the line in bytes. If the color format is
 	 * unknown, -1 is returned
 	 */
 	static int calcPitch(GraphicEngine::COLOR_FORMATS colorFormat, int width) {
diff --git a/engines/sword25/gfx/screenshot.cpp b/engines/sword25/gfx/screenshot.cpp
index 88417b72c5..3dc88237f9 100644
--- a/engines/sword25/gfx/screenshot.cpp
+++ b/engines/sword25/gfx/screenshot.cpp
@@ -97,7 +97,7 @@ bool Screenshot::saveToFile(Graphics::Surface *data, Common::WriteStream *stream
 	             data->w,                        // Width
 	             data->h,                        // Height
 	             8,                              // Bits depth
-	             PNG_COLOR_TYPE_RGB,             // Colour type
+	             PNG_COLOR_TYPE_RGB,             // Color type
 	             PNG_INTERLACE_NONE,             // No interlacing
 	             PNG_COMPRESSION_TYPE_DEFAULT,   // Compression type
 	             PNG_FILTER_TYPE_DEFAULT);       // Filter Type