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

Sync setHome value in spawn object

Browse source
This commit is contained in:
MysterD 2022-06-02 21:02:43 -07:00
parent 8c92885a7b
commit c0cfc89236
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
levels/bbh/mesh_elevator/model.inc.c
View file

@ -1,4 +1,3 @@
// 0x0701FDB8 - 0x0701FEA8
static const Vtx bbh_seg7_vertex_0701FDB8[] = { static const Vtx bbh_seg7_vertex_0701FDB8[] = {
{{{ -306, 0, 256}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, {{{ -306, 0, 256}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 307, -101, 256}, 0, { 6100, 990}, {0xff, 0xff, 0xff, 0xff}}}, {{{ 307, -101, 256}, 0, { 6100, 990}, {0xff, 0xff, 0xff, 0xff}}},

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

@ -22,6 +22,7 @@ struct SpawnObjectData {
u32 behaviorId; u32 behaviorId;
s16 activeFlags; s16 activeFlags;
s32 rawData[80]; s32 rawData[80];
u8 setHome;
u8 globalPlayerIndex; u8 globalPlayerIndex;
u16 extendedModelId; u16 extendedModelId;
u8 extraFieldCount; 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[0], sizeof(f32));
packet_write(&p, &o->header.gfx.scale[1], 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->header.gfx.scale[2], sizeof(f32));
packet_write(&p, &o->setHome, sizeof(u8));
packet_write(&p, &o->globalPlayerIndex, sizeof(u8)); packet_write(&p, &o->globalPlayerIndex, sizeof(u8));
packet_write(&p, &extendedModelId, sizeof(u16)); 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[0], sizeof(f32));
packet_read(p, &scale[1], sizeof(f32)); packet_read(p, &scale[1], sizeof(f32));
packet_read(p, &scale[2], 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.globalPlayerIndex, sizeof(u8));
packet_read(p, &data.extendedModelId, sizeof(u16)); packet_read(p, &data.extendedModelId, sizeof(u16));
@ -174,6 +177,7 @@ void network_receive_spawn_objects(struct Packet* p) {
o->globalPlayerIndex = data.globalPlayerIndex; o->globalPlayerIndex = data.globalPlayerIndex;
o->coopFlags |= COOP_OBJ_FLAG_NETWORK; o->coopFlags |= COOP_OBJ_FLAG_NETWORK;
o->setHome = data.setHome;
memcpy(o->rawData.asU32, data.rawData, sizeof(u32) * 80); memcpy(o->rawData.asU32, data.rawData, sizeof(u32) * 80);