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

Synchronized star entity interaction

Browse source 
Fixed error in packet_collect_star which would prevent the star from
disappearing when it should on remote.
This commit is contained in:
MysterD 2020-09-08 09:01:35 -07:00
parent 3b946eb5e1
commit ef95d6820b
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/pc/network/packets/packet_collect_coin.c
View file

@ -21,9 +21,9 @@ static u8 remoteCoinIds[MAX_REMOTE_COIN_IDS] = { 0 };
static u8 onRemoteCoinId = 0; static u8 onRemoteCoinId = 0;
static f32 dist_to_pos(struct Object* o, f32* pos) { static f32 dist_to_pos(struct Object* o, f32* pos) {
f32 x = (f32)o->oPosX - pos[0]; x *= x; f32 x = o->oPosX - pos[0]; x *= x;
f32 y = (f32)o->oPosY - pos[1]; y *= y; f32 y = o->oPosY - pos[1]; y *= y;
f32 z = (f32)o->oPosZ - pos[2]; z *= z; f32 z = o->oPosZ - pos[2]; z *= z;
return (f32)sqrt(x + y + z); return (f32)sqrt(x + y + z);
} }

6
src/pc/network/packets/packet_collect_item.c
View file

@ -18,9 +18,9 @@ static u8 remoteItemIds[MAX_REMOTE_ITEM_IDS] = { 0 };
static u8 onRemoteItemId = 0; static u8 onRemoteItemId = 0;
static f32 dist_to_pos(struct Object* o, f32* pos) { static f32 dist_to_pos(struct Object* o, f32* pos) {
f32 x = (f32)o->oPosX - pos[0]; x *= x; f32 x = o->oPosX - pos[0]; x *= x;
f32 y = (f32)o->oPosY - pos[1]; y *= y; f32 y = o->oPosY - pos[1]; y *= y;
f32 z = (f32)o->oPosZ - pos[2]; z *= z; f32 z = o->oPosZ - pos[2]; z *= z;
return (f32)sqrt(x + y + z); return (f32)sqrt(x + y + z);
} }

16
src/pc/network/packets/packet_collect_star.c
View file

@ -12,14 +12,14 @@
extern s16 gCurrSaveFileNum; extern s16 gCurrSaveFileNum;
extern s16 gCurrCourseNum; extern s16 gCurrCourseNum;
static f32 dist_to_pos(struct Object* o, u32* pos) { static f32 dist_to_pos(struct Object* o, f32* pos) {
f32 x = (f32)o->oPosX - pos[0]; x *= x; f32 x = o->oPosX - pos[0]; x *= x;
f32 y = (f32)o->oPosY - pos[1]; y *= y; f32 y = o->oPosY - pos[1]; y *= y;
f32 z = (f32)o->oPosZ - pos[2]; z *= z; f32 z = o->oPosZ - pos[2]; z *= z;
return (f32)sqrt(x + y + z); return (f32)sqrt(x + y + z);
} }
static struct Object* find_nearest_star(const BehaviorScript* behavior, u32* pos, float minDist) { static struct Object* find_nearest_star(const BehaviorScript* behavior, f32* pos, f32 minDist) {
uintptr_t* behaviorAddr = segmented_to_virtual(behavior); uintptr_t* behaviorAddr = segmented_to_virtual(behavior);
struct Object* closestObj = NULL; struct Object* closestObj = NULL;
struct Object* obj; struct Object* obj;
@ -51,7 +51,7 @@ void network_send_collect_star(struct Object* o, s16 coinScore, s16 starIndex) {
packet_write(&p, &gCurrSaveFileNum, sizeof(s16)); packet_write(&p, &gCurrSaveFileNum, sizeof(s16));
packet_write(&p, &gCurrCourseNum, sizeof(s16)); packet_write(&p, &gCurrCourseNum, sizeof(s16));
packet_write(&p, &o->oPosX, sizeof(u32) * 3); packet_write(&p, &o->oPosX, sizeof(f32) * 3);
packet_write(&p, &behaviorId, sizeof(enum BehaviorId)); packet_write(&p, &behaviorId, sizeof(enum BehaviorId));
packet_write(&p, &coinScore, sizeof(s16)); packet_write(&p, &coinScore, sizeof(s16));
packet_write(&p, &starIndex, sizeof(s16)); packet_write(&p, &starIndex, sizeof(s16));
@ -60,7 +60,7 @@ void network_send_collect_star(struct Object* o, s16 coinScore, s16 starIndex) {
} }
void network_receive_collect_star(struct Packet* p) { void network_receive_collect_star(struct Packet* p) {
u32 pos[3] = { 0 }; f32 pos[3] = { 0 };
enum BehaviorId behaviorId; enum BehaviorId behaviorId;
s16 coinScore, starIndex; s16 coinScore, starIndex;
s16 lastSaveFileNum = gCurrSaveFileNum; s16 lastSaveFileNum = gCurrSaveFileNum;
@ -68,7 +68,7 @@ void network_receive_collect_star(struct Packet* p) {
packet_read(p, &gCurrSaveFileNum, sizeof(s16)); packet_read(p, &gCurrSaveFileNum, sizeof(s16));
packet_read(p, &gCurrCourseNum, sizeof(s16)); packet_read(p, &gCurrCourseNum, sizeof(s16));
packet_read(p, &pos, sizeof(u32) * 3); packet_read(p, &pos, sizeof(f32) * 3);
packet_read(p, &behaviorId, sizeof(enum BehaviorId)); packet_read(p, &behaviorId, sizeof(enum BehaviorId));
packet_read(p, &coinScore, sizeof(s16)); packet_read(p, &coinScore, sizeof(s16));
packet_read(p, &starIndex, sizeof(s16)); packet_read(p, &starIndex, sizeof(s16));