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

Prevented remote players from spawning tons of stars when unlocking door

Browse source
This commit is contained in:
MysterD 2020-09-19 16:27:38 -07:00
parent 2c46eec6ba
commit 7ff4eec4ee
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/mario_actions_cutscene.c
View file

@ -882,6 +882,7 @@ s32 act_unlocking_key_door(struct MarioState *m) {
} }
s32 act_unlocking_star_door(struct MarioState *m) { s32 act_unlocking_star_door(struct MarioState *m) {
static u8 allowRemoteStarSpawn = TRUE;
switch (m->actionState) { switch (m->actionState) {
case 0: case 0:
if (m->usedObj != NULL) { if (m->usedObj != NULL) {
@ -893,11 +894,17 @@ s32 act_unlocking_star_door(struct MarioState *m) {
m->marioObj->oMarioReadingSignDPosX = m->pos[0]; m->marioObj->oMarioReadingSignDPosX = m->pos[0];
m->marioObj->oMarioReadingSignDPosZ = m->pos[2]; m->marioObj->oMarioReadingSignDPosZ = m->pos[2];
set_mario_animation(m, MARIO_ANIM_SUMMON_STAR); set_mario_animation(m, MARIO_ANIM_SUMMON_STAR);
if (m->playerIndex != 0) { allowRemoteStarSpawn = TRUE; }
m->actionState++; m->actionState++;
break; break;
case 1: case 1:
if (is_anim_at_end(m)) { if (is_anim_at_end(m)) {
spawn_object(m->marioObj, MODEL_STAR, bhvUnlockDoorStar); if (m->playerIndex == 0 || allowRemoteStarSpawn) {
if (m->playerIndex != 0) {
allowRemoteStarSpawn = FALSE;
spawn_object(m->marioObj, MODEL_STAR, bhvUnlockDoorStar);
}
}
m->actionState++; m->actionState++;
} }
break; break;
@ -908,6 +915,7 @@ s32 act_unlocking_star_door(struct MarioState *m) {
} }
break; break;
case 3: case 3:
if (m->playerIndex != 0) { allowRemoteStarSpawn = TRUE; }
if (is_anim_at_end(m)) { if (is_anim_at_end(m)) {
save_file_set_flags(get_door_save_file_flag(m->usedObj)); save_file_set_flags(get_door_save_file_flag(m->usedObj));
set_mario_action(m, ACT_READING_AUTOMATIC_DIALOG, DIALOG_038); set_mario_action(m, ACT_READING_AUTOMATIC_DIALOG, DIALOG_038);