petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r21603) -Codechange: no need to assign something to a variable and then test it for NULL when you're never using it again

Browse Source
This commit is contained in:
rubidium
2010-12-22 21:19:39 +00:00
parent a38a1e7b0d
commit e9a595bda0
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/order_cmd.cpp
View File

@@ -750,7 +750,6 @@ CommandCost CmdDeleteOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
{ {
VehicleID veh_id = GB(p1, 0, 20); VehicleID veh_id = GB(p1, 0, 20);
VehicleOrderID sel_ord = GB(p2, 0, 8); VehicleOrderID sel_ord = GB(p2, 0, 8);
Order *order;
Vehicle *v = Vehicle::GetIfValid(veh_id); Vehicle *v = Vehicle::GetIfValid(veh_id);
@@ -762,8 +761,7 @@ CommandCost CmdDeleteOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
/* If we did not select an order, we maybe want to de-clone the orders */ /* If we did not select an order, we maybe want to de-clone the orders */
if (sel_ord >= v->GetNumOrders()) return DecloneOrder(v, flags); if (sel_ord >= v->GetNumOrders()) return DecloneOrder(v, flags);
order = v->GetOrder(sel_ord); if (v->GetOrder(sel_ord) == NULL) return CMD_ERROR;
if (order == NULL) return CMD_ERROR;
if (flags & DC_EXEC) DeleteOrder(v, sel_ord); if (flags & DC_EXEC) DeleteOrder(v, sel_ord);
return CommandCost(); return CommandCost();