cpp/openttd-patchpack/source Changeset - r5833:e0b1130e5cb2

Changeset - r5833:e0b1130e5cb2

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

glx - 17 years ago 2007-01-25 01:29:24
glx@openttd.org

(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

1 file changed with 9 insertions and 1 deletions:

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -1359,12 +1359,19 @@ int32 CmdBuildRoadStop(TileIndex tile, u @@
 		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) {
 		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 &&
 			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);
@@ @@ -1421,8 +1428,9 @@ int32 CmdBuildRoadStop(TileIndex tile, u @@
 		UpdateStationAcceptance(st, false);
 		RebuildStationLists();
 		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();
 		rs_auto_delete.release();
+	}
 	return cost;
+}

0 comments (0 inline, 0 general)