[Scummvm-cvs-logs] scummvm master -> 05a2f776a30b33cfcbdf16d5944abc9d4c208ab1

[Strangerke]

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:
05a2f776a3 HOPKINS: Rename colour into color


Commit: 05a2f776a30b33cfcbdf16d5944abc9d4c208ab1
    https://github.com/scummvm/scummvm/commit/05a2f776a30b33cfcbdf16d5944abc9d4c208ab1
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-19T14:01:03-07:00

Commit Message:
HOPKINS: Rename colour into color

Changed paths:
    engines/hopkins/globals.h
    engines/hopkins/graphics.cpp
    engines/hopkins/graphics.h
    engines/hopkins/hopkins.cpp
    engines/hopkins/hopkins.h



diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index 55341e2..c0b7130 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -194,7 +194,7 @@ struct Savegame {
 
 struct CreditItem {
 	bool _actvFl;
-	int _colour;
+	int _color;
 	int _linePosY;
 	int _lineSize;
 	byte _line[50];
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index c81e20b..870599d 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -1703,7 +1703,7 @@ void GraphicsManager::Copy_Mem(const byte *srcSurface, int x1, int y1, uint16 wi
 }
 
 // Display Font
-void GraphicsManager::displayFont(byte *surface, const byte *spriteData, int xp, int yp, int characterIndex, int colour) {
+void GraphicsManager::displayFont(byte *surface, const byte *spriteData, int xp, int yp, int characterIndex, int color) {
 	const byte *spriteDataP = spriteData + 3;
 	for (int i = characterIndex; i; --i)
 		spriteDataP += READ_LE_UINT32(spriteDataP) + 16;
@@ -1726,7 +1726,7 @@ void GraphicsManager::displayFont(byte *surface, const byte *spriteData, int xp,
 			byte destByte = *spritePixelsP;
 			if (*spritePixelsP) {
 				if (destByte == 252)
-					destByte = colour;
+					destByte = color;
 				*destP = destByte;
 			}
 
diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
index 6abc261..14e4223 100644
--- a/engines/hopkins/graphics.h
+++ b/engines/hopkins/graphics.h
@@ -151,7 +151,7 @@ public:
 	void copyVideoVbe16a(const byte *srcData);
 	void copySurfaceRect(const byte *srcSurface, byte *destSurface, int xs, int ys, int width, int height);
 	void restoreSurfaceRect(byte *destSurface, const byte *src, int xp, int yp, int width, int height);
-	void displayFont(byte *surface, const byte *spriteData, int xp, int yp, int characterIndex, int colour);
+	void displayFont(byte *surface, const byte *spriteData, int xp, int yp, int characterIndex, int color);
 	void drawHorizontalLine(byte *surface, int xp, int yp, uint16 width, byte col);
 	void drawVerticalLine(byte *surface, int xp, int yp, int height, byte col);
 	void initColorTable(int minIndex, int maxIndex, byte *palette);
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 628c8eb..3108736 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -2297,7 +2297,7 @@ int HopkinsEngine::handleBaseMap() {
 	// Load the map image
 	loadBaseMap();
 
-	// Set needed colours
+	// Set needed colors
 	_graphicsManager.SETCOLOR3(252, 100, 100, 100);
 	_graphicsManager.SETCOLOR3(253, 100, 100, 100);
 	_graphicsManager.SETCOLOR3(251, 100, 100, 100);
@@ -2405,7 +2405,7 @@ void HopkinsEngine::loadCredits() {
 				loopCond = true;
 				break;
 			}
-			_globals._creditsItem[idxLines]._colour = curPtr[1];
+			_globals._creditsItem[idxLines]._color = curPtr[1];
 			_globals._creditsItem[idxLines]._actvFl = true;
 			_globals._creditsItem[idxLines]._linePosY = _globals._creditsPosY + idxLines * _globals._creditsStep;
 
@@ -2429,7 +2429,7 @@ void HopkinsEngine::loadCredits() {
 	_globals.freeMemory(bufPtr);
 }
 
-void HopkinsEngine::displayCredits(int startPosY, byte *buffer, char colour) {
+void HopkinsEngine::displayCredits(int startPosY, byte *buffer, char color) {
 	byte *bufPtr = buffer;
 	int strWidth = 0;
 	byte curChar;
@@ -2464,7 +2464,7 @@ void HopkinsEngine::displayCredits(int startPosY, byte *buffer, char colour) {
 		if (!curChar)
 			break;
 		if (curChar > 31) {
-			_graphicsManager.displayFont(_graphicsManager._vesaBuffer, _fontManager._font, startPosX, startPosY, curChar - 32, colour);
+			_graphicsManager.displayFont(_graphicsManager._vesaBuffer, _fontManager._font, startPosX, startPosY, curChar - 32, color);
 			startPosX += _objectsManager.getWidth(_fontManager._font, curChar - 32);
 		}
 	}
@@ -2488,7 +2488,7 @@ void HopkinsEngine::displayCredits() {
 
 				if ((nextY - 21  >= 0) && (nextY - 21 <= 418)) {
 					int col = 0;
-					switch (_globals._creditsItem[i]._colour) {
+					switch (_globals._creditsItem[i]._color) {
 					case '1':
 						col = 163;
 						break;
@@ -2499,7 +2499,7 @@ void HopkinsEngine::displayCredits() {
 						col = 162;
 						break;
 					default:
-						warning("Unknown colour, default to col #1");
+						warning("Unknown color, default to col #1");
 						col = 163;
 						break;
 					}
diff --git a/engines/hopkins/hopkins.h b/engines/hopkins/hopkins.h
index 3b1a18c..b4385f0 100644
--- a/engines/hopkins/hopkins.h
+++ b/engines/hopkins/hopkins.h
@@ -124,7 +124,7 @@ private:
 	void setSubmarineSprites();
 	void handleOceanMaze(int16 curExitId, Common::String backgroundFilename, Directions defaultDirection, int16 exit1, int16 exit2, int16 exit3, int16 exit4, int16 soundId);
 	void loadCredits();
-	void displayCredits(int startPosY, byte *buffer, char colour);
+	void displayCredits(int startPosY, byte *buffer, char color);
 	void displayCredits();
 	void handleNotAvailable(int sortie);