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

Fix TestPaint

This commit is contained in:
Gymnasiast 2018-05-01 20:21:21 +02:00
parent d859bcdbbe
commit fd4df87a8d
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/testpaint/CMakeLists.txt
View File

@ -58,23 +58,21 @@ file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES
"${OPENRCT2_SRCPATH}/Diagnostic.cpp"
"${OPENRCT2_SRCPATH}/paint/PaintHelpers.cpp"
"${OPENRCT2_SRCPATH}/paint/tile_element/TileElement.cpp"
"${OPENRCT2_SRCPATH}/rct2/addresses.c"
"${OPENRCT2_SRCPATH}/rct2/hook.c"
"${OPENRCT2_SRCPATH}/ride/RideData.cpp"
"${OPENRCT2_SRCPATH}/ride/TrackData.cpp"
"${OPENRCT2_SRCPATH}/ride/TrackDataOld.cpp"
"${OPENRCT2_SRCPATH}/ride/TrackPaint.cpp"
"${ROOT_DIR}/src/openrct2/core/Console.cpp"
"${ROOT_DIR}/src/openrct2/core/Diagnostics.cpp"
"${ROOT_DIR}/src/openrct2/core/Guard.cpp"
"${ROOT_DIR}/src/openrct2/core/String.cpp"
"${ROOT_DIR}/src/openrct2/Diagnostic.cpp"
"${ROOT_DIR}/src/openrct2/localisation/ConversionTables.cpp"
"${ROOT_DIR}/src/openrct2/localisation/Convert.cpp"
"${ROOT_DIR}/src/openrct2/localisation/FormatCodes.cpp"
"${ROOT_DIR}/src/openrct2/localisation/UTF8.cpp"
"${ROOT_DIR}/src/openrct2/util/Util.cpp"
"${ROOT_DIR}/src/openrct2/Version.cpp"
"${OPENRCT2_SRCPATH}/core/Console.cpp"
"${OPENRCT2_SRCPATH}/core/Diagnostics.cpp"
"${OPENRCT2_SRCPATH}/core/Guard.cpp"
"${OPENRCT2_SRCPATH}/core/String.cpp"
"${OPENRCT2_SRCPATH}/Diagnostic.cpp"
"${OPENRCT2_SRCPATH}/localisation/ConversionTables.cpp"
"${OPENRCT2_SRCPATH}/localisation/Convert.cpp"
"${OPENRCT2_SRCPATH}/localisation/FormatCodes.cpp"
"${OPENRCT2_SRCPATH}/localisation/UTF8.cpp"
"${OPENRCT2_SRCPATH}/util/Util.cpp"
"${OPENRCT2_SRCPATH}/Version.cpp"
)
file(GLOB_RECURSE ORCT2_TESTPAINT_SOURCES "${CMAKE_CURRENT_LIST_DIR}/*.c"
"${CMAKE_CURRENT_LIST_DIR}/*.cpp"

3
test/testpaint/Compat.cpp
View File

@ -23,6 +23,7 @@
#include <openrct2/world/Sprite.h>
#include <openrct2/paint/tile_element/TileElement.h>
#include <openrct2/ride/Ride.h>
#include <openrct2/world/Surface.h>
#include "Addresses.h"
#define gRideEntries RCT2_ADDRESS(0x009ACFA4, rct_ride_entry *)
@ -211,7 +212,7 @@ void tile_element_decrement_onride_photo_timout(rct_tile_element * tileElement)
}
}
sint32 map_get_water_height(const rct_tile_element * tileElement)
sint32 surface_get_water_height(const rct_tile_element * tileElement)
{
return tileElement->properties.surface.terrain & TILE_ELEMENT_SURFACE_WATER_HEIGHT_MASK;
}