Merge branch 'tracerestrict-sx' into jgrpp

# Conflicts:
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
This commit is contained in:
Jonathan G Rennison
2016-04-05 20:12:09 +01:00
7 changed files with 168 additions and 30 deletions

View File

@@ -22,6 +22,7 @@
#include "core/pool_func.hpp"
#include "order_backup.h"
#include "tbtr_template_vehicle.h"
#include "tracerestrict.h"
#include "table/strings.h"
@@ -351,6 +352,9 @@ CommandCost CmdDeleteGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
/* Delete all template replacements using the just deleted group */
deleteIllegalTemplateReplacements(g->index);
/* notify tracerestrict that group is about to be deleted */
TraceRestrictRemoveGroupID(g->index);
/* Delete the Replace Vehicle Windows */
DeleteWindowById(WC_REPLACE_VEHICLE, g->vehicle_type);
delete g;