cpp/openttd-patchpack/source Changeset - r11108:1df88c46bf05

Changeset - r11108:1df88c46bf05

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 15 years ago 2009-02-11 20:41:17
rubidium@openttd.org

(svn r15454) -Fix [FS#2614]: towns did not know about build_on_slopes in some cases, or made decisions on the 'original' slope instead the slope after applying the foundation..

3 files changed with 5 insertions and 4 deletions:

src/road.cpp

src/road_cmd.cpp

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/road.cpp

➞

Show inline comments

@@ @@ -13,13 +13,14 @@ @@
 #include "engine_base.h"
 #include "date_func.h"
 #include "settings_type.h"
 #include "landscape.h"
 bool IsPossibleCrossing(const TileIndex tile, Axis ax)
+{
 	return (IsTileType(tile, MP_RAILWAY) &&
 		!HasSignals(tile) &&
 		GetTrackBits(tile) == (ax == AXIS_X ?  TRACK_BIT_Y : TRACK_BIT_X) &&
 		GetTileSlope(tile, NULL) == SLOPE_FLAT);
 		GetTrackBits(tile) == (ax == AXIS_X ? TRACK_BIT_Y : TRACK_BIT_X) &&
 		GetFoundationSlope(tile, NULL) == SLOPE_FLAT);
+}
 RoadBits CleanUpRoadBits(const TileIndex tile, RoadBits org_rb)

src/road_cmd.cpp

➞

Show inline comments

@@ @@ -1337,7 +1337,7 @@ static void TileLoop_Road(TileIndex tile @@
 			if (t->road_build_months != 0 &&
 					(DistanceManhattan(t->xy, tile) < 8 || grp != HZB_TOWN_EDGE) &&
 					IsNormalRoad(tile) && CountBits(GetAllRoadBits(tile)) > 1 ) {
-				if (GetTileSlope(tile, NULL) == SLOPE_FLAT && EnsureNoVehicleOnGround(tile) && Chance16(1, 40)) {
+				if (GetFoundationSlope(tile, NULL) == SLOPE_FLAT && EnsureNoVehicleOnGround(tile) && Chance16(1, 40)) {
 					StartRoadWorks(tile);
 					SndPlayTileFx(SND_21_JACKHAMMER, tile);

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -776,7 +776,7 @@ static bool IsRoadAllowedHere(Town *t, T @@
 				return false;
+		}
 		cur_slope = GetTileSlope(tile, NULL);
+		cur_slope = _settings_game.construction.build_on_slopes ? GetFoundationSlope(tile, NULL) : GetTileSlope(tile, NULL);
 		if (cur_slope == SLOPE_FLAT) {
 no_slope:
 			/* Tile has no slope */

0 comments (0 inline, 0 general)