Merge branch 'polyline_track_tool' into jgrpp

# Conflicts:
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
This commit is contained in:
Jonathan G Rennison
2016-04-13 21:14:47 +01:00
13 changed files with 762 additions and 166 deletions

View File

@@ -121,6 +121,7 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
InitializeEconomy();
ResetObjectToPlace();
ResetRailPlacementSnapping();
GamelogReset();
GamelogStartAction(GLAT_START);