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

Synchronized behParams for macroObjects on late join

Browse source
This commit is contained in:
MysterD 2022-03-29 18:52:53 -07:00
parent 217a969208
commit d17aa69052
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/pc/network/packets/packet_level_macro.c
View file

@ -87,15 +87,7 @@ static void network_send_level_macro_area(struct NetworkPlayer* destNp, u8 areaI
s16* respawnInfo = macroObjList++; s16* respawnInfo = macroObjList++;
// check for special cases // check for special cases
const BehaviorScript* behavior = MacroObjectPresets[presetID].behavior; if (*respawnInfo != 0) {
bool writable = (*respawnInfo != 0) && (
(behavior == bhvCoinFormation) ||
(behavior == bhvGoombaTripletSpawner) ||
(behavior == bhvWoodenPost) ||
(behavior == bhvBobomb)
);
if (writable) {
*macroSpecialCount = *macroSpecialCount + 1; *macroSpecialCount = *macroSpecialCount + 1;
u16 offset = respawnInfo - area->macroObjects; u16 offset = respawnInfo - area->macroObjects;
packet_write(&p, &offset, sizeof(u16)); packet_write(&p, &offset, sizeof(u16));
@ -227,13 +219,9 @@ void network_receive_level_macro(struct Packet* p) {
} }
} }
LOG_INFO("rx macro special: goomba triplet"); LOG_INFO("rx macro special: goomba triplet");
} else if (behavior == bhvWoodenPost) {
o->oBehParams |= WOODEN_POST_BP_NO_COINS_MASK;
LOG_INFO("rx macro special: wooden post");
} else if (behavior == bhvBobomb) {
o->oBehParams |= (0x1 << 8);
LOG_INFO("rx macro special: bobomb");
} else { } else {
o->oBehParams = (((*respawnInfo) & 0x00FF) << 16) + ((*respawnInfo) & 0xFF00);
o->oBehParams2ndByte = (*respawnInfo) & 0x00FF;
LOG_INFO("rx macro special: %u", get_id_from_behavior(behavior)); LOG_INFO("rx macro special: %u", get_id_from_behavior(behavior));
} }
} }