mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #647 from duncanspumpkin/fix_ride_construct
Added construct dropdown function fixes #638.
This commit is contained in:
commit
71c49a9591
|
@ -78,7 +78,7 @@ static void* window_construction_events[] = {
|
||||||
(void*)0x6C6E14,
|
(void*)0x6C6E14,
|
||||||
(void*)0x6C7934,
|
(void*)0x6C7934,
|
||||||
(void*)0x6C6E6A,
|
(void*)0x6C6E6A,
|
||||||
window_construction_emptysub,
|
(void*)0x6C78CD,
|
||||||
window_construction_emptysub,
|
window_construction_emptysub,
|
||||||
(void*)0x6C8374,
|
(void*)0x6C8374,
|
||||||
window_construction_emptysub,
|
window_construction_emptysub,
|
||||||
|
@ -110,8 +110,10 @@ static void* window_construction_events[] = {
|
||||||
*/
|
*/
|
||||||
rct_window *window_construction_open()
|
rct_window *window_construction_open()
|
||||||
{
|
{
|
||||||
int eax, ebx, ecx, edx, esi, edi, ebp;
|
//int eax, ebx, ecx, edx, esi, edi, ebp;
|
||||||
|
//RCT2_CALLFUNC_X(0x006CB481, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
|
||||||
|
//return (rct_window*)esi;
|
||||||
|
|
||||||
int ride_id = RCT2_GLOBAL(0xF440A7, uint8);
|
int ride_id = RCT2_GLOBAL(0xF440A7, uint8);
|
||||||
sub_6b2fa9(ride_id);
|
sub_6b2fa9(ride_id);
|
||||||
|
|
||||||
|
@ -184,9 +186,6 @@ rct_window *window_construction_open()
|
||||||
RCT2_GLOBAL(0x00F44159, uint8) = 0;
|
RCT2_GLOBAL(0x00F44159, uint8) = 0;
|
||||||
RCT2_GLOBAL(0x00F4415C, uint8) = 0;
|
RCT2_GLOBAL(0x00F4415C, uint8) = 0;
|
||||||
return w;
|
return w;
|
||||||
|
|
||||||
RCT2_CALLFUNC_X(0x006CB481, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
|
|
||||||
return (rct_window*)esi;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void window_construction_close(){
|
void window_construction_close(){
|
||||||
|
|
Loading…
Reference in New Issue