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

Resynchronized HMC controllable platform

Browse source
This commit is contained in:
MysterD 2020-10-01 22:41:27 -07:00
parent e7ad181428
commit 1bcaed297c
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/game/behaviors/controllable_platform.inc.c
View file

@ -28,10 +28,11 @@ void bhv_controllable_platform_sub_loop(void) {
if (o->oTimer < 30) if (o->oTimer < 30)
break; break;
if (cur_obj_is_any_player_on_platform()) { if (gMarioStates[0].marioObj->platform == o) {
D_80331694 = o->oBehParams2ndByte; D_80331694 = o->oBehParams2ndByte;
o->oAction = 1; o->oAction = 1;
cur_obj_play_sound_2(SOUND_GENERAL_MOVING_PLATFORM_SWITCH); cur_obj_play_sound_2(SOUND_GENERAL_MOVING_PLATFORM_SWITCH);
network_send_object(o->parentObj);
} }
break; break;
@ -73,8 +74,20 @@ void bhv_controllable_platform_init(void) {
o->oControllablePlatformUnkFC = o->oPosY; o->oControllablePlatformUnkFC = o->oPosY;
network_init_object(o, 4000.0f); network_init_object(o, SYNC_DISTANCE_ONLY_EVENTS);
network_init_object_field(o, &D_80331694); network_init_object_field(o, &D_80331694);
network_init_object_field(o, &o->oPosX);
network_init_object_field(o, &o->oPosY);
network_init_object_field(o, &o->oPosZ);
network_init_object_field(o, &o->oVelX);
network_init_object_field(o, &o->oVelY);
network_init_object_field(o, &o->oVelZ);
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->activeFlags);
network_init_object_field(o, &o->header.gfx.node.flags);
network_init_object_field(o, &o->oControllablePlatformUnkF8); network_init_object_field(o, &o->oControllablePlatformUnkF8);
network_init_object_field(o, &o->oControllablePlatformUnkFC); network_init_object_field(o, &o->oControllablePlatformUnkFC);
network_init_object_field(o, &o->oControllablePlatformUnk100); network_init_object_field(o, &o->oControllablePlatformUnk100);
@ -190,6 +203,8 @@ void bhv_controllable_platform_loop(void) {
o->oVelX = 0; o->oVelX = 0;
o->oVelZ = 0; o->oVelZ = 0;
s8 oldD_80331694 = D_80331694;
switch (D_80331694) { switch (D_80331694) {
case 0: case 0:
o->oFaceAnglePitch /= 2; o->oFaceAnglePitch /= 2;
@ -259,6 +274,7 @@ void bhv_controllable_platform_loop(void) {
controllablePlatformSubs[i]->oVelX = 0; controllablePlatformSubs[i]->oVelX = 0;
controllablePlatformSubs[i]->oVelZ = 0; controllablePlatformSubs[i]->oVelZ = 0;
} }
network_send_object(o);
} }
break; break;
} }
@ -268,4 +284,8 @@ void bhv_controllable_platform_loop(void) {
o->oPosZ += o->oVelZ; o->oPosZ += o->oVelZ;
if (D_80331694 != 0 && D_80331694 != 6) if (D_80331694 != 0 && D_80331694 != 6)
cur_obj_play_sound_1(SOUND_ENV_ELEVATOR2); cur_obj_play_sound_1(SOUND_ENV_ELEVATOR2);
if (network_owns_object(o) && oldD_80331694 != D_80331694) {
network_send_object(o);
}
} }