mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r5665) - Codechange: check pointers against NULL, coding style, tabulation; nothing serious.

This commit is contained in:
Darkvater 2006-07-30 22:55:17 +00:00
parent 6224c7485c
commit f0951cf82f
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
train_cmd.c
View File

@ -958,8 +958,7 @@ int32 CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
// if nothing is selected as destination, try and find a matching vehicle to drag to. // if nothing is selected as destination, try and find a matching vehicle to drag to.
if (d == INVALID_VEHICLE) { if (d == INVALID_VEHICLE) {
dst = NULL; dst = IsTrainEngine(src) ? NULL : FindGoodVehiclePos(src);
if (!IsTrainEngine(src)) dst = FindGoodVehiclePos(src);
} else { } else {
dst = GetVehicle(d); dst = GetVehicle(d);
} }
@ -1009,14 +1008,13 @@ int32 CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (IsTrainEngine(u) && IsMultiheaded(u) && u->u.rail.other_multiheaded_part != NULL) { if (IsTrainEngine(u) && IsMultiheaded(u) && u->u.rail.other_multiheaded_part != NULL) {
engine = u; engine = u;
} }
if (engine != NULL && engine->u.rail.other_multiheaded_part == u) { if (engine != NULL && engine->u.rail.other_multiheaded_part == u) {
engine = NULL; engine = NULL;
} }
if (u == dst) { if (u == dst) {
if (engine != NULL) dst = engine->u.rail.other_multiheaded_part; if (engine != NULL) dst = engine->u.rail.other_multiheaded_part;
break; break;
} }
} }
} }
@ -1111,8 +1109,7 @@ int32 CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
} }
} else { } else {
// if moving within the same chain, dont use dst_head as it may get invalidated // if moving within the same chain, dont use dst_head as it may get invalidated
if (src_head == dst_head) if (src_head == dst_head) dst_head = NULL;
dst_head = NULL;
// unlink single wagon from linked list // unlink single wagon from linked list
src_head = UnlinkWagon(src, src_head); src_head = UnlinkWagon(src, src_head);
GetLastEnginePart(src)->next = NULL; GetLastEnginePart(src)->next = NULL;
@ -1188,7 +1185,7 @@ int32 CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
src_head = NULL; // don't do anything more to this train since the new call will do it src_head = NULL; // don't do anything more to this train since the new call will do it
} }
if (src_head) { if (src_head != NULL) {
NormaliseTrainConsist(src_head); NormaliseTrainConsist(src_head);
TrainConsistChanged(src_head); TrainConsistChanged(src_head);
if (IsFrontEngine(src_head)) { if (IsFrontEngine(src_head)) {
@ -1202,7 +1199,7 @@ int32 CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
InvalidateWindow(WC_VEHICLE_DEPOT, src_head->tile); InvalidateWindow(WC_VEHICLE_DEPOT, src_head->tile);
}; };
if (dst_head) { if (dst_head != NULL) {
NormaliseTrainConsist(dst_head); NormaliseTrainConsist(dst_head);
TrainConsistChanged(dst_head); TrainConsistChanged(dst_head);
if (IsFrontEngine(dst_head)) { if (IsFrontEngine(dst_head)) {