From c0cfc8923613300b58870e36f4c00fe121b3ee57 Mon Sep 17 00:00:00 2001 From: MysterD Date: Thu, 2 Jun 2022 21:02:43 -0700 Subject: [PATCH] Sync setHome value in spawn object --- levels/bbh/mesh_elevator/model.inc.c | 1 - src/pc/network/packets/packet_spawn_objects.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/levels/bbh/mesh_elevator/model.inc.c b/levels/bbh/mesh_elevator/model.inc.c index be1b7a5ed..5fc1ddc44 100644 --- a/levels/bbh/mesh_elevator/model.inc.c +++ b/levels/bbh/mesh_elevator/model.inc.c @@ -1,4 +1,3 @@ -// 0x0701FDB8 - 0x0701FEA8 static const Vtx bbh_seg7_vertex_0701FDB8[] = { {{{ -306, 0, 256}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, {{{ 307, -101, 256}, 0, { 6100, 990}, {0xff, 0xff, 0xff, 0xff}}}, diff --git a/src/pc/network/packets/packet_spawn_objects.c b/src/pc/network/packets/packet_spawn_objects.c index c79a644bf..c1ef8b848 100644 --- a/src/pc/network/packets/packet_spawn_objects.c +++ b/src/pc/network/packets/packet_spawn_objects.c @@ -22,6 +22,7 @@ struct SpawnObjectData { u32 behaviorId; s16 activeFlags; s32 rawData[80]; + u8 setHome; u8 globalPlayerIndex; u16 extendedModelId; u8 extraFieldCount; @@ -88,6 +89,7 @@ void network_send_spawn_objects_to(u8 sendToLocalIndex, struct Object* objects[] packet_write(&p, &o->header.gfx.scale[0], sizeof(f32)); packet_write(&p, &o->header.gfx.scale[1], sizeof(f32)); packet_write(&p, &o->header.gfx.scale[2], sizeof(f32)); + packet_write(&p, &o->setHome, sizeof(u8)); packet_write(&p, &o->globalPlayerIndex, sizeof(u8)); packet_write(&p, &extendedModelId, sizeof(u16)); } @@ -124,6 +126,7 @@ void network_receive_spawn_objects(struct Packet* p) { packet_read(p, &scale[0], sizeof(f32)); packet_read(p, &scale[1], sizeof(f32)); packet_read(p, &scale[2], sizeof(f32)); + packet_read(p, &data.setHome, sizeof(u8)); packet_read(p, &data.globalPlayerIndex, sizeof(u8)); packet_read(p, &data.extendedModelId, sizeof(u16)); @@ -174,6 +177,7 @@ void network_receive_spawn_objects(struct Packet* p) { o->globalPlayerIndex = data.globalPlayerIndex; o->coopFlags |= COOP_OBJ_FLAG_NETWORK; + o->setHome = data.setHome; memcpy(o->rawData.asU32, data.rawData, sizeof(u32) * 80);