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

Fix some sync ID bugs

Browse source
This commit is contained in:
MysterD 2023-03-27 12:29:20 -07:00
parent 73dfbe5e59
commit de6e783c20
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/pc/lua/utils/smlua_obj_utils.c
View file

@ -67,6 +67,7 @@ static struct Object* spawn_object_internal(enum BehaviorId behaviorId, enum Mod
if (doSync && so) {
so->extendedModelId = modelId;
so->o = obj;
so->behavior = (BehaviorScript*) behavior;
struct Object* spawn_objects[] = { obj };
u32 models[] = { loadedModelId };

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

@ -189,11 +189,16 @@ void network_receive_spawn_objects(struct Packet* p) {
// correct the temporary parent with the object itself
if (data.parentId == (u32)-1) { o->parentObj = o; }
if (o->oSyncID != 0 && o->oSyncID >= SYNC_ID_BLOCK_SIZE) {
if (o->oSyncID != 0) {
// check if they've allocated one of their reserved sync objects
struct SyncObject* so = sync_object_get(o->oSyncID);
if (!so) {
sync_object_set_id(o);
so = sync_object_get(o->oSyncID);
}
if (so) {
so->o = o;
so->behavior = behavior;
so->extendedModelId = data.extendedModelId;
so->txEventId = 0;
for (s32 j = 0; j < MAX_PLAYERS; j++) {