mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use CoordsXY for map position

This commit is contained in:
ζeh Matt 2023-04-14 03:09:29 +03:00
parent 5ea09be0f8
commit 31e1a5dbcd
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/interface/Viewport.cpp
View File

@ -72,7 +72,7 @@ uint8_t gCurrentRotation;
static uint32_t _currentImageType;
InteractionInfo::InteractionInfo(const PaintStruct* ps)
: Loc(ps->map_x, ps->map_y)
: Loc(ps->MapPos)
, Element(ps->Element)
, Entity(ps->Entity)
, SpriteType(ps->InteractionItem)

3
src/openrct2/paint/Paint.cpp
View File

@ -189,8 +189,7 @@ static PaintStruct* CreateNormalPaintStruct(
ps->Attached = nullptr;
ps->Children = nullptr;
ps->InteractionItem = session.InteractionType;
ps->map_x = session.MapPosition.x;
ps->map_y = session.MapPosition.y;
ps->MapPos = session.MapPosition;
ps->Element = session.CurrentlyDrawnTileElement;
ps->Entity = session.CurrentlyDrawnEntity;

3
src/openrct2/paint/Paint.h
View File

@ -57,8 +57,7 @@ struct PaintStruct
ImageId image_id;
int32_t x;
int32_t y;
int32_t map_x;
int32_t map_y;
CoordsXY MapPos;
uint16_t QuadrantIndex;
uint8_t SortFlags;
ViewportInteractionItem InteractionItem;