Merge branch 'progsig-sx' into jgrpp

Conflicts:
	src/command.cpp
	src/command_type.h
	src/lang/english.txt
	src/rail_cmd.cpp
	src/rail_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/widgets/rail_widget.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-02 18:15:18 +01:00
31 changed files with 2914 additions and 115 deletions

View File

@@ -63,6 +63,7 @@
#include "subsidy_func.h"
#include "gfx_layout.h"
#include "viewport_sprite_sorter.h"
#include "programmable_signals.h"
#include "linkgraph/linkgraphschedule.h"
#include "tracerestrict.h"
@@ -306,6 +307,9 @@ static void ShutdownGame()
ClearTraceRestrictMapping();
PoolBase::Clean(PT_ALL);
FreeSignalPrograms();
FreeSignalDependencies();
/* No NewGRFs were loaded when it was still bootstrapping. */
if (_game_mode != GM_BOOTSTRAP) ResetNewGRFData();