thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Synchronized pyramid top

Browse source
This commit is contained in:
MysterD 2020-09-23 09:14:17 -07:00
parent 8d5d79809b
commit 81f2102bb0
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/game/behaviors/pyramid_top.inc.c
View file

@ -90,12 +90,24 @@ void bhv_pyramid_top_explode(void) {
o->activeFlags = ACTIVE_FLAG_DEACTIVATED; o->activeFlags = ACTIVE_FLAG_DEACTIVATED;
} }
static u8 bhv_pyramid_top_ignore_if_true(void) {
return (o->oAction != PYRAMID_TOP_ACT_SPINNING);
}
void bhv_pyramid_top_loop(void) { void bhv_pyramid_top_loop(void) {
if (!network_sync_object_initialized(o)) {
struct SyncObject* so = network_init_object(o, SYNC_DISTANCE_ONLY_EVENTS);
so->ignore_if_true = bhv_pyramid_top_ignore_if_true;
network_init_object_field(o, &o->oAction);
network_init_object_field(o, &o->oPrevAction);
network_init_object_field(o, &o->oTimer);
}
switch (o->oAction) { switch (o->oAction) {
case PYRAMID_TOP_ACT_CHECK_IF_SOLVED: case PYRAMID_TOP_ACT_CHECK_IF_SOLVED:
if (o->oPyramidTopPillarsTouched == 4) { if (o->oPyramidTopPillarsTouched == 4) {
play_puzzle_jingle(); play_puzzle_jingle();
o->oAction = PYRAMID_TOP_ACT_SPINNING; o->oAction = PYRAMID_TOP_ACT_SPINNING;
network_send_object(o);
} }
break; break;
@ -147,9 +159,12 @@ void bhv_pyramid_top_fragment_loop(void) {
*/ */
void bhv_pyramid_pillar_touch_detector_loop(void) { void bhv_pyramid_pillar_touch_detector_loop(void) {
cur_obj_become_tangible(); cur_obj_become_tangible();
if (obj_check_if_collided_with_object(o, gMarioObject) == 1) { if ((o->oInteractStatus & INT_STATUS_INTERACTED) || obj_check_if_collided_with_object(o, gMarioStates[0].marioObj) == 1) {
// Increase the pyramid top's count of pillars touched. // Increase the pyramid top's count of pillars touched.
o->parentObj->oPyramidTopPillarsTouched++; o->parentObj->oPyramidTopPillarsTouched++;
o->activeFlags = ACTIVE_FLAG_DEACTIVATED; o->activeFlags = ACTIVE_FLAG_DEACTIVATED;
if (!(o->oInteractStatus & INT_STATUS_INTERACTED)) {
network_send_collect_item(o);
}
} }
} }