cpp/openttd-patchpack/source Changeset - r8287:4e7894cd880d

Changeset - r8287:4e7894cd880d

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

belugas - 16 years ago 2008-01-14 18:19:29
belugas@openttd.org

(svn r11851) -Codechange: A few magic numbers removal, plus a little code style

2 files changed with 8 insertions and 8 deletions:

src/newgrf_callbacks.h

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/newgrf_callbacks.h

➞

Show inline comments

@@ @@ -297,10 +297,11 @@ enum IndustryTileCallbackMask { @@
 };
 /**
- * Result of a failed callback.
+ * Different values for Callback result evaluations
  */
 enum {
 	CALLBACK_FAILED = 0xFFFF
 	CALLBACK_FAILED              = 0xFFFF,  ///< Result of a failed callback.
 	CALLBACK_HOUSEPRODCARGO_END  = 0x20FF,  ///< Sentinel indicating that the loop for CBID_HOUSE_PRODUCE_CARGO has ended
 };
 #endif /* NEWGRF_CALLBACKS_H */

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -435,8 +435,7 @@ static void TileLoop_Town(TileIndex tile @@
 		for (uint i = 0; i < 256; i++) {
 			uint16 callback = GetHouseCallback(CBID_HOUSE_PRODUCE_CARGO, i, r, house_id, t, tile);
 			if (callback == CALLBACK_FAILED) break;
 			if (callback == 0x20FF) break;
 			if (callback == CALLBACK_FAILED || callback == CALLBACK_HOUSEPRODCARGO_END) break;
 			CargoID cargo = GetCargoTranslation(GB(callback, 8, 7), hs->grffile);
 			if (cargo == CT_INVALID) continue;
@@ @@ -1604,9 +1603,9 @@ static bool CheckBuildHouseMode(TileInde @@
 	int b;
 	Slope slope;
 	static const byte _masks[8] = {
 xC,0x3,0x9,0x6,
 x3,0xC,0x6,0x9,
 	static const Slope _masks[8] = {
 		SLOPE_NE,  SLOPE_SW,  SLOPE_NW,  SLOPE_SE,
 		SLOPE_SW,  SLOPE_NE,  SLOPE_SE,  SLOPE_NW,
 	};
 	slope = GetTileSlope(tile, NULL);
@@ @@ -1616,7 +1615,7 @@ static bool CheckBuildHouseMode(TileInde @@
 	b = 0;
 	if ((slope != SLOPE_FLAT && ~slope & _masks[mode])) b = ~b;
 	if ((tileh != SLOPE_FLAT && ~tileh & _masks[mode+4])) b = ~b;
+	if ((tileh != SLOPE_FLAT && ~tileh & _masks[mode + 4])) b = ~b;
 	if (b)
 		return false;

0 comments (0 inline, 0 general)