summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-09-07 09:07:56 +0000
committerrubidium <rubidium@openttd.org>2009-09-07 09:07:56 +0000
commit167d632e16d6b45f0c6f0df785be9a2d0c427c83 (patch)
treec636c166c35e3b6cd19397db5acec1f901039077
parent1f21a5cb41f788fc03bb0c508163dd67675b4de1 (diff)
downloadopenttd-167d632e16d6b45f0c6f0df785be9a2d0c427c83.tar.xz
(svn r17447) -Codechange: rename a local variable so it doesn't collide with the name of a global function
-rw-r--r--src/rail_cmd.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index ba288b946..165afcc68 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -1039,7 +1039,7 @@ static CommandCost CmdSignalTrackHelper(TileIndex tile, DoCommandFlag flags, uin
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(TileIndex tile, DoCommandFlag flags, uin
/* 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(TileIndex tile, DoCommandFlag flags, uin
}
}
- return error ? CMD_ERROR : total_cost;
+ return err ? CMD_ERROR : total_cost;
}
/** Build signals on a stretch of track.