From 07c20252c3614e6758943817811277e8e6e7c95b Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sat, 23 Aug 2008 20:16:54 +0000
Subject: (svn r14146) -Codechange: allow palette override in both ways and
 remove some unneeded '(x == 0) ? 0 : 1' constructs.

---
 src/newgrf.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/newgrf.cpp')

diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 726ab01d8..44892df0b 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -323,7 +323,7 @@ StringID MapGRFStringID(uint32 grfid, StringID str)
 
 static uint8 MapDOSColour(uint8 colour)
 {
-	if (_use_dos_palette) return colour;
+	if (_use_palette == PAL_DOS) return colour;
 
 	if (colour < 10) {
 		static uint8 dos_to_win_colour_map[] = { 0, 215, 216, 136, 88, 106, 32, 33, 40, 245 };
@@ -3634,7 +3634,7 @@ bool GetGlobalVariable(byte param, uint32 *value)
 		}
 
 		case 0x0D: // TTD Version, 00=DOS, 01=Windows
-			*value = !_use_dos_palette;
+			*value = _use_palette;
 			return true;
 
 		case 0x0E: // Y-offset for train sprites
-- 
cgit v1.2.3-54-g00ecf