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

Fixed late join sync for goomba triplets

Browse source
This commit is contained in:
MysterD 2021-08-23 00:02:46 -07:00
parent 8fa8fc4799
commit e0cb832c21
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/behaviors/goomba.inc.c
View file

@ -147,7 +147,7 @@ static void goomba_begin_jump(void) {
* this goomba died. This prevents it from spawning again when mario leaves and
* comes back.
*/
static void mark_goomba_as_dead(void) {
void mark_goomba_as_dead(void) {
if (o->parentObj != o) {
set_object_respawn_info_bits(o->parentObj,
(o->oBehParams2ndByte & GOOMBA_BP_TRIPLET_FLAG_MASK) >> 2);

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

@ -94,6 +94,12 @@ static void network_send_level_macro_area(struct NetworkPlayer* destNp, u8 areaI
packet_write(&p, &offset, sizeof(u16));
packet_write(&p, respawnInfo, sizeof(s16));
LOG_INFO("tx macro special: offset %d, respawnInfo %d", offset, *respawnInfo);
} else if ((behavior == bhvGoombaTripletSpawner) && *respawnInfo != 0) {
*macroSpecialCount = *macroSpecialCount + 1;
u16 offset = respawnInfo - area->macroObjects;
packet_write(&p, &offset, sizeof(u16));
packet_write(&p, respawnInfo, sizeof(s16));
LOG_INFO("tx macro special: offset %d, respawnInfo %d", offset, *respawnInfo);
}
}
@ -196,6 +202,22 @@ void network_receive_level_macro(struct Packet* p) {
}
}
LOG_INFO("rx macro special: coin formation");
} else if (behavior == bhvGoombaTripletSpawner) {
for (int i = 0; i < OBJECT_POOL_CAPACITY; i++) {
struct Object* o2 = &gObjectPool[i];
if (o2->parentObj != o) { continue; }
if (o2 == o) { continue; }
if (o2->behavior != bhvGoomba) { continue; }
u16 info = (*respawnInfo >> 8);
u8 mask = ((o2->oBehParams2ndByte & GOOMBA_BP_TRIPLET_FLAG_MASK) >> 2);
if (info & mask) {
extern void mark_goomba_as_dead(void);
gCurrentObject = o2;
mark_goomba_as_dead();
obj_mark_for_deletion(o2);
}
}
LOG_INFO("rx macro special: goomba triplet");
}
}
}