gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-06 22:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8399) -Fix (r8185): a new road stop was always created in CmdBuildRoadStop(), but it was not deleted if DC_EXEC flag was not set or if the station creation failed

Browse Source
This commit is contained in:
glx 2007-01-25 01:29:24 +00:00
parent 9727bb4cfc
commit 35de25eec1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/station_cmd.cpp
View File

@ -1359,12 +1359,19 @@ int32 CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (st != NULL && st->facilities != 0) st = NULL; 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 //give us a road stop in the list, and check if something went wrong
road_stop = new RoadStop(tile); road_stop = new RoadStop(tile);
if (road_stop == NULL) { if (road_stop == NULL) {
return_cmd_error(type ? STR_3008B_TOO_MANY_TRUCK_STOPS : STR_3008A_TOO_MANY_BUS_STOPS); return_cmd_error(type ? STR_3008B_TOO_MANY_TRUCK_STOPS : STR_3008A_TOO_MANY_BUS_STOPS);
} }
/* 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);
if (st != NULL && if (st != NULL &&
GetNumRoadStopsInStation(st, RS_BUS) + GetNumRoadStopsInStation(st, RS_TRUCK) >= ROAD_STOP_LIMIT) { GetNumRoadStopsInStation(st, RS_BUS) + GetNumRoadStopsInStation(st, RS_TRUCK) >= ROAD_STOP_LIMIT) {
return_cmd_error(type ? STR_3008B_TOO_MANY_TRUCK_STOPS : STR_3008A_TOO_MANY_BUS_STOPS); return_cmd_error(type ? STR_3008B_TOO_MANY_TRUCK_STOPS : STR_3008A_TOO_MANY_BUS_STOPS);
@ -1421,8 +1428,9 @@ int32 CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
UpdateStationAcceptance(st, false); UpdateStationAcceptance(st, false);
RebuildStationLists(); RebuildStationLists();
InvalidateWindow(WC_STATION_LIST, st->owner); InvalidateWindow(WC_STATION_LIST, st->owner);
/* success, so don't delete the new station */ /* success, so don't delete the new station and the new road stop */
st_auto_delete.release(); st_auto_delete.release();
rs_auto_delete.release();
} }
return cost; return cost;
} }