Mercurial > hg > openttd

changeset 11585:a5688eed8d7a draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r15956) -Codechange: Enumorize station spec flags.
author peter1138 <peter1138@openttd.org>
date Sun, 05 Apr 2009 08:01:36 +0000
parents 585522fd048e
children 97ba565c6123
files src/newgrf_station.cpp src/newgrf_station.h
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf_station.cpp
+++ b/src/newgrf_station.cpp
@@ -558,7 +558,7 @@
 			break;
 	}
 
-	if (HasBit(statspec->flags, 1)) cargo /= (st->trainst_w + st->trainst_h);
+	if (HasBit(statspec->flags, SSF_DIV_BY_STATION_SIZE)) cargo /= (st->trainst_w + st->trainst_h);
 	cargo = min(0xfff, cargo);
 
 	if (cargo > statspec->cargo_threshold) {
@@ -904,7 +904,7 @@
 	bool frame_set_by_callback = false;
 
 	if (HasBit(ss->callbackmask, CBM_STATION_ANIMATION_NEXT_FRAME)) {
-		uint32 param = HasBit(ss->flags, 2) ? Random() : 0;
+		uint32 param = HasBit(ss->flags, SSF_CB141_RANDOM_BITS) ? Random() : 0;
 		uint16 callback = GetStationCallback(CBID_STATION_ANIM_NEXT_FRAME, param, 0, ss, st, tile);
 
 		if (callback != CALLBACK_FAILED) {
--- a/src/newgrf_station.h
+++ b/src/newgrf_station.h
@@ -29,6 +29,14 @@
 /** Allow incrementing of StationClassID variables */
 DECLARE_POSTFIX_INCREMENT(StationClassID);
 
+enum StationSpecFlags {
+	SSF_SEPARATE_GROUND,      ///< Use different sprite set for ground sprites.
+	SSF_DIV_BY_STATION_SIZE,  ///< Divide cargo amount by station size.
+	SSF_CB141_RANDOM_BITS,    ///< Callback 141 needs random bits.
+	SSF_CUSTOM_FOUNDATIONS,   ///< Draw custom foundations.
+	SSF_EXTENDED_FOUNDATIONS, ///< Extended foundation block instead of simple.
+};
+
 /* Station layout for given dimensions - it is a two-dimensional array
  * where index is computed as (x * platforms) + platform. */
 typedef byte *StationLayout;