Merge branch 'master' into jgrpp
Remove the viewport sign cache as this is now superseded by the kd tree implementation # Conflicts: # src/crashlog.cpp # src/lang/english.txt # src/misc.cpp # src/pathfinder/follow_track.hpp # src/pbs.cpp # src/rail_cmd.cpp # src/saveload/vehicle_sl.cpp # src/settings.cpp # src/settings_gui.cpp # src/ship_cmd.cpp # src/station.cpp # src/station_base.h # src/station_cmd.cpp # src/table/settings.ini # src/thread/thread_morphos.cpp # src/town_cmd.cpp # src/train_cmd.cpp # src/viewport.cpp # src/waypoint.cpp
This commit is contained in:
@@ -28,6 +28,9 @@
|
||||
#include "core/pool_type.hpp"
|
||||
#include "game/game.hpp"
|
||||
#include "linkgraph/linkgraphschedule.h"
|
||||
#include "station_kdtree.h"
|
||||
#include "town_kdtree.h"
|
||||
#include "viewport_kdtree.h"
|
||||
#include "tracerestrict.h"
|
||||
#include "programmable_signals.h"
|
||||
#include "viewport_func.h"
|
||||
@@ -68,7 +71,6 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
|
||||
AllocateMap(size_x, size_y);
|
||||
|
||||
ViewportMapClearTunnelCache();
|
||||
ViewportClearStationSignCache();
|
||||
ClearCommandLog();
|
||||
|
||||
_pause_mode = PM_UNPAUSED;
|
||||
@@ -92,6 +94,10 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
|
||||
ClearCargoPacketDeferredPayments();
|
||||
PoolBase::Clean(PT_NORMAL);
|
||||
|
||||
RebuildStationKdtree();
|
||||
RebuildTownKdtree();
|
||||
RebuildViewportKdtree();
|
||||
|
||||
FreeSignalPrograms();
|
||||
FreeSignalDependencies();
|
||||
|
||||
|
Reference in New Issue
Block a user