cpp/openttd-patchpack/source Changeset - r21054:4d49b7f1aef2

Changeset - r21054:4d49b7f1aef2

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 11 years ago 2013-11-28 19:37:24
rubidium@openttd.org

(svn r26134) -Fix [FS#5820]: aircraft crashing near the map's border due to a lack of airports could trigger an assertion in most builds

1 file changed with 1 insertions and 1 deletions:

src/aircraft_cmd.cpp

0 comments (0 inline, 0 general)

src/aircraft_cmd.cpp

➞

Show inline comments

@@ @@ -1023,25 +1023,25 @@ static bool AircraftController(Aircraft @@
 /**
  * Handle crashed aircraft \a v.
  * @param v Crashed aircraft.
  */
 static bool HandleCrashedAircraft(Aircraft *v)
+{
 	v->crashed_counter += 3;
 	Station *st = GetTargetAirportIfValid(v);
 	/* make aircraft crash down to the ground */
 	if (v->crashed_counter < 500 && st == NULL && ((v->crashed_counter % 3) == 0) ) {
 		int z = GetSlopePixelZ(v->x_pos, v->y_pos);
+		int z = GetSlopePixelZ(Clamp(v->x_pos, 0, MapMaxX() * TILE_SIZE), Clamp(v->y_pos, 0, MapMaxY() * TILE_SIZE));
 		v->z_pos -= 1;
 		if (v->z_pos == z) {
 			v->crashed_counter = 500;
 			v->z_pos++;
+		}
+	}
 	if (v->crashed_counter < 650) {
 		uint32 r;
 		if (Chance16R(1, 32, r)) {
 			static const DirDiff delta[] = {
 				DIRDIFF_45LEFT, DIRDIFF_SAME, DIRDIFF_SAME, DIRDIFF_45RIGHT

0 comments (0 inline, 0 general)