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

Rewrote to use map_elements 

not tested
This commit is contained in:
Duncan 2014-08-19 12:48:00 +01:00
parent b51842078a
commit 56e6028a56
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/game.c
View File

@ -918,20 +918,18 @@ static void game_handle_input_mouse(int x, int y, int state)
} }
} }
else if ((ebx & 0xFF) == 3){ else if ((ebx & 0xFF) == 3){
//Don't think it is a map element. rct_map_element* map_element = (rct_map_element*)spr;
rct_map_element_properties* map_element = (rct_map_element_properties*)spr;
uint32 edx = (uint32)spr; if (!((map_element->type & MAP_ELEMENT_TYPE_MASK) == MAP_ELEMENT_TYPE_ENTRANCE)){
eax = RCT2_ADDRESS(0x0099BA64, uint8)[16 * map_element->properties.track.type)];
if (!((map_element->track.type & 0x3C) == 16)){ if (eax & 0x10){
eax = RCT2_ADDRESS(0x0099BA64, uint8)[16 * (*(uint8*)(edx + 4))]; //Open ride window part way through.
if (!(eax & 0x10)){ RCT2_CALLPROC_X(0x6ACC28, map_element->properties.track.ride_index, ebx, ecx, (int)map_element, esi, edi, ebp);
eax = *((uint8*)(edx + 7));
RCT2_CALLPROC_X(0x6ACC28, eax, ebx, ecx, edx, esi, edi, ebp);
break; break;
} }
} }
//Open ride window //Open ride window part way through
RCT2_CALLPROC_X(0x6ACCCE, *(uint8*)(edx + 7), ((*(uint8*)(edx + 5)) & 0x70) >> 4, ecx, edx, esi, edi, ebp); RCT2_CALLPROC_X(0x6ACCCE, map_element->properties.track.ride_index, (map_element->properties.track.sequence & 0x70) >> 4, ecx, (int)map_element, esi, edi, ebp);
} }
else if ((ebx & 0xFF) == 8){ else if ((ebx & 0xFF) == 8){
window_park_entrance_open(); window_park_entrance_open();