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

Merge branch 'template_train_replacement-sx' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-06-10 00:06:16 +01:00
parent 3b42e299aa ed20e1c61a
commit e95a24a4e9
4 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vehicle_cmd.cpp
View File

@@ -1224,10 +1224,12 @@ CommandCost CmdDeleteTemplateVehicle(TileIndex tile, DoCommandFlag flags, uint32
bool should_execute = (flags & DC_EXEC) != 0;
if (should_execute) {
// Remove a corresponding template replacement if existing
TemplateReplacement *tr = GetTemplateReplacementByTemplateID(del->index);
if (tr != NULL) {
delete tr;
// Remove corresponding template replacements if existing
TemplateReplacement *tr;
FOR_ALL_TEMPLATE_REPLACEMENTS(tr) {
if (tr->Template() == del->index) {
delete tr;
}
}
delete del;