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

Removed two-player hack for held objects

Browse source
This commit is contained in:
MysterD 2020-10-13 18:12:33 -07:00
parent 9f1d03d5b4
commit f230d4fe63
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -192,7 +192,6 @@ void network_send_player(u8 localIndex) {
packet_init(&p, PACKET_PLAYER, false, false); packet_init(&p, PACKET_PLAYER, false, false);
packet_write(&p, &gNetworkPlayers[localIndex].globalIndex, sizeof(u8)); packet_write(&p, &gNetworkPlayers[localIndex].globalIndex, sizeof(u8));
packet_write(&p, &data, sizeof(struct PacketPlayerData)); packet_write(&p, &data, sizeof(struct PacketPlayerData));
// two-player hack: should be network_send_to_all_except()
network_send(&p); network_send(&p);
} }
@ -252,18 +251,15 @@ void network_receive_player(struct Packet* p) {
} }
// find and set their held object // find and set their held object
if (heldSyncID != 0 && gSyncObjects[heldSyncID].o != NULL) { m->heldObj = (heldSyncID != 0) ? gSyncObjects[heldSyncID].o : NULL;
// TODO: do we have to move graphics nodes around to make this visible? if (m->heldObj != NULL) {
struct Object* heldObj = gSyncObjects[heldSyncID].o; if (np->globalIndex < gNetworkPlayerLocal->globalIndex) {
if (gMarioStates[0].heldObj == heldObj && gNetworkType == NT_CLIENT) { // two-player hack: needs priority // drop the object if a higher priority player is holding our object
mario_drop_held_object(&gMarioStates[0]); mario_drop_held_object(&gMarioStates[0]);
force_idle_state(&gMarioStates[0]); force_idle_state(&gMarioStates[0]);
} }
m->heldObj = heldObj; m->heldObj->oHeldState = HELD_HELD;
heldObj->oHeldState = HELD_HELD; m->heldObj->heldByPlayerIndex = np->localIndex;
heldObj->heldByPlayerIndex = 1;
} else {
m->heldObj = NULL;
} }
// find and set their held-by object // find and set their held-by object