Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Actually fix shooting portal after unpausing bug

Browse source
This commit is contained in:
James Lambert 2023-11-08 22:10:47 -07:00
parent 7a37be91c9
commit 44ab1ddfcd
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/scene/scene.c
View file

@ -96,6 +96,7 @@ void sceneInit(struct Scene* scene) {
} }
gGameMenu.state = GameMenuStateResumeGame; gGameMenu.state = GameMenuStateResumeGame;
scene->ignorePortalGun = 0;
} }
void sceneInitNoPauseMenu(struct Scene* scene, int mainMenuMode) { void sceneInitNoPauseMenu(struct Scene* scene, int mainMenuMode) {
@ -353,6 +354,14 @@ void sceneCheckPortals(struct Scene* scene) {
int fireBlue = controllerActionGet(ControllerActionOpenPortal0); int fireBlue = controllerActionGet(ControllerActionOpenPortal0);
int fireOrange = controllerActionGet(ControllerActionOpenPortal1); int fireOrange = controllerActionGet(ControllerActionOpenPortal1);
// this prevents the firing of portals after unpausing
if (scene->ignorePortalGun && (fireBlue || fireOrange)) {
fireBlue = 0;
fireOrange = 0;
} else {
scene->ignorePortalGun = 0;
}
int hasBlue = (scene->player.flags & PlayerHasFirstPortalGun) != 0; int hasBlue = (scene->player.flags & PlayerHasFirstPortalGun) != 0;
int hasOrange = (scene->player.flags & PlayerHasSecondPortalGun) != 0; int hasOrange = (scene->player.flags & PlayerHasSecondPortalGun) != 0;
if (scene->continuouslyAttemptingPortalOpen){ if (scene->continuouslyAttemptingPortalOpen){
@ -544,10 +553,11 @@ void sceneUpdate(struct Scene* scene) {
OSTime frameStart = osGetTime(); OSTime frameStart = osGetTime();
scene->lastFrameTime = frameStart - scene->lastFrameStart; scene->lastFrameTime = frameStart - scene->lastFrameStart;
if (gGameMenu.state != GameMenuStateResumeGame) { if (gGameMenu.state != GameMenuStateResumeGame) {
if (gGameMenu.state == GameMenuStateLanding && (controllerGetButtonUp(0, B_BUTTON) || controllerGetButtonDown(0, START_BUTTON))) { if (gGameMenu.state == GameMenuStateLanding && (controllerGetButtonDown(0, B_BUTTON) || controllerActionGet(ControllerActionPause))) {
gGameMenu.state = GameMenuStateResumeGame; gGameMenu.state = GameMenuStateResumeGame;
scene->ignorePortalGun = 1;
savefileSave(); savefileSave();
} }

1
src/scene/scene.h
View file

@ -86,6 +86,7 @@ struct Scene {
u8 continuouslyAttemptingPortalOpen; u8 continuouslyAttemptingPortalOpen;
u8 checkpointState; u8 checkpointState;
u8 ignorePortalGun;
}; };
extern struct Scene gScene; extern struct Scene gScene;