From 2468fb5ddf470a3989be94d8b72a993ea2fb3ada Mon Sep 17 00:00:00 2001 From: Duncan Date: Wed, 14 Jan 2015 12:56:49 +0000 Subject: [PATCH] started peep_update_buying --- src/peep/peep.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/peep/peep.c b/src/peep/peep.c index d240117061..41d6d289fb 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -658,6 +658,7 @@ static void peep_update_queuing(rct_peep* peep){ peep_decrement_num_riders(peep); peep->state = PEEP_STATE_1; peep_window_state_update(peep); + return; } RCT2_CALLPROC_X(0x693C9E, 0, 0, 0, 0, (int)peep, 0, 0); @@ -1313,6 +1314,30 @@ static void peep_update_walking_break_scenery(rct_peep* peep){ return; } +/* rct2: 0x006912A3 */ +static void peep_update_buying(rct_peep* peep) +{ + RCT2_CALLPROC_X(0x006912A3, 0, 0, 0, 0, (int)peep, 0, 0); + return; + if (!sub_68F3AE(peep))return; + + rct_ride* ride = GET_RIDE(peep->current_ride); + if (ride->type == RIDE_TYPE_NULL || ride->status != RIDE_STATUS_OPEN){ + peep_decrement_num_riders(peep); + peep->state = PEEP_STATE_FALLING; + peep_window_state_update(peep); + return; + } + + if (ride->type == RIDE_TYPE_ATM){ + //6913D9 + } + + if (peep->sub_state == 1){ + //69138F + } + //6912E9 +} /* rct2: 0x0069030A */ static void peep_update_walking(rct_peep* peep){ //RCT2_CALLPROC_X(0x0069030A, 0, 0, 0, 0, (int)peep, 0, 0); @@ -1695,7 +1720,7 @@ static void peep_update(rct_peep *peep) RCT2_CALLPROC_X(0x006C0E8B, 0, 0, 0, 0, (int)peep, 0, 0); break; case PEEP_STATE_BUYING: - RCT2_CALLPROC_X(0x006912A3, 0, 0, 0, 0, (int)peep, 0, 0); + peep_update_buying(peep); break; case PEEP_STATE_WATCHING: peep_update_watching(peep); @@ -2457,4 +2482,4 @@ void peep_set_map_tooltip(rct_peep *peep) RCT2_GLOBAL(RCT2_ADDRESS_MAP_TOOLTIP_ARGS + 8, uint32) = arg0; RCT2_GLOBAL(RCT2_ADDRESS_MAP_TOOLTIP_ARGS + 12, uint32) = arg1; } -} \ No newline at end of file +}