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

Integrate remaining address in entrance.c

This commit is contained in:
duncanspumpkin 2016-09-15 19:39:57 +01:00
parent b9a867b6d6
commit 4473fcb275
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/paint/map_element/entrance.c
View File

@ -14,7 +14,6 @@
*****************************************************************************/
#pragma endregion
#include "../../addresses.h"
#include "../../config.h"
#include "../../game.h"
#include "../../interface/viewport.h"
@ -252,11 +251,8 @@ void entrance_paint(uint8 direction, int height, rct_map_element* map_element){
if (gCurrentViewportFlags & VIEWPORT_FLAG_PATH_HEIGHTS &&
dpi->zoom_level == 0){
uint32 ebx =
(map_element->properties.entrance.type << 4) |
(map_element->properties.entrance.index & 0xF);
if (RCT2_ADDRESS(0x0097B974, uint8)[ebx] & 0xF){
if (entrance_get_directions(map_element) & 0xF){
int z = map_element->base_height * 8 + 3;
uint32 image_id = 0x20101689 + get_height_marker_offset() + (z / 16);

2
src/world/footpath.c
View File

@ -82,7 +82,7 @@ static const uint8 connected_path_count[] = {
4, // 0b1111
};
static int entrance_get_directions(rct_map_element *mapElement)
int entrance_get_directions(rct_map_element *mapElement)
{
uint8 entranceType = mapElement->properties.entrance.type;
uint8 sequence = mapElement->properties.entrance.index & 0x0F;

1
src/world/footpath.h
View File

@ -97,6 +97,7 @@ uint8 footpath_element_get_path_scenery_index(rct_map_element *mapElement);
bool footpath_element_path_scenery_is_ghost(rct_map_element *mapElement);
void footpath_scenery_set_is_ghost(rct_map_element *mapElement, bool isGhost);
void footpath_remove_edges_at(int x, int y, rct_map_element *mapElement);
int entrance_get_directions(rct_map_element *mapElement);
rct_footpath_entry *get_footpath_entry(int entryIndex);