diff --git a/network.sh b/network.sh index 75624558..84bbdda0 100644 --- a/network.sh +++ b/network.sh @@ -2,4 +2,4 @@ set -e make BETTERCAMERA=1 NODRAWINGDISTANCE=1 DEBUG=1 IMMEDIATELOAD=1 ./build/us_pc/sm64.us.f3dex2e.exe --server --configfile sm64config_server.txt & #./build/us_pc/sm64.us.f3dex2e.exe --client --configfile sm64config_client.txt & -winpty cgdb ./build/us_pc/sm64.us.f3dex2e.exe -ex 'break debug_breakpoint_here' -ex 'run --client --configfile sm64config_client.txt' -ex 'quit' +winpty cgdb ./build/us_pc/sm64.us.f3dex2e.exe -ex 'break debug_breakpoint_here' -ex 'run --client --configfile sm64config_client.txt' -ex 'quit' diff --git a/src/game/behaviors/chain_chomp.inc.c b/src/game/behaviors/chain_chomp.inc.c index 669e2c2e..07fc57ec 100644 --- a/src/game/behaviors/chain_chomp.inc.c +++ b/src/game/behaviors/chain_chomp.inc.c @@ -493,6 +493,8 @@ static void chain_chomp_act_unload_chain(void) { void bhv_chain_chomp_update(void) { if (o->oSyncID == 0) { network_init_object(o, 1000.0f); + network_init_object_field(o, &o->oChainChompUnk104); + network_init_object_field(o, &o->header.gfx.unk38.animFrame); } switch (o->oAction) { diff --git a/src/pc/network/packets/packet_object.c b/src/pc/network/packets/packet_object.c index 183b9206..f2678cbc 100644 --- a/src/pc/network/packets/packet_object.c +++ b/src/pc/network/packets/packet_object.c @@ -2,6 +2,7 @@ #include "../network.h" #include "object_fields.h" #include "object_constants.h" +#include "behavior_data.h" u8 nextSyncID = 1; struct SyncObject syncObjects[MAX_SYNC_OBJECTS] = { 0 }; @@ -60,6 +61,7 @@ void network_send_object(struct Object* o) { packet_write(&p, &o->oInteractStatus, 4); packet_write(&p, &o->oHeldState, 4); packet_write(&p, &o->oMoveAngleYaw, 4); + packet_write(&p, &o->oTimer, 4); packet_write(&p, &so->extraFieldCount, 1); for (int i = 0; i < so->extraFieldCount; i++) { @@ -132,6 +134,7 @@ void network_receive_object(struct Packet* p) { packet_read(p, &o->oInteractStatus, 4); packet_read(p, &o->oHeldState, 4); packet_read(p, &o->oMoveAngleYaw, 4); + packet_read(p, &o->oTimer, 4); // write extra fields u8 extraFields = 0;