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

Implement new shortened train flipping for template trains

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-12-27 02:12:29 +00:00
parent 5bea50c413
commit 4df56ec1ef
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tbtr_template_vehicle.cpp
View File

@@ -61,6 +61,11 @@ void TemplateVehicleImageDimensions::SetFromTrain(const Train *t)
this->reference_width = e->GetGRF()->traininfo_vehicle_width; this->reference_width = e->GetGRF()->traininfo_vehicle_width;
this->vehicle_pitch = e->GetGRF()->traininfo_vehicle_pitch; this->vehicle_pitch = e->GetGRF()->traininfo_vehicle_pitch;
} }
if (t->gcache.cached_veh_length != 8 && HasBit(t->flags, VRF_REVERSE_DIRECTION) && !HasBit(EngInfo(t->engine_type)->misc_flags, EF_RAIL_FLIPS)) {
this->vehicle_flip_length = t->gcache.cached_veh_length;
} else {
this->vehicle_flip_length = -1;
}
} }
TemplateVehicle::TemplateVehicle(VehicleType ty, EngineID eid, byte subtypeflag, Owner current_owner) TemplateVehicle::TemplateVehicle(VehicleType ty, EngineID eid, byte subtypeflag, Owner current_owner)

4
src/tbtr_template_vehicle.h
View File

@@ -53,6 +53,7 @@ struct TemplateVehicleImageDimensions {
int reference_width; int reference_width;
int vehicle_pitch; int vehicle_pitch;
int cached_veh_length; int cached_veh_length;
int vehicle_flip_length;
void SetFromTrain(const Train *t); void SetFromTrain(const Train *t);
@@ -63,6 +64,9 @@ struct TemplateVehicleImageDimensions {
int GetOffsetX() const int GetOffsetX() const
{ {
if (this->vehicle_flip_length >= 0) {
return ScaleSpriteTrad((this->vehicle_flip_length - VEHICLE_LENGTH / 2) * this->reference_width / VEHICLE_LENGTH);
}
return ScaleSpriteTrad(this->reference_width) / 2; return ScaleSpriteTrad(this->reference_width) / 2;
} }