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

Fix aircraft shadows being drawn facing the wrong direction

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-10-12 20:19:53 +01:00
parent 32571a0ccd
commit 71a5abd42b
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/aircraft.h
View File

@@ -96,6 +96,7 @@ struct Aircraft FINAL : public SpecializedVehicle<Aircraft, VEH_AIRCRAFT> {
ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_AIRCRAFT_INC : EXPENSES_AIRCRAFT_RUN; }
bool IsPrimaryVehicle() const { return this->IsNormalAircraft(); }
void GetImage(Direction direction, EngineImageType image_type, VehicleSpriteSeq *result) const;
Direction GetMapImageDirection() const { return this->First()->direction; }
int GetDisplaySpeed() const { return this->cur_speed; }
int GetDisplayMaxSpeed() const { return this->vcache.cached_max_speed; }
int GetSpeedOldUnits() const { return this->vcache.cached_max_speed * 10 / 128; }

24
src/aircraft_cmd.cpp
View File

@@ -172,6 +172,22 @@ static StationID FindNearestHangar(const Aircraft *v)
void Aircraft::GetImage(Direction direction, EngineImageType image_type, VehicleSpriteSeq *result) const
{
if (this->subtype == AIR_SHADOW) {
Aircraft *first = this->First();
if (first->cur_image_valid_dir != direction || HasBit(first->vcache.cached_veh_flags, VCF_IMAGE_REFRESH)) {
VehicleSpriteSeq seq;
first->UpdateImageState(direction, seq);
if (first->sprite_seq != seq) {
first->sprite_seq = seq;
first->UpdateSpriteSeqBound();
first->Vehicle::UpdateViewport(true);
}
}
result->CopyWithoutPalette(first->sprite_seq); // the shadow is never coloured
return;
}
uint8 spritenum = this->spritenum;
if (is_custom_sprite(spritenum)) {
@@ -552,10 +568,8 @@ void SetAircraftPosition(Aircraft *v, int x, int y, int z)
safe_y = Clamp(u->y_pos, 0, MapMaxY() * TILE_SIZE);
u->z_pos = GetSlopePixelZ(safe_x, safe_y);
u->sprite_seq.CopyWithoutPalette(v->sprite_seq); // the shadow is never coloured
u->sprite_seq_bounds = v->sprite_seq_bounds;
u->UpdatePositionAndViewport();
u->UpdatePosition();
u->UpdateViewport(true, false);
u = u->Next();
if (u != nullptr) {
@@ -1364,7 +1378,7 @@ TileIndex Aircraft::GetOrderStationLocation(StationID station)
void Aircraft::MarkDirty()
{
this->colourmap = PAL_NONE;
this->InvalidateImageCache();
this->InvalidateImageCacheOfChain();
this->UpdateViewport(true, false);
if (this->subtype == AIR_HELICOPTER) {
Aircraft *rotor = this->Next()->Next();

2
src/vehicle_base.h
View File

@@ -1387,7 +1387,7 @@ public:
inline void UpdateImageStateUsingMapDirection(VehicleSpriteSeq &seq)
{
this->UpdateImageState(this->GetMapImageDirection(), seq);
this->UpdateImageState(((T *)this)->GetMapImageDirection(), seq);
}
private: