ALL: colour -> color

9 files changed, 38 insertions, 38 deletions

diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp
index 78884e96dc..08184adcdb 100644
--- a/engines/sky/compact.cpp
+++ b/engines/sky/compact.cpp
@@ -85,7 +85,7 @@ static const uint32 compactOffsets[] = {
 	MK16(Compact, alt),
 	MK16(Compact, request),
 	MK16(Compact, spWidth_xx),
-	MK16(Compact, spColour),
+	MK16(Compact, spColor),
 	MK16(Compact, spTextId),
 	MK16(Compact, spTime),
 	MK16(Compact, arAnimIndex),
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index 55ba6039c3..8a5409a488 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -1275,7 +1275,7 @@ void Control::importOldCompact(Compact* destCpt, uint8 **srcPos, uint16 numElems
 		LODSW(*srcPos, destCpt->alt);
 		LODSW(*srcPos, destCpt->request);
 		LODSW(*srcPos, destCpt->spWidth_xx);
-		LODSW(*srcPos, destCpt->spColour);
+		LODSW(*srcPos, destCpt->spColor);
 		LODSW(*srcPos, destCpt->spTextId);
 		LODSW(*srcPos, destCpt->spTime);
 		LODSW(*srcPos, destCpt->arAnimIndex);
diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp
index 1c1e2c9682..b52e908455 100644
--- a/engines/sky/logic.cpp
+++ b/engines/sky/logic.cpp
@@ -1823,7 +1823,7 @@ bool Logic::fnHighlight(uint32 itemNo, uint32 pen, uint32 c) {
 	pen += 241;
 	Compact *textCompact = _skyCompact->fetchCpt(itemNo);
 	uint8 *sprData = (uint8 *)SkyEngine::fetchItem(textCompact->flag);
-	_skyText->changeTextSpriteColour(sprData, (uint8)pen);
+	_skyText->changeTextSpriteColor(sprData, (uint8)pen);
 	return true;
 }
 
@@ -2547,7 +2547,7 @@ void Logic::stdSpeak(Compact *target, uint32 textNum, uint32 animNum, uint32 bas
 		// form the text sprite, if player wants subtitles or
 		// if we couldn't find the speech file
 		DisplayedText textInfo;
-		textInfo = _skyText->lowTextManager(textNum, FIXED_TEXT_WIDTH, 0, (uint8)target->spColour, true);
+		textInfo = _skyText->lowTextManager(textNum, FIXED_TEXT_WIDTH, 0, (uint8)target->spColor, true);
 		Compact *textCompact = _skyCompact->fetchCpt(textInfo.compactNum);
 		target->spTextId = textInfo.compactNum;	//So we know what text to kill
 		byte *textGfx = textInfo.textData;
diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp
index a77017de38..1b815b9c38 100644
--- a/engines/sky/screen.cpp
+++ b/engines/sky/screen.cpp
@@ -38,7 +38,7 @@
 
 namespace Sky {
 
-uint8 Screen::_top16Colours[16*3] = {
+uint8 Screen::_top16Colors[16*3] = {
 	0, 0, 0,
 	38, 38, 38,
 	63, 63, 63,
@@ -63,7 +63,7 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk, SkyCompact *skyCompact) {
 	_skyCompact = skyCompact;
 
 	int i;
-	uint8 tmpPal[VGA_COLOURS * 3];
+	uint8 tmpPal[VGA_COLORS * 3];
 
 	_gameGrid = (uint8 *)malloc(GRID_X * GRID_Y * 2);
 	forceRefresh();
@@ -72,17 +72,17 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk, SkyCompact *skyCompact) {
 	_scrollScreen = NULL;
 
 	//blank the first 240 colors of the palette
-	memset(tmpPal, 0, GAME_COLOURS * 3);
+	memset(tmpPal, 0, GAME_COLORS * 3);
 
 	//set the remaining colors
-	for (i = 0; i < (VGA_COLOURS-GAME_COLOURS); i++) {
-		tmpPal[3 * GAME_COLOURS + i * 3 + 0] = (_top16Colours[i * 3 + 0] << 2) + (_top16Colours[i * 3 + 0] >> 4);
-		tmpPal[3 * GAME_COLOURS + i * 3 + 1] = (_top16Colours[i * 3 + 1] << 2) + (_top16Colours[i * 3 + 1] >> 4);
-		tmpPal[3 * GAME_COLOURS + i * 3 + 2] = (_top16Colours[i * 3 + 2] << 2) + (_top16Colours[i * 3 + 2] >> 4);
+	for (i = 0; i < (VGA_COLORS-GAME_COLORS); i++) {
+		tmpPal[3 * GAME_COLORS + i * 3 + 0] = (_top16Colors[i * 3 + 0] << 2) + (_top16Colors[i * 3 + 0] >> 4);
+		tmpPal[3 * GAME_COLORS + i * 3 + 1] = (_top16Colors[i * 3 + 1] << 2) + (_top16Colors[i * 3 + 1] >> 4);
+		tmpPal[3 * GAME_COLORS + i * 3 + 2] = (_top16Colors[i * 3 + 2] << 2) + (_top16Colors[i * 3 + 2] >> 4);
 	}
 
 	//set the palette
-	_system->getPaletteManager()->setPalette(tmpPal, 0, VGA_COLOURS);
+	_system->getPaletteManager()->setPalette(tmpPal, 0, VGA_COLORS);
 	_currentPalette = 0;
 
 	_seqInfo.nextFrame = _seqInfo.framesLeft = 0;
@@ -109,32 +109,32 @@ void Screen::setFocusRectangle(const Common::Rect& rect) {
 //set a new palette, pal is a pointer to dos vga rgb components 0..63
 void Screen::setPalette(uint8 *pal) {
 	convertPalette(pal, _palette);
-	_system->getPaletteManager()->setPalette(_palette, 0, GAME_COLOURS);
+	_system->getPaletteManager()->setPalette(_palette, 0, GAME_COLORS);
 	_system->updateScreen();
 }
 
 void Screen::setPaletteEndian(uint8 *pal) {
 #ifdef SCUMM_BIG_ENDIAN
-	uint8 endPalette[VGA_COLOURS * 3];
-	for (uint16 cnt = 0; cnt < VGA_COLOURS * 3; cnt++)
+	uint8 endPalette[VGA_COLORS * 3];
+	for (uint16 cnt = 0; cnt < VGA_COLORS * 3; cnt++)
 		endPalette[cnt] = pal[cnt ^ 1];
 	convertPalette(endPalette, _palette);
 #else
 	convertPalette(pal, _palette);
 #endif
-	_system->getPaletteManager()->setPalette(_palette, 0, GAME_COLOURS);
+	_system->getPaletteManager()->setPalette(_palette, 0, GAME_COLORS);
 	_system->updateScreen();
 }
 
 void Screen::halvePalette() {
-	uint8 halfPalette[VGA_COLOURS * 3];
+	uint8 halfPalette[VGA_COLORS * 3];
 
-	for (uint8 cnt = 0; cnt < GAME_COLOURS; cnt++) {
+	for (uint8 cnt = 0; cnt < GAME_COLORS; cnt++) {
 		halfPalette[cnt * 3 + 0] = _palette[cnt * 3 + 0] >> 1;
 		halfPalette[cnt * 3 + 1] = _palette[cnt * 3 + 1] >> 1;
 		halfPalette[cnt * 3 + 2] = _palette[cnt * 3 + 2] >> 1;
 	}
-	_system->getPaletteManager()->setPalette(halfPalette, 0, GAME_COLOURS);
+	_system->getPaletteManager()->setPalette(halfPalette, 0, GAME_COLORS);
 }
 
 void Screen::setPalette(uint16 fileNum) {
@@ -168,7 +168,7 @@ void Screen::showScreen(uint8 *pScreen) {
 void Screen::convertPalette(uint8 *inPal, uint8* outPal) {
 	int i;
 
-	for (i = 0; i < VGA_COLOURS; i++) {
+	for (i = 0; i < VGA_COLORS; i++) {
 		outPal[3 * i + 0] = (inPal[3 * i + 0] << 2) + (inPal[3 * i + 0] >> 4);
 		outPal[3 * i + 1] = (inPal[3 * i + 1] << 2) + (inPal[3 * i + 1] >> 4);
 		outPal[3 * i + 2] = (inPal[3 * i + 2] << 2) + (inPal[3 * i + 2] >> 4);
@@ -247,8 +247,8 @@ void Screen::fnFadeDown(uint32 scroll) {
 		uint32 delayTime = _system->getMillis();
 		for (uint8 cnt = 0; cnt < 32; cnt++) {
 			delayTime += 20;
-			palette_fadedown_helper(_palette, GAME_COLOURS);
-			_system->getPaletteManager()->setPalette(_palette, 0, GAME_COLOURS);
+			palette_fadedown_helper(_palette, GAME_COLORS);
+			_system->getPaletteManager()->setPalette(_palette, 0, GAME_COLORS);
 			_system->updateScreen();
 			int32 waitTime = (int32)delayTime - _system->getMillis();
 			if (waitTime < 0)
@@ -296,7 +296,7 @@ void Screen::paletteFadeUp(uint16 fileNr) {
 }
 
 void Screen::paletteFadeUp(uint8 *pal) {
-	byte tmpPal[VGA_COLOURS * 3];
+	byte tmpPal[VGA_COLORS * 3];
 
 	convertPalette(pal, tmpPal);
 
@@ -304,13 +304,13 @@ void Screen::paletteFadeUp(uint8 *pal) {
 	for (uint8 cnt = 1; cnt <= 32; cnt++) {
 		delayTime += 20;
 
-		for (uint8 colCnt = 0; colCnt < GAME_COLOURS; colCnt++) {
+		for (uint8 colCnt = 0; colCnt < GAME_COLORS; colCnt++) {
 			_palette[colCnt * 3 + 0] = (tmpPal[colCnt * 3 + 0] * cnt) >> 5;
 			_palette[colCnt * 3 + 1] = (tmpPal[colCnt * 3 + 1] * cnt) >> 5;
 			_palette[colCnt * 3 + 2] = (tmpPal[colCnt * 3 + 2] * cnt) >> 5;
 		}
 
-		_system->getPaletteManager()->setPalette(_palette, 0, GAME_COLOURS);
+		_system->getPaletteManager()->setPalette(_palette, 0, GAME_COLORS);
 		_system->updateScreen();
 
 		int32 waitTime = (int32)delayTime - _system->getMillis();
@@ -331,8 +331,8 @@ void Screen::fnFadeUp(uint32 palNum, uint32 scroll) {
 		if (palette == NULL)
 			error("Screen::fnFadeUp: can't fetch compact %X", palNum);
 #ifdef SCUMM_BIG_ENDIAN
-		byte tmpPal[VGA_COLOURS * 3];
-		for (uint16 cnt = 0; cnt < VGA_COLOURS * 3; cnt++)
+		byte tmpPal[VGA_COLORS * 3];
+		for (uint16 cnt = 0; cnt < VGA_COLORS * 3; cnt++)
 			tmpPal[cnt] = palette[cnt ^ 1];
 		paletteFadeUp(tmpPal);
 #else
diff --git a/engines/sky/screen.h b/engines/sky/screen.h
index 69a9a2fc8f..2c870ebd89 100644
--- a/engines/sky/screen.h
+++ b/engines/sky/screen.h
@@ -44,8 +44,8 @@ struct Compact;
 struct DataFileHeader;
 
 #define SCROLL_JUMP		16
-#define VGA_COLOURS		256
-#define GAME_COLOURS		240
+#define VGA_COLORS		256
+#define GAME_COLORS		240
 
 #define FORE 1
 #define BACK 0
@@ -100,8 +100,8 @@ private:
 	OSystem *_system;
 	Disk *_skyDisk;
 	SkyCompact *_skyCompact;
-	static uint8 _top16Colours[16 * 3];
-	uint8 _palette[VGA_COLOURS * 3];
+	static uint8 _top16Colors[16 * 3];
+	uint8 _palette[VGA_COLORS * 3];
 	uint32 _currentPalette;
 	uint8 _seqGrid[20 * 12];
 
diff --git a/engines/sky/skydefs.h b/engines/sky/skydefs.h
index f68c0f826b..e3f3f3101f 100644
--- a/engines/sky/skydefs.h
+++ b/engines/sky/skydefs.h
@@ -92,7 +92,7 @@ namespace Sky {
 #define C_BASE_MODE	0
 #define C_BASE_MODE56	56
 #define C_ACTION_MODE	4
-#define C_SP_COLOUR	90
+#define C_SP_COLOR	90
 #define C_MEGA_SET	112
 #define C_GRID_WIDTH	114
 #define C_ANIM_UP	122
@@ -141,7 +141,7 @@ namespace Sky {
 #define L_WAIT_SYNC	15
 #define L_SIMPLE_MOD	16
 
-// characters with own colour set
+// characters with own color set
 #define SP_COL_FOSTER 194
 #define SP_COL_JOEY 216
 #define SP_COL_JOBS 209
diff --git a/engines/sky/struc.h b/engines/sky/struc.h
index 295e31d9b0..987f074ed1 100644
--- a/engines/sky/struc.h
+++ b/engines/sky/struc.h
@@ -37,9 +37,9 @@ struct DisplayedText {
 #include "common/pack-start.h"	// START STRUCT PACKING
 
 struct DataFileHeader {
-	uint16 flag; // bit 0: set for colour data, clear for not
+	uint16 flag; // bit 0: set for color data, clear for not
 	// bit 1: set for compressed, clear for uncompressed
-	// bit 2: set for 32 colours, clear for 16 colours
+	// bit 2: set for 32 colors, clear for 16 colors
 	uint16 s_x;
 	uint16 s_y;
 	uint16 s_width;
@@ -139,7 +139,7 @@ struct Compact {
 	uint16 request;		 // 42
 
 	uint16 spWidth_xx;	 // 43
-	uint16 spColour;	 // 44
+	uint16 spColor;	 // 44
 	uint16 spTextId;	 // 45
 	uint16 spTime;		 // 46
 
diff --git a/engines/sky/text.cpp b/engines/sky/text.cpp
index 73c376dbbe..7abece594a 100644
--- a/engines/sky/text.cpp
+++ b/engines/sky/text.cpp
@@ -405,7 +405,7 @@ DisplayedText Text::lowTextManager(uint32 textNum, uint16 width, uint16 logicNum
 	return textInfo;
 }
 
-void Text::changeTextSpriteColour(uint8 *sprData, uint8 newCol) {
+void Text::changeTextSpriteColor(uint8 *sprData, uint8 newCol) {
 	DataFileHeader *header = (DataFileHeader *)sprData;
 	sprData += sizeof(DataFileHeader);
 	for (uint16 cnt = 0; cnt < header->s_sp_size; cnt++)
diff --git a/engines/sky/text.h b/engines/sky/text.h
index 890cfb2e47..c48d92d24b 100644
--- a/engines/sky/text.h
+++ b/engines/sky/text.h
@@ -59,7 +59,7 @@ public:
 	void fnTextModule(uint32 textInfoId, uint32 textNo);
 	void fnPointerText(uint32 pointedId, uint16 mouseX, uint16 mouseY);
 	void logicCursor(Compact *textCompact, uint16 mouseX, uint16 mouseY);
-	void changeTextSpriteColour(uint8 *sprData, uint8 newCol);
+	void changeTextSpriteColor(uint8 *sprData, uint8 newCol);
 	uint32 giveCurrentCharSet();
 
 	uint32 _numLetters;	//no of chars in message