summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2007-01-25 07:11:06 +0000
committertron <tron@openttd.org>2007-01-25 07:11:06 +0000
commite85cd647e18cb916f008d2c6c7ce985f29f78e9f (patch)
tree95e230459aef9506775a8522a7e687b9b83efc1f
parent35de25eec1cbf5a61d151251c499b899c273e24d (diff)
downloadopenttd-e85cd647e18cb916f008d2c6c7ce985f29f78e9f.tar.xz
(svn r8400) -Fix
Simplify r8399
-rw-r--r--src/station_cmd.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index e5924cbd8..8cef0f4bc 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -1359,10 +1359,6 @@ int32 CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (st != NULL && st->facilities != 0) st = NULL;
}
- /* If DC_EXEC is NOT set we still need to create the road stop to test if everything is OK.
- * In this case we need to delete it before return. */
- std::auto_ptr<RoadStop> rs_auto_delete;
-
//give us a road stop in the list, and check if something went wrong
road_stop = new RoadStop(tile);
if (road_stop == NULL) {
@@ -1370,7 +1366,7 @@ int32 CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
}
/* ensure that in case of error (or no DC_EXEC) the new road stop gets deleted upon return */
- rs_auto_delete = std::auto_ptr<RoadStop>(road_stop);
+ std::auto_ptr<RoadStop> rs_auto_delete(road_stop);
if (st != NULL &&
GetNumRoadStopsInStation(st, RS_BUS) + GetNumRoadStopsInStation(st, RS_TRUCK) >= ROAD_STOP_LIMIT) {