cpp/openttd-patchpack/source Changeset - r9505:cc20600406b0

Changeset - r9505:cc20600406b0

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 16 years ago 2008-06-12 14:41:29
rubidium@openttd.org

(svn r13489) -Fix: first determine where to *exactly* build a house before asking a NewGRF whether the location is good instead of possibly moving the house a tile after the NewGRF said the location is good.

1 file changed with 6 insertions and 6 deletions:

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -1929,11 +1929,6 @@ static bool BuildTownHouse(Town *t, Tile @@
+			}
 			if ((hs->extra_flags & BUILDING_IS_HISTORICAL) && !_generating_world) continue;
 			if (HasBit(hs->callback_mask, CBM_HOUSE_ALLOW_CONSTRUCTION)) {
 				uint16 callback_res = GetHouseCallback(CBID_HOUSE_ALLOW_CONSTRUCTION, 0, 0, house, t, tile);
 				if (callback_res != CALLBACK_FAILED && GB(callback_res, 0, 8) == 0) continue;
+			}
+		}
 		if (_cur_year < hs->min_year || _cur_year > hs->max_year) continue;
@@ @@ -1947,7 +1942,7 @@ static bool BuildTownHouse(Town *t, Tile @@
 			SetBit(oneof, TOWN_HAS_STADIUM);
+		}
-		if (HASBITS(t->flags12 , oneof)) continue;
 		if (HASBITS(t->flags12, oneof)) continue;
 		/* Make sure there is no slope? */
 		bool noslope = (hs->building_flags & TILE_NOT_SLOPED) != 0;
@@ @@ -1963,6 +1958,11 @@ static bool BuildTownHouse(Town *t, Tile @@
 			/* 1x1 house checks are already done */
+		}
 		if (HasBit(hs->callback_mask, CBM_HOUSE_ALLOW_CONSTRUCTION)) {
 			uint16 callback_res = GetHouseCallback(CBID_HOUSE_ALLOW_CONSTRUCTION, 0, 0, house, t, tile);
 			if (callback_res != CALLBACK_FAILED && GB(callback_res, 0, 8) == 0) continue;
+		}
 		/* build the house */
 		t->num_houses++;
 		IncreaseBuildingCount(t, house);

0 comments (0 inline, 0 general)