Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronized WDW water level changers

This commit is contained in:
MysterD 2020-10-06 20:28:44 -07:00
parent baed6a66b5
commit d813288e71
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/game/behaviors/wdw_water_level.inc.c
View File

@ -14,6 +14,21 @@ void bhv_init_changing_water_level_loop(void) {
} }
void bhv_water_level_diamond_loop(void) { void bhv_water_level_diamond_loop(void) {
struct MarioState* marioState = nearest_mario_state_to_object(o);
struct Object* player = marioState->marioObj;
if (!network_sync_object_initialized(o)) {
network_init_object(o, SYNC_DISTANCE_ONLY_EVENTS);
network_init_object_field(o, &o->oAction);
network_init_object_field(o, &o->oPrevAction);
network_init_object_field(o, &o->oTimer);
network_init_object_field(o, &o->oWaterLevelTriggerTargetWaterLevel);
network_init_object_field(o, &o->oAngleVelYaw);
network_init_object_field(o, &o->oFaceAngleYaw);
network_init_object_field(o, &gWDWWaterLevelChanging);
}
if (gEnvironmentRegions != NULL) { if (gEnvironmentRegions != NULL) {
switch (o->oAction) { switch (o->oAction) {
case WATER_LEVEL_DIAMOND_ACT_INIT: case WATER_LEVEL_DIAMOND_ACT_INIT:
@ -23,10 +38,11 @@ void bhv_water_level_diamond_loop(void) {
o->oAction++; // Sets to WATER_LEVEL_DIAMOND_ACT_IDLE o->oAction++; // Sets to WATER_LEVEL_DIAMOND_ACT_IDLE
break; break;
case WATER_LEVEL_DIAMOND_ACT_IDLE: case WATER_LEVEL_DIAMOND_ACT_IDLE:
if (obj_check_if_collided_with_object(o, gMarioObject)) { if (obj_check_if_collided_with_object(o, player)) {
if (gWDWWaterLevelChanging == 0) { if (gWDWWaterLevelChanging == 0) {
o->oAction++; // Sets to WATER_LEVEL_DIAMOND_ACT_CHANGE_WATER_LEVEL o->oAction++; // Sets to WATER_LEVEL_DIAMOND_ACT_CHANGE_WATER_LEVEL
gWDWWaterLevelChanging = 1; gWDWWaterLevelChanging = 1;
network_send_object(o);
} }
} }
break; break;
@ -53,7 +69,7 @@ void bhv_water_level_diamond_loop(void) {
} }
break; break;
case WATER_LEVEL_DIAMOND_ACT_IDLE_SPINNING: case WATER_LEVEL_DIAMOND_ACT_IDLE_SPINNING:
if (!obj_check_if_collided_with_object(o, gMarioObject)) { if (!obj_check_if_collided_with_object(o, player)) {
gWDWWaterLevelChanging = 0; gWDWWaterLevelChanging = 0;
o->oAction = WATER_LEVEL_DIAMOND_ACT_IDLE; o->oAction = WATER_LEVEL_DIAMOND_ACT_IDLE;
o->oAngleVelYaw = 0; o->oAngleVelYaw = 0;