Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

TBTR: Fix virtual trains being created at load using wrong company.

Browse Source 
Fix virtual trains showing up in company engine counts.
This commit is contained in:
Jonathan G Rennison 2016-03-21 18:22:29 +00:00
parent cf638e836a
commit 6741c98f6b
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/group_cmd.cpp
View File

@ -139,7 +139,7 @@ void GroupStatistics::Clear()
/* static */ void GroupStatistics::CountVehicle(const Vehicle *v, int delta)
{
/* make virtual trains group-neutral */
if ( HasBit(v->subtype, GVSF_VIRTUAL) ) return;
if (HasBit(v->subtype, GVSF_VIRTUAL)) return;
assert(delta == 1 || delta == -1);
@ -164,6 +164,9 @@ void GroupStatistics::Clear()
*/
/* static */ void GroupStatistics::CountEngine(const Vehicle *v, int delta)
{
/* make virtual trains group-neutral */
if (HasBit(v->subtype, GVSF_VIRTUAL)) return;
assert(delta == 1 || delta == -1);
GroupStatistics::GetAllGroup(v).num_engines[v->engine_type] += delta;
GroupStatistics::Get(v).num_engines[v->engine_type] += delta;

3
src/saveload/tbtr_template_veh_sl.cpp
View File

@ -3,6 +3,7 @@
#include "../tbtr_template_vehicle.h"
#include "../tbtr_template_vehicle_func.h"
#include "../train.h"
#include "../core/backup_type.hpp"
#include "saveload.h"
@ -102,6 +103,7 @@ void AfterLoadTemplateVehiclesUpdateImage()
FOR_ALL_TEMPLATES(tv) {
if (tv->Prev() == NULL) {
Backup<CompanyByte> cur_company(_current_company, tv->owner, FILE_LINE);
StringID err;
Train* t = VirtualTrainFromTemplateVehicle(tv, err);
if (t != NULL) {
@ -123,6 +125,7 @@ void AfterLoadTemplateVehiclesUpdateImage()
}
delete t;
}
cur_company.Restore();
}
}
}

1
src/vehicle.cpp
View File

@ -653,6 +653,7 @@ uint CountVehiclesInChain(const Vehicle *v)
*/
bool Vehicle::IsEngineCountable() const
{
if (HasBit(this->subtype, GVSF_VIRTUAL)) return false;
switch (this->type) {
case VEH_AIRCRAFT: return Aircraft::From(this)->IsNormalAircraft(); // don't count plane shadows and helicopter rotors
case VEH_TRAIN:

6
src/vehicle_cmd.cpp
View File

@ -919,6 +919,10 @@ CommandCost CmdVirtualTrainFromTemplateVehicle(TileIndex tile, DoCommandFlag fla
return CMD_ERROR;
}
if (tv->owner != _current_company) {
return CMD_ERROR;
}
bool should_execute = (flags & DC_EXEC) != 0;
if (should_execute) {
@ -940,6 +944,8 @@ Train* VirtualTrainFromTemplateVehicle(TemplateVehicle* tv, StringID &err)
CommandCost c;
Train *tmp, *head, *tail;
assert(tv->owner == _current_company);
head = CmdBuildVirtualRailVehicle(tv->engine_type, true, err);
if (!head) return NULL;