cpp/openttd-patchpack/source Changeset - r8791:d98294fc6855

Changeset - r8791:d98294fc6855

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

skidd13 - 16 years ago 2008-03-31 15:10:24
skidd13@openttd.org

(svn r12513) -Codechange: rename OriginalTileRandomiser something more descriptive

3 files changed with 18 insertions and 12 deletions:

src/newgrf_house.cpp

src/town.h

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/newgrf_house.cpp

➞

Show inline comments

@@ @@ -216,7 +216,7 @@ static uint32 HouseGetVariable(const Res @@
 	switch (variable) {
 		/* Construction stage. */
-		case 0x40: return (IsTileType(tile, MP_HOUSE) ? GetHouseBuildingStage(tile) : 0) | OriginalTileRandomiser(TileX(tile), TileY(tile)) << 2;
+		case 0x40: return (IsTileType(tile, MP_HOUSE) ? GetHouseBuildingStage(tile) : 0) | TileHash2Bit(TileX(tile), TileY(tile)) << 2;
 		/* Building age. */
 		case 0x41: return Clamp(_cur_year - GetHouseConstructionYear(tile), 0, 0xFF);
@@ @@ -340,7 +340,7 @@ void DrawTileLayout(const TileInfo *ti, @@
 						pal = HasBit(callback, 14) ? GB(callback, 0, 8) + SPR_2CCMAP_BASE : callback;
+					}
 				} else {
-					pal = hs->random_colour[OriginalTileRandomiser(ti->x, ti->y)] + PALETTE_RECOLOR_START;
+					pal = hs->random_colour[TileHash2Bit(ti->x, ti->y)] + PALETTE_RECOLOR_START;
+				}
+			}
 		} else {

src/town.h

➞

Show inline comments

@@ @@ -314,7 +314,7 @@ extern const Town **_town_sort; @@
 extern Town *_cleared_town;
 extern int _cleared_town_rating;
-uint OriginalTileRandomiser(uint x, uint y);
+uint TileHash2Bit(uint x, uint y);
 void ResetHouses();
 void ClearTownHouse(Town *t, TileIndex tile);

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -129,15 +129,21 @@ static TownDrawTileProc * const _town_dr @@
 	TownDrawHouseLift
 };
 uint OriginalTileRandomiser(uint x, uint y)
 /**
  * Calculate a hash value from a tile position
+ *
  * @param x The X coordinate
  * @param y The Y coordinate
  * @return The hash of the tile
  */
 uint TileHash2Bit(uint x, uint y)
+{
 	uint variant;
 	variant  = x >> 4;
 	variant ^= x >> 6;
 	variant ^= y >> 4;
 	variant -= y >> 6;
 	variant &= 3;
 	return variant;
 	uint hash = x >> 4;
 	hash ^= x >> 6;
 	hash ^= y >> 4;
 	hash -= y >> 6;
 	hash &= 3;
 	return hash;
+}
 /**
@@ @@ -175,7 +181,7 @@ static void DrawTile_Town(TileInfo *ti) @@
+	}
 	/* Retrieve pointer to the draw town tile struct */
-	dcts = &_town_draw_tile_data[house_id << 4 | OriginalTileRandomiser(ti->x, ti->y) << 2 | GetHouseBuildingStage(ti->tile)];
+	dcts = &_town_draw_tile_data[house_id << 4 | TileHash2Bit(ti->x, ti->y) << 2 | GetHouseBuildingStage(ti->tile)];
 	if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, FOUNDATION_LEVELED);

0 comments (0 inline, 0 general)