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

22
src/economy.cpp
View File

@@ -52,6 +52,7 @@
#include "story_base.h"
#include "linkgraph/refresh.h"
#include "tracerestrict.h"
#include "tbtr_template_vehicle.h"
#include "table/strings.h"
#include "table/pricebase.h"
@@ -499,6 +500,27 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
}
TraceRestrictUpdateCompanyID(old_owner, new_owner);
/* Change ownership of template vehicles */
if (new_owner == INVALID_OWNER) {
TemplateVehicle *tv;
FOR_ALL_TEMPLATES(tv) {
if (tv->owner == old_owner) {
TemplateReplacement *tr;
FOR_ALL_TEMPLATE_REPLACEMENTS(tr) {
if (tr->Template() == tv->index) {
delete tr;
}
}
delete tv;
}
}
} else {
TemplateVehicle *tv;
FOR_ALL_TEMPLATES(tv) {
if (tv->owner == old_owner) tv->owner = new_owner;
}
}
/* Change ownership of tiles */
{
TileIndex tile = 0;