From e9a595bda04e169a4a730ad2715363349fb73021 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 22 Dec 2010 21:19:39 +0000 Subject: [PATCH] (svn r21603) -Codechange: no need to assign something to a variable and then test it for NULL when you're never using it again --- src/order_cmd.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 28f30e811a..684ff62c99 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -750,7 +750,6 @@ CommandCost CmdDeleteOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 { VehicleID veh_id = GB(p1, 0, 20); VehicleOrderID sel_ord = GB(p2, 0, 8); - Order *order; 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 (sel_ord >= v->GetNumOrders()) return DecloneOrder(v, flags); - order = v->GetOrder(sel_ord); - if (order == NULL) return CMD_ERROR; + if (v->GetOrder(sel_ord) == NULL) return CMD_ERROR; if (flags & DC_EXEC) DeleteOrder(v, sel_ord); return CommandCost();