Mercurial > hg > openttd

changeset 6813:59760e77086b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r10052) -Codechange: Support reserve/activate stage bits of action 7/9 variable 84.
author peter1138 <peter1138@openttd.org>
date Thu, 07 Jun 2007 07:20:44 +0000
parents 32e4fae77a35
children 4cc8ebb6279d
files src/newgrf.cpp
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -2987,8 +2987,14 @@
 		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) {