etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 20:15:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Resynchronized WDW water level and water diamonds

Browse source
This commit is contained in:
MysterD 2022-03-30 18:10:36 -07:00
parent 9d16605c3b
commit 71dd7b8d97
4 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/game/behaviors/wdw_water_level.inc.c
View file

@ -1,7 +1,27 @@
// wdw_water_level.c.inc
static u32 sWaterDiamondPicked = 0;
static void bhv_init_changing_water_level_on_received_post(UNUSED u8 fromLocalIndex) {
struct SyncObject* diamondSo = &gSyncObjects[sWaterDiamondPicked];
if (diamondSo == NULL || diamondSo->behavior != bhvWaterLevelDiamond) { return; }
struct Object* diamond = get_sync_objects_object(sWaterDiamondPicked);
if (diamond == NULL || diamond->behavior != bhvWaterLevelDiamond) { return; }
diamond->oAction = WATER_LEVEL_DIAMOND_ACT_CHANGE_WATER_LEVEL;
gWDWWaterLevelChanging = 1;
}
// called when WDW is loaded.
void bhv_init_changing_water_level_loop(void) {
if (!network_sync_object_initialized(o)) {
sWaterDiamondPicked = 0;
struct SyncObject* so = network_init_object(o, SYNC_DISTANCE_ONLY_EVENTS);
if (so != NULL) {
so->on_received_post = bhv_init_changing_water_level_on_received_post;
network_init_object_field(o, &sWaterDiamondPicked);
}
}
if (gCurrentObject->oAction == 0) {
if (gEnvironmentRegions != NULL)
gCurrentObject->oAction++;
@ -17,15 +37,10 @@ void bhv_water_level_diamond_loop(void) {
struct MarioState* marioState = nearest_mario_state_to_object(o);
struct Object* player = marioState->marioObj;
struct Object* manager = cur_obj_nearest_object_with_behavior(bhvInitializeChangingWaterLevel);
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_with_size(o, &gWDWWaterLevelChanging, 16);
}
if (gEnvironmentRegions != NULL) {
@ -37,13 +52,14 @@ void bhv_water_level_diamond_loop(void) {
o->oAction++; // Sets to WATER_LEVEL_DIAMOND_ACT_IDLE
break;
case WATER_LEVEL_DIAMOND_ACT_IDLE:
if (obj_check_if_collided_with_object(o, player)) {
if (marioState == &gMarioStates[0] && obj_check_if_collided_with_object(o, player)) {
if (gWDWWaterLevelChanging == 0) {
o->oAction++; // Sets to WATER_LEVEL_DIAMOND_ACT_CHANGE_WATER_LEVEL
gWDWWaterLevelChanging = 1;
network_send_object(o);
if (o->oSyncID != 0 && gSyncObjects[o->oSyncID].behavior == o->behavior) {
gSyncObjects[o->oSyncID].lastReliablePacketIsStale = false;
if (manager != NULL && o->oSyncID != 0) {
sWaterDiamondPicked = o->oSyncID;
network_send_object(manager);
}
}
}

1
src/pc/network/packets/packet.h
View file

@ -166,6 +166,7 @@ void network_update_player(void);
void network_receive_player(struct Packet* p);
// packet_object.c
struct Object* get_sync_objects_object(u32 index);
struct Packet* get_last_sync_ent_reliable_packet(u8 syncId);
void forget_ent_reliable_packet(struct Object* o);
void network_override_object(u8 syncId, struct Object* o);

3
src/pc/network/packets/packet_area.c
View file

@ -159,6 +159,9 @@ void network_receive_area(struct Packet* p) {
packet_read(p, &gNetworkAreaTimer, sizeof(u32));
gNetworkAreaTimerClock = clock_elapsed_ticks() - gNetworkAreaTimer;
packet_read(p, gEnvironmentLevels, sizeof(s32));
if (gCurrLevelNum == LEVEL_WDW) {
gEnvironmentRegions[6] = *gEnvironmentLevels;
}
// read control timer variables
bool levelControlTimerRunning = false;

4
src/pc/network/packets/packet_object.c
View file

@ -18,6 +18,10 @@ struct SyncObject gSyncObjects[MAX_SYNC_OBJECTS] = { 0 };
struct Packet sLastSyncEntReliablePacket[MAX_SYNC_OBJECTS] = { 0 };
u8 sNextSyncId = 0;
struct Object* get_sync_objects_object(u32 index) {
return gSyncObjects[index].o;
}
struct Packet* get_last_sync_ent_reliable_packet(u8 syncId) {
return &sLastSyncEntReliablePacket[syncId];
}