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

Fix sprite bound issues for vehicles which vary bounds with curvature

Browse Source 
If a vehicle uses curvature vars 0x45 or 0x62, cache the directions
of its 4 nearest neighbours, and check them in UpdateViewport along
with the vehicle's own direction.
This commit is contained in:
Jonathan G Rennison
2021-01-03 16:12:59 +00:00
parent bf313338c0
commit 204f8e173f
4 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/newgrf_engine.cpp
View File

@@ -28,6 +28,7 @@
#include "safeguards.h"
bool _sprite_group_resolve_check_veh_check = false;
bool _sprite_group_resolve_check_veh_curvature_check = false;
struct WagonOverride {
EngineID *train_id;
@@ -692,6 +693,8 @@ static uint32 VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *object,
*/
if (!v->IsGroundVehicle()) return 0;
_sprite_group_resolve_check_veh_curvature_check = false;
const Vehicle *u_p = v->Previous();
const Vehicle *u_n = v->Next();
DirDiff f = (u_p == nullptr) ? DIRDIFF_SAME : DirDifference(u_p->direction, v->direction);
@@ -812,6 +815,8 @@ static uint32 VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *object,
const Vehicle *u = v->Move((int8)parameter);
if (u == nullptr) return 0;
_sprite_group_resolve_check_veh_curvature_check = false;
/* Get direction difference. */
bool prev = (int8)parameter < 0;
uint32 ret = prev ? DirDifference(u->direction, v->direction) : DirDifference(v->direction, u->direction);