mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Use constant for LOCATION_NULL, split off location stuff to Location.h

Browse Source
This commit is contained in:
Michael Steenbeek
2017-10-13 22:23:07 +02:00
committed by GitHub
parent ab3835719a
commit 7f9c25a7a9
118 changed files with 954 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/testpaint/FunctionCall.hpp
View File

@@ -40,10 +40,10 @@ typedef struct
struct paint
{
uint32 image_id;
rct_xy16 offset;
rct_xyz16 bound_box_length;
LocationXY16 offset;
LocationXYZ16 bound_box_length;
sint16 z_offset;
rct_xyz16 bound_box_offset;
LocationXYZ16 bound_box_offset;
uint32 rotation;
paint_struct output_struct;
} paint;

2
test/testpaint/PaintIntercept.cpp
View File

@@ -278,7 +278,7 @@ namespace PaintIntercept {
log_error("Ebp is different from current rotation");
}
rct_xyz16 boundOffset = {
LocationXYZ16 boundOffset = {
RCT2_GLOBAL(RCT2_ADDRESS_PAINT_BOUNDBOX_OFFSET_X, sint16),
RCT2_GLOBAL(RCT2_ADDRESS_PAINT_BOUNDBOX_OFFSET_Y, sint16),
RCT2_GLOBAL(RCT2_ADDRESS_PAINT_BOUNDBOX_OFFSET_Z, sint16)

10
test/testpaint/compat.c
View File

@@ -22,7 +22,7 @@
#include <openrct2/ride/track.h>
#include <openrct2/world/sprite.h>
#include <openrct2/paint/map_element/map_element.h>
#include "../../src/openrct2/ride/ride.h"
#include <openrct2/ride/ride.h>
#define RCT2_ADDRESS_SPRITE_LIST 0x010E63BC
@@ -39,7 +39,7 @@ bool gTrackDesignSaveMode = false;
uint8 gTrackDesignSaveRideIndex = 255;
uint8 gClipHeight = 255;
const rct_xy16 TileDirectionDelta[] = {
const LocationXY16 TileDirectionDelta[] = {
{-32, 0},
{0, +32},
{+32, 0},
@@ -76,9 +76,9 @@ int object_entry_group_counts[] = {
GeneralConfiguration gConfigGeneral;
uint16 gMapSelectFlags;
uint16 gMapSelectType;
rct_xy16 gMapSelectPositionA;
rct_xy16 gMapSelectPositionB;
rct_xyz16 gMapSelectArrowPosition;
LocationXY16 gMapSelectPositionA;
LocationXY16 gMapSelectPositionB;
LocationXYZ16 gMapSelectArrowPosition;
uint8 gMapSelectArrowDirection;
void entrance_paint(paint_session * session, uint8 direction, int height, rct_map_element *map_element) { }