# HG changeset patch # User rubidium # Date 2009-09-07 09:07:56 # Node ID 5f0fae995b6cb9016735b2df757aff63840436b2 # Parent c1043c7d6f68cf46c5b868df3981325a4cbaf4de (svn r17447) -Codechange: rename a local variable so it doesn't collide with the name of a global function diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -1039,7 +1039,7 @@ static CommandCost CmdSignalTrackHelper( CommandCost ret, total_cost(EXPENSES_CONSTRUCTION); int signal_ctr; byte signals; - bool error = true; + bool err = true; TileIndex end_tile; TileIndex start_tile = tile; @@ -1118,7 +1118,7 @@ static CommandCost CmdSignalTrackHelper( /* Be user-friendly and try placing signals as much as possible */ if (CmdSucceeded(ret)) { - error = false; + err = false; total_cost.AddCost(ret); } } @@ -1143,7 +1143,7 @@ static CommandCost CmdSignalTrackHelper( } } - return error ? CMD_ERROR : total_cost; + return err ? CMD_ERROR : total_cost; } /** Build signals on a stretch of track.