From 2e9a4359f040b1956c62cf4d21c122bef9e1fa90 Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Thu, 7 Jun 2007 07:20:44 +0000
Subject: (svn r10052) -Codechange: Support reserve/activate stage bits of
 action 7/9 variable 84.

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

diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index c0071c206..a646b686d 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -2987,8 +2987,14 @@ static uint32 GetParamVal(byte param, uint32 *cond_val)
 		case 0x83: // current climate, 0=temp, 1=arctic, 2=trop, 3=toyland
 			return _opt.landscape;
 
-		case 0x84: // GRF loading stage
-			return (_cur_stage > GLS_INIT) | ((_cur_stage == GLS_ACTIVATION) << 9);
+		case 0x84: { // GRF loading stage
+			uint32 res = 0;
+
+			if (_cur_stage > GLS_INIT) SETBIT(res, 0);
+			if (_cur_stage == GLS_RESERVE) SETBIT(res, 8);
+			if (_cur_stage == GLS_ACTIVATION) SETBIT(res, 9);
+			return res;
+		}
 
 		case 0x85: // TTDPatch flags, only for bit tests
 			if (cond_val == NULL) {
-- 
cgit v1.2.3-70-g09d2