Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r14521) -Fix [FS#2378]: fast trains could continue to move after a crash

Browse Source
This commit is contained in:
glx 2008-10-22 23:06:36 +00:00
parent 428de2d302
commit f28957bcc4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/train_cmd.cpp
View File

@ -3572,10 +3572,10 @@ static Vehicle *FindTrainCollideEnum(Vehicle *v, void *data)
* Reports the incident in a flashy news item, modifies station ratings and * Reports the incident in a flashy news item, modifies station ratings and
* plays a sound. * plays a sound.
*/ */
static void CheckTrainCollision(Vehicle *v) static bool CheckTrainCollision(Vehicle *v)
{ {
/* can't collide in depot */ /* can't collide in depot */
if (v->u.rail.track == TRACK_BIT_DEPOT) return; if (v->u.rail.track == TRACK_BIT_DEPOT) return false;
assert(v->u.rail.track == TRACK_BIT_WORMHOLE || TileVirtXY(v->x_pos, v->y_pos) == v->tile); assert(v->u.rail.track == TRACK_BIT_WORMHOLE || TileVirtXY(v->x_pos, v->y_pos) == v->tile);
@ -3592,7 +3592,7 @@ static void CheckTrainCollision(Vehicle *v)
} }
/* any dead -> no crash */ /* any dead -> no crash */
if (tcc.num == 0) return; if (tcc.num == 0) return false;
SetDParam(0, tcc.num); SetDParam(0, tcc.num);
AddNewsItem(STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL, AddNewsItem(STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL,
@ -3603,6 +3603,7 @@ static void CheckTrainCollision(Vehicle *v)
ModifyStationRatingAround(v->tile, v->owner, -160, 30); ModifyStationRatingAround(v->tile, v->owner, -160, 30);
SndPlayVehicleFx(SND_13_BIG_CRASH, v); SndPlayVehicleFx(SND_13_BIG_CRASH, v);
return true;
} }
static Vehicle *CheckVehicleAtSignal(Vehicle *v, void *data) static Vehicle *CheckVehicleAtSignal(Vehicle *v, void *data)
@ -4332,7 +4333,8 @@ static void TrainLocoHandler(Vehicle *v, bool mode)
do { do {
j -= adv_spd; j -= adv_spd;
TrainController(v, NULL, true); TrainController(v, NULL, true);
CheckTrainCollision(v); /* Don't continue to move if the train crashed. */
if (CheckTrainCollision(v)) break;
/* 192 spd used for going straight, 256 for going diagonally. */ /* 192 spd used for going straight, 256 for going diagonally. */
adv_spd = (v->direction & 1) ? 192 : 256; adv_spd = (v->direction & 1) ? 192 : 256;
} while (j >= adv_spd); } while (j >= adv_spd);