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

(svn r21800) -Fix [FS#3569]: under certain circumstances one could crash a competitor's train; take the lazy non-future proof version of the fix from the 1.0 branch as fixing the real bug is significantly more complex and might even break some backwards compatability if not done perfectly

Browse Source
This commit is contained in:
rubidium 2011-01-15 09:53:21 +00:00
parent 8c421116d9
commit c4b5a322e7
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/train_cmd.cpp
View File

@ -2813,6 +2813,9 @@ static Vehicle *FindTrainCollideEnum(Vehicle *v, void *data)
/* not a train or in depot */ /* not a train or in depot */
if (v->type != VEH_TRAIN || Train::From(v)->track == TRACK_BIT_DEPOT) return NULL; if (v->type != VEH_TRAIN || Train::From(v)->track == TRACK_BIT_DEPOT) return NULL;
/* do not crash into trains of another company. */
if (v->owner != tcc->v->owner) return NULL;
/* get first vehicle now to make most usual checks faster */ /* get first vehicle now to make most usual checks faster */
Train *coll = Train::From(v)->First(); Train *coll = Train::From(v)->First();