(svn r11376) -Fix: fill the town a oil rig is associated with before creating the name, otherwise every oil rig will become "<TOWN> Oilrig" which effectively means that there can be several oil rigs with exactly the same name.
--- a/src/station_cmd.cpp Sun Nov 04 11:28:36 2007 +0000
+++ b/src/station_cmd.cpp Sun Nov 04 11:46:01 2007 +0000
@@ -2759,14 +2759,16 @@
DEBUG(misc, 0, "Can't allocate station for oilrig at 0x%X, reverting to oilrig only", tile);
return;
}
- if (!GenerateStationName(st, tile, STATIONNAMING_OILRIG)) {
- DEBUG(misc, 0, "Can't allocate station-name for oilrig at 0x%X, reverting to oilrig only", tile);
- return;
- }
st->town = ClosestTownFromTile(tile, (uint)-1);
st->sign.width_1 = 0;
+ if (!GenerateStationName(st, tile, STATIONNAMING_OILRIG)) {
+ DEBUG(misc, 0, "Can't allocate station-name for oilrig at 0x%X, reverting to oilrig only", tile);
+ delete st;
+ return;
+ }
+
MakeOilrig(tile, st->index);
st->owner = OWNER_NONE;