mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2025-10-30 08:01:01 +00:00
fix star spawn cutscene softlock
This commit is contained in:
parent
268e759829
commit
e54aec5407
2 changed files with 4 additions and 2 deletions
|
|
@ -169,7 +169,9 @@ void bhv_star_spawn_loop(void) {
|
||||||
o->oInteractStatus = 0;
|
o->oInteractStatus = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
network_send_object(o);
|
struct SyncObject* so = sync_object_get(o->oSyncID);
|
||||||
|
so->owned = sync_object_should_own(so->id);
|
||||||
|
if (so->owned) { network_send_object(o); }
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
spawn_star_number();
|
spawn_star_number();
|
||||||
|
|
|
||||||
|
|
@ -436,7 +436,7 @@ void network_receive_object(struct Packet* p) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// apply platform displacement
|
// apply platform displacement
|
||||||
if (o != NULL) {
|
if (o != NULL && o->collisionData) {
|
||||||
Vec3f deltaPos = { 0 };
|
Vec3f deltaPos = { 0 };
|
||||||
deltaPos[0] = o->oPosX - oldPos[0];
|
deltaPos[0] = o->oPosX - oldPos[0];
|
||||||
deltaPos[2] = o->oPosY - oldPos[1];
|
deltaPos[2] = o->oPosY - oldPos[1];
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue