dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'template_train_replacement' into jgrpp

Browse Source 
# Conflicts:
#	src/economy.cpp
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
This commit is contained in:
Jonathan G Rennison
2017-01-21 01:44:05 +00:00
parent b3f49672ec d4157b3662
commit 24b3424ca3
11 changed files with 46 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/group_cmd.cpp
View File

@@ -350,7 +350,7 @@ CommandCost CmdDeleteGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
VehicleType vt = g->vehicle_type;
/* Delete all template replacements using the just deleted group */
deleteIllegalTemplateReplacements(g->index);
DeleteTemplateReplacementsByGroupID(g->index);
/* notify tracerestrict that group is about to be deleted */
TraceRestrictRemoveGroupID(g->index);
@@ -766,7 +766,10 @@ void RemoveAllGroupsForCompany(const CompanyID company)
Group *g;
FOR_ALL_GROUPS(g) {
if (company == g->owner) delete g;
if (company == g->owner) {
DeleteTemplateReplacementsByGroupID(g->index);
delete g;
}
}
}