mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Replace LocationXYZD16

Browse Source
This commit is contained in:
Michael Steenbeek
2018-02-16 09:50:40 +01:00
parent ac0b18cde5
commit f4ac2b4d5b
5 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/ride/Ride.cpp
View File

@@ -193,7 +193,7 @@ uint8 _currentSeatRotationAngle;
LocationXYZ16 _unkF44188;
LocationXYZD16 _unkF440C5;
CoordsXYZD _unkF440C5;
uint8 gRideEntranceExitPlaceType;
uint8 gRideEntranceExitPlaceRideIndex;

2
src/openrct2/ride/Ride.h
View File

@@ -984,7 +984,7 @@ extern uint8 _currentSeatRotationAngle;
extern LocationXYZ16 _unkF44188;
extern LocationXYZD16 _unkF440C5;
extern CoordsXYZD _unkF440C5;
extern uint8 gRideEntranceExitPlaceType;
extern uint8 gRideEntranceExitPlaceRideIndex;

4
src/openrct2/world/Entrance.cpp
View File

@@ -30,9 +30,9 @@
bool gParkEntranceGhostExists = false;
LocationXYZ16 gParkEntranceGhostPosition = { 0, 0, 0 };
uint8 gParkEntranceGhostDirection = 0;
LocationXYZD16 gParkEntrances[MAX_PARK_ENTRANCES];
CoordsXYZD gParkEntrances[MAX_PARK_ENTRANCES];
LocationXYZD16 gRideEntranceExitGhostPosition;
CoordsXYZD gRideEntranceExitGhostPosition;
uint8 gRideEntranceExitGhostStationIndex;
static void ParkEntranceRemoveSegment(sint32 x, sint32 y, sint32 z)

7
src/openrct2/world/Entrance.h
View File

@@ -18,6 +18,7 @@
#define _ENTRANCE_H_
#include "../common.h"
#include "Location.h"
#pragma pack(push, 1)
struct rct_entrance_type {
@@ -31,8 +32,6 @@ assert_struct_size(rct_entrance_type, 8);
void game_command_remove_park_entrance(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp);
struct LocationXYZ16;
struct LocationXYZD16;
struct rct_tile_element;
extern bool gParkEntranceGhostExists;
@@ -41,9 +40,9 @@ extern uint8 gParkEntranceGhostDirection;
#define MAX_PARK_ENTRANCES 4
extern LocationXYZD16 gParkEntrances[MAX_PARK_ENTRANCES];
extern CoordsXYZD gParkEntrances[MAX_PARK_ENTRANCES];
extern LocationXYZD16 gRideEntranceExitGhostPosition;
extern CoordsXYZD gRideEntranceExitGhostPosition;
extern uint8 gRideEntranceExitGhostStationIndex;
void park_entrance_remove_ghost();

6
src/openrct2/world/Location.h
View File

@@ -43,12 +43,6 @@ struct LocationXYZ16 {
sint16 x, y, z;
};
assert_struct_size(LocationXYZ16, 6);
struct LocationXYZD16 {
sint16 x, y, z;
uint8 direction;
};
assert_struct_size(LocationXYZD16, 7);
#pragma pack(pop)
/*