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

Merge branch 'infrastructure_sharing-sx' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-01-31 11:46:00 +00:00
parent d9466fa424 248ac0e263
commit 9c49ba43da
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/economy.cpp
View File

@@ -405,7 +405,13 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
FOR_ALL_VEHICLES(v) { FOR_ALL_VEHICLES(v) {
if (v->owner == old_owner && IsCompanyBuildableVehicleType(v->type)) { if (v->owner == old_owner && IsCompanyBuildableVehicleType(v->type)) {
if (new_owner == INVALID_OWNER) { if (new_owner == INVALID_OWNER) {
if (v->Previous() == NULL) delete v; if (v->Previous() == NULL) {
if (_settings_game.economy.infrastructure_sharing[VEH_TRAIN] && v->type == VEH_TRAIN && Train::From(v)->IsFrontEngine()) {
DeleteVisibleTrain(Train::From(v));
} else {
delete v;
}
}
} else { } else {
if (v->IsEngineCountable()) GroupStatistics::CountEngine(v, -1); if (v->IsEngineCountable()) GroupStatistics::CountEngine(v, -1);
if (v->IsPrimaryVehicle()) GroupStatistics::CountVehicle(v, -1); if (v->IsPrimaryVehicle()) GroupStatistics::CountVehicle(v, -1);

2
src/lang/portuguese.txt
View File

@@ -1664,8 +1664,10 @@ STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Localiz
STR_CONFIG_SETTING_SOUND :{ORANGE}Efeitos sonoros STR_CONFIG_SETTING_SOUND :{ORANGE}Efeitos sonoros
STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interface STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interface
STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construção STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construção
STR_CONFIG_SETTING_COMPANY :{ORANGE}Empresa
STR_CONFIG_SETTING_VEHICLES :{ORANGE}Veículos STR_CONFIG_SETTING_VEHICLES :{ORANGE}Veículos
STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Em rota STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Em rota
STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Desastres / Acidentes
STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Cidades STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Cidades
STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrias STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrias
STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribuição de Carga STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribuição de Carga

3
src/train_cmd.cpp
View File

@@ -3248,9 +3248,6 @@ static Vehicle *FindTrainCollideEnum(Vehicle *v, void *data)
/* not a train or in depot */ /* not a train or in depot */
if (v->type != VEH_TRAIN || Train::From(v)->track == TRACK_BIT_DEPOT) return NULL; if (v->type != VEH_TRAIN || Train::From(v)->track == TRACK_BIT_DEPOT) return NULL;
/* do not crash into trains of another company. */
if (v->owner != tcc->v->owner) return NULL;
/* get first vehicle now to make most usual checks faster */ /* get first vehicle now to make most usual checks faster */
Train *coll = Train::From(v)->First(); Train *coll = Train::From(v)->First();