diff src/viewport.cpp @ 11082:9ec1f7eac0a0 draft

(svn r15425) -Codechange: some color->colour changes and type safety.
author rubidium <rubidium@openttd.org>
date Mon, 09 Feb 2009 02:09:47 +0000
parents 19fd43d5975d
children 8da1855e9f14
line wrap: on
line diff
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1418,7 +1418,7 @@
 
 	const StringSpriteToDraw *ssend = sstdv->End();
 	for (const StringSpriteToDraw *ss = sstdv->Begin(); ss != ssend; ++ss) {
-		uint16 colour;
+		TextColour colour;
 
 		if (ss->width != 0) {
 			/* Do not draw signs nor station names if they are set invisible */
@@ -1453,7 +1453,7 @@
 		if (IsTransparencySet(TO_SIGNS) && ss->string != STR_2806 && ss->width != 0) {
 			/* Real colors need the IS_PALETTE_COLOR flag
 			 * otherwise colors from _string_colormap are assumed. */
-			colour = _colour_gradient[ss->color][6] | IS_PALETTE_COLOR;
+			colour = (TextColour)_colour_gradient[ss->color][6] | IS_PALETTE_COLOR;
 		} else {
 			colour = TC_BLACK;
 		}