1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00

Fix rebase

This commit is contained in:
Michał Janiszewski
2016-06-15 23:31:13 +02:00
parent ad1b9265dc
commit 3d4eceb5ca

View File

@@ -28,6 +28,7 @@
#include "../../game.h"
#include "../supports.h"
#include "../../peep/staff.h"
#include "../../object_list.h"
// #3628: Until path_paint is implemented, this variable is used by scrolling_text_setup
// to use the old string arguments array. Remove when scrolling_text_setup is no
@@ -586,7 +587,7 @@ void sub_6A3F61(rct_map_element * map_element, uint16 bp, uint16 height, rct_foo
// Probably drawing benches etc.
rct_drawpixelinfo * dpi = RCT2_GLOBAL(0x140E9A8, rct_drawpixelinfo*);
rct_drawpixelinfo * dpi = unk_140E9A8;
if (dpi->zoom_level <= 1) {
if (!(RCT2_GLOBAL(0x9DEA6F, uint8) & 1)) {
@@ -1010,4 +1011,4 @@ void loc_6A3B57(rct_map_element* mapElement, sint16 height, rct_footpath_entry*
paint_util_set_segment_support_height(SEGMENT_C8, 0xFFFF, 0);
}
}
}