diff --git a/changelog.txt b/changelog.txt index c132bf8953..cf1bf9e0d7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +1.0.0 (2010-04-01) +------------------------------------------------------------------------ +- Fix: Network clients would crash while connecting to a server with AIs (r19526) +- Fix: [NPF] Crash when finding a waypoint before finding the closest depot [FS#3703] (r19460) + + 1.0.0-RC3 (2010-03-18) ------------------------------------------------------------------------ - Feature: Append rail type speed limit (if set) to rail type selection list, and toolbar title (r19431) diff --git a/docs/openttd.6 b/docs/openttd.6 index 8acc6409f0..cb50d1fb1b 100644 --- a/docs/openttd.6 +++ b/docs/openttd.6 @@ -1,6 +1,6 @@ .\" Hey, EMACS: -*- nroff -*- .\" Please adjust this date whenever revising the manpage. -.Dd Jan 18, 2010 +.Dd Apr 01, 2010 .Dt OPENTTD 6 .Sh NAME .Nm openttd diff --git a/known-bugs.txt b/known-bugs.txt index 9278227d58..9e2eb76e73 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,6 +1,6 @@ OpenTTD's known bugs -Last updated: 2010-03-18 -Release version: 1.0.0-RC3 +Last updated: 2010-04-01 +Release version: 1.0.0 ------------------------------------------------------------------------ @@ -34,6 +34,9 @@ that you can find at: http://bugs.openttd.org If the bugs are closed but still listed here it means that the bug is fixed and that the nightlies and next major release will not have that bug. +- 3725 [NewGRF] Incorrect handling of some house action0s +- 3720 When refitting to a vehicle with more trailers, the details view is not made bigger +- 3714 Some corrupted savegames can cause crashes - 3695 Behaviour inconsistency building railway/road down towards water - 3651 [OSX] Crash when selecting full screen - 3648 [OSX] Crash when selecting music diff --git a/os/debian/changelog b/os/debian/changelog index d5f4d7f0e0..fefb691716 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (1.0.0) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman Thu, 01 Apr 2010 00:01:02 +0200 + openttd (1.0.0~RC3) unstable; urgency=low * New upstream release. diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd index a41e9ec2c2..708eb2d405 100644 --- a/os/os2/installer/make_installer.cmd +++ b/os/os2/installer/make_installer.cmd @@ -1,6 +1,6 @@ @echo off -set OPENTTD_VERSION=1.0.0-RC3 +set OPENTTD_VERSION=1.0.0 set OPENSFX_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0 set OPENGFX_VERSION=0.7.0 diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index 2a7d3752c6..d17e9bf45a 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -2,8 +2,8 @@ !define APPV_MAJOR 1 !define APPV_MINOR 0 !define APPV_MAINT 0 -!define APPV_BUILD 6 -!define APPV_EXTRA "-RC3" +!define APPV_BUILD 7 +!define APPV_EXTRA "" !define APPNAME "OpenTTD" ; Define application name !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version diff --git a/readme.txt b/readme.txt index 585c4603c0..fa3bc75b0a 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ OpenTTD README -Last updated: 2010-03-18 -Release version: 1.0.0-RC3 +Last updated: 2010-04-01 +Release version: 1.0.0 ------------------------------------------------------------------------ diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index 571a3ef0d5..f1624c7b2b 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -1028,6 +1028,9 @@ void InitializeAIGui() /** Open the AI debug window if one of the AI scripts has crashed. */ void ShowAIDebugWindowIfAIError() { + /* Network clients can't debug AIs. */ + if (_networking && !_network_server) return; + Company *c; FOR_ALL_COMPANIES(c) { if (c->is_ai && c->ai_instance->IsDead()) { diff --git a/src/pathfinder/npf/npf.cpp b/src/pathfinder/npf/npf.cpp index 1423ae449b..b239d5c529 100644 --- a/src/pathfinder/npf/npf.cpp +++ b/src/pathfinder/npf/npf.cpp @@ -1062,7 +1062,7 @@ static NPFFoundTargetData NPFRouteToStationOrTile(TileIndex tile, Trackdir track * reverse_penalty applied (NPF_TILE_LENGTH is the equivalent of one full * tile). */ -static NPFFoundTargetData NPFRouteToDepotBreadthFirstTwoWay(TileIndex tile1, Trackdir trackdir1, bool ignore_start_tile1, TileIndex tile2, Trackdir trackdir2, bool ignore_start_tile2, TransportType type, uint sub_type, Owner owner, RailTypes railtypes, uint reverse_penalty) +static NPFFoundTargetData NPFRouteToDepotBreadthFirstTwoWay(TileIndex tile1, Trackdir trackdir1, bool ignore_start_tile1, TileIndex tile2, Trackdir trackdir2, bool ignore_start_tile2, NPFFindStationOrTileData *target, TransportType type, uint sub_type, Owner owner, RailTypes railtypes, uint reverse_penalty) { AyStarNode start1; AyStarNode start2; @@ -1078,7 +1078,7 @@ static NPFFoundTargetData NPFRouteToDepotBreadthFirstTwoWay(TileIndex tile1, Tra /* perform a breadth first search. Target is NULL, * since we are just looking for any depot...*/ - return NPFRouteInternal(&start1, ignore_start_tile1, (IsValidTile(tile2) ? &start2 : NULL), ignore_start_tile2, NULL, NPFFindDepot, NPFCalcZero, type, sub_type, owner, railtypes, reverse_penalty); + return NPFRouteInternal(&start1, ignore_start_tile1, (IsValidTile(tile2) ? &start2 : NULL), ignore_start_tile2, target, NPFFindDepot, NPFCalcZero, type, sub_type, owner, railtypes, reverse_penalty); } void InitializeNPF() @@ -1127,7 +1127,7 @@ FindDepotData NPFRoadVehicleFindNearestDepot(const RoadVehicle *v, int max_penal { Trackdir trackdir = v->GetVehicleTrackdir(); - NPFFoundTargetData ftd = NPFRouteToDepotBreadthFirstTwoWay(v->tile, trackdir, false, v->tile, ReverseTrackdir(trackdir), false, TRANSPORT_ROAD, v->compatible_roadtypes, v->owner, INVALID_RAILTYPES, 0); + NPFFoundTargetData ftd = NPFRouteToDepotBreadthFirstTwoWay(v->tile, trackdir, false, v->tile, ReverseTrackdir(trackdir), false, NULL, TRANSPORT_ROAD, v->compatible_roadtypes, v->owner, INVALID_RAILTYPES, 0); if (ftd.best_bird_dist != 0) return FindDepotData(); @@ -1188,9 +1188,12 @@ FindDepotData NPFTrainFindNearestDepot(const Train *v, int max_penalty) const Train *last = v->Last(); Trackdir trackdir = v->GetVehicleTrackdir(); Trackdir trackdir_rev = ReverseTrackdir(last->GetVehicleTrackdir()); + NPFFindStationOrTileData fstd; + fstd.v = v; + fstd.reserve_path = false; assert(trackdir != INVALID_TRACKDIR); - NPFFoundTargetData ftd = NPFRouteToDepotBreadthFirstTwoWay(v->tile, trackdir, false, last->tile, trackdir_rev, false, TRANSPORT_RAIL, 0, v->owner, v->compatible_railtypes, NPF_INFINITE_PENALTY); + NPFFoundTargetData ftd = NPFRouteToDepotBreadthFirstTwoWay(v->tile, trackdir, false, last->tile, trackdir_rev, false, &fstd, TRANSPORT_RAIL, 0, v->owner, v->compatible_railtypes, NPF_INFINITE_PENALTY); if (ftd.best_bird_dist != 0) return FindDepotData(); /* Found target */