Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed quit game options from course completion screen

This commit is contained in:
MysterD 2020-10-04 14:15:06 -07:00
parent f3b6c60f1a
commit d7c43aeb95
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/game/ingame_menu.c
View File

@ -3104,14 +3104,14 @@ void render_course_complete_lvl_info_and_hud_str(void) {
#endif #endif
#if defined(VERSION_JP) || defined(VERSION_SH) #if defined(VERSION_JP) || defined(VERSION_SH)
#define TXT_SAVECONT_Y 2 #define TXT_SAVECONT_Y 2
#define TXT_SAVEQUIT_Y 18 //#define TXT_SAVEQUIT_Y 18
#define TXT_SAVE_EXIT_GAME_Y 38 //#define TXT_SAVE_EXIT_GAME_Y 38
#define TXT_CONTNOSAVE_Y 54 #define TXT_CONTNOSAVE_Y 18
#else #else
#define TXT_SAVECONT_Y 0 #define TXT_SAVECONT_Y 0
#define TXT_SAVEQUIT_Y 20 //#define TXT_SAVEQUIT_Y 20
#define TXT_SAVE_EXIT_GAME_Y 40 //#define TXT_SAVE_EXIT_GAME_Y 40
#define TXT_CONTNOSAVE_Y 60 #define TXT_CONTNOSAVE_Y 20
#endif #endif
#ifdef VERSION_EU #ifdef VERSION_EU
@ -3164,8 +3164,8 @@ void render_save_confirmation(s16 x, s16 y, s8 *index, s16 sp6e)
gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gDialogTextAlpha); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gDialogTextAlpha);
print_generic_string(TXT_SAVEOPTIONS_X, y + TXT_SAVECONT_Y, textSaveAndContinue); print_generic_string(TXT_SAVEOPTIONS_X, y + TXT_SAVECONT_Y, textSaveAndContinue);
print_generic_string(TXT_SAVEOPTIONS_X, y - TXT_SAVEQUIT_Y, textSaveAndQuit); //print_generic_string(TXT_SAVEOPTIONS_X, y - TXT_SAVEQUIT_Y, textSaveAndQuit);
print_generic_string(TXT_SAVEOPTIONS_X, y - TXT_SAVE_EXIT_GAME_Y, textSaveExitGame); //print_generic_string(TXT_SAVEOPTIONS_X, y - TXT_SAVE_EXIT_GAME_Y, textSaveExitGame);
print_generic_string(TXT_SAVEOPTIONS_X, y - TXT_CONTNOSAVE_Y, textContinueWithoutSave); print_generic_string(TXT_SAVEOPTIONS_X, y - TXT_CONTNOSAVE_Y, textContinueWithoutSave);
gSPDisplayList(gDisplayListHead++, dl_ia_text_end); gSPDisplayList(gDisplayListHead++, dl_ia_text_end);

12
src/game/mario_actions_cutscene.c
View File

@ -34,7 +34,7 @@
#include "pc/network/network.h" #include "pc/network/network.h"
// TODO: put this elsewhere // TODO: put this elsewhere
enum SaveOption { SAVE_OPT_SAVE_AND_CONTINUE = 1, SAVE_OPT_SAVE_AND_QUIT, SAVE_OPT_SAVE_EXIT_GAME, SAVE_OPT_CONTINUE_DONT_SAVE }; enum SaveOption { SAVE_OPT_SAVE_AND_CONTINUE = 1, /*SAVE_OPT_SAVE_AND_QUIT, SAVE_OPT_SAVE_EXIT_GAME,*/ SAVE_OPT_CONTINUE_DONT_SAVE };
static struct Object *sIntroWarpPipeObj; static struct Object *sIntroWarpPipeObj;
static struct Object *sEndPeachObj; static struct Object *sEndPeachObj;
@ -259,20 +259,20 @@ void handle_save_menu(struct MarioState *m) {
// wait for the menu to show up // wait for the menu to show up
if (is_anim_past_end(m) && gSaveOptSelectIndex != 0) { if (is_anim_past_end(m) && gSaveOptSelectIndex != 0) {
// save and continue / save and quit // save and continue / save and quit
if (gSaveOptSelectIndex == SAVE_OPT_SAVE_AND_CONTINUE || gSaveOptSelectIndex == SAVE_OPT_SAVE_EXIT_GAME || gSaveOptSelectIndex == SAVE_OPT_SAVE_AND_QUIT) { if (gSaveOptSelectIndex == SAVE_OPT_SAVE_AND_CONTINUE /*|| gSaveOptSelectIndex == SAVE_OPT_SAVE_EXIT_GAME || gSaveOptSelectIndex == SAVE_OPT_SAVE_AND_QUIT*/) {
save_file_do_save(gCurrSaveFileNum - 1, FALSE); save_file_do_save(gCurrSaveFileNum - 1, FALSE);
if (gSaveOptSelectIndex == SAVE_OPT_SAVE_AND_QUIT) { /*if (gSaveOptSelectIndex == SAVE_OPT_SAVE_AND_QUIT) {
fade_into_special_warp(-2, 0); // reset game fade_into_special_warp(-2, 0); // reset game
} else if (gSaveOptSelectIndex == SAVE_OPT_SAVE_EXIT_GAME) { } else if (gSaveOptSelectIndex == SAVE_OPT_SAVE_EXIT_GAME) {
//initiate_warp(LEVEL_CASTLE, 1, 0x1F, 0); //initiate_warp(LEVEL_CASTLE, 1, 0x1F, 0);
fade_into_special_warp(0, 0); fade_into_special_warp(0, 0);
game_exit(); game_exit();
} }*/
} }
// not quitting // not quitting
if (gSaveOptSelectIndex != SAVE_OPT_SAVE_EXIT_GAME) { //if (gSaveOptSelectIndex != SAVE_OPT_SAVE_EXIT_GAME) {
disable_time_stop(); disable_time_stop();
m->faceAngle[1] += 0x8000; m->faceAngle[1] += 0x8000;
// figure out what dialog to show, if we should // figure out what dialog to show, if we should
@ -284,7 +284,7 @@ void handle_save_menu(struct MarioState *m) {
} else { } else {
set_mario_action(m, ACT_IDLE, 0); set_mario_action(m, ACT_IDLE, 0);
} }
} //}
} }
} }

2
src/pc/controller/controller_keyboard_debug.c
View File

@ -7,7 +7,7 @@
#ifdef DEBUG #ifdef DEBUG
static u8 warpToLevel = LEVEL_BOB; static u8 warpToLevel = LEVEL_WF;
#define SCANCODE_0 0x0B #define SCANCODE_0 0x0B
#define SCANCODE_1 0x02 #define SCANCODE_1 0x02