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 r26126) -Cleanup: remove unneeded check for NULL

Browse Source
This commit is contained in:
rubidium 2013-11-26 14:52:28 +00:00
parent 59ca31b442
commit 14f5d55f6c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/train_cmd.cpp
View File

@ -1219,8 +1219,10 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
Train *original_src_head = src_head;
Train *original_dst_head = (dst_head == src_head ? NULL : dst_head);
/* We want this information from before the rearrangement, but execute this after the validation. */
bool original_src_head_front_engine = original_src_head != NULL && original_src_head->IsFrontEngine();
/* We want this information from before the rearrangement, but execute this after the validation.
* original_src_head can't be NULL; src is by definition != NULL, so src_head can't be NULL as
* src->GetFirst() always yields non-NULL, so eventually original_src_head != NULL as well. */
bool original_src_head_front_engine = original_src_head->IsFrontEngine();
bool original_dst_head_front_engine = original_dst_head != NULL && original_dst_head->IsFrontEngine();
/* (Re)arrange the trains in the wanted arrangement. */