thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Applied platform displacement for entities that a player is standing on

Browse source
This commit is contained in:
MysterD 2020-10-01 22:41:17 -07:00
parent 2c6ab5d4ab
commit e7ad181428
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/pc/network/packets/packet_object.c
View file

@ -7,6 +7,7 @@
#include "behavior_table.h" #include "behavior_table.h"
#include "src/game/memory.h" #include "src/game/memory.h"
#include "src/game/object_helpers.h" #include "src/game/object_helpers.h"
#include "src/game/obj_behaviors.h"
static u8 nextSyncID = 1; static u8 nextSyncID = 1;
struct SyncObject gSyncObjects[MAX_SYNC_OBJECTS] = { 0 }; struct SyncObject gSyncObjects[MAX_SYNC_OBJECTS] = { 0 };
@ -398,6 +399,12 @@ void network_receive_object(struct Packet* p) {
if (gMarioStates[0].heldObj == o) { return; } if (gMarioStates[0].heldObj == o) { return; }
} }
// save old pos for platform displacement
Vec3f oldPos = { 0 };
oldPos[0] = o->oPosX;
oldPos[1] = o->oPosY;
oldPos[2] = o->oPosZ;
// trigger on-received callback // trigger on-received callback
if (so->on_received_pre != NULL && so->o != NULL) { if (so->on_received_pre != NULL && so->o != NULL) {
extern struct Object* gCurrentObject; extern struct Object* gCurrentObject;
@ -426,6 +433,19 @@ void network_receive_object(struct Packet* p) {
(*so->on_received_post)(p->localIndex); (*so->on_received_post)(p->localIndex);
gCurrentObject = tmp; gCurrentObject = tmp;
} }
// apply platform displacement
if (o != NULL) {
Vec3f deltaPos = { 0 };
deltaPos[0] = o->oPosX - oldPos[0];
deltaPos[2] = o->oPosY - oldPos[1];
deltaPos[1] = o->oPosZ - oldPos[2];
for (int i = 0; i < MAX_PLAYERS; i++) {
if (!is_player_active(&gMarioStates[i])) { continue; }
if (gMarioStates[i].marioObj->platform != o) { continue; }
for (int j = 0; j < 3; j++) { gMarioStates[i].pos[j] += deltaPos[j]; }
}
}
} }
void network_forget_sync_object(struct SyncObject* so) { void network_forget_sync_object(struct SyncObject* so) {