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

Fix #6 (Feasible #4)

Browse source 
Made the enums flexible
This commit is contained in:
Cooliokid956 2026-06-13 02:33:45 -05:00
parent 1584352033
commit cd857a023e
5 changed files with 25 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
autogen/lua_definitions/constants.lua
View file

@ -618,18 +618,17 @@ WARP_TRANSITION_FADE_FROM_BOWSER = 0x12
--- @type integer
WARP_TRANSITION_FADE_INTO_BOWSER = 0x13
MENU_OPT_NONE = 0 --- @type MenuOption
MENU_OPT_1 = 1 --- @type MenuOption
MENU_OPT_2 = 2 --- @type MenuOption
MENU_OPT_3 = 3 --- @type MenuOption
MENU_OPT_DEFAULT = MENU_OPT_1 --- @type MenuOption
MENU_OPT_CONTINUE = MENU_OPT_1 --- @type MenuOption
MENU_OPT_EXIT_COURSE = MENU_OPT_2 --- @type MenuOption
MENU_OPT_CAMERA_ANGLE_R = MENU_OPT_3 --- @type MenuOption
MENU_OPT_EXIT_TO_CASTLE = MENU_OPT_3 + 1 --- @type MenuOption
MENU_OPT_SAVE_AND_CONTINUE = MENU_OPT_1 --- @type MenuOption
MENU_OPT_SAVE_AND_QUIT = MENU_OPT_2 --- @type MenuOption
MENU_OPT_CONTINUE_DONT_SAVE = MENU_OPT_3 --- @type MenuOption
MENU_OPT_NONE = 0 --- @type MenuOption
MENU_OPT_1 = 1 --- @type MenuOption
MENU_OPT_2 = 2 --- @type MenuOption
MENU_OPT_3 = 3 --- @type MenuOption
MENU_OPT_DEFAULT = MENU_OPT_1 --- @type MenuOption
MENU_OPT_CONTINUE = MENU_OPT_1 --- @type MenuOption
MENU_OPT_EXIT_COURSE = ((MENU_OPT_CONTINUE) + 1) --- @type MenuOption
MENU_OPT_CAMERA_ANGLE_R = ((MENU_OPT_CONTINUE) + 2) --- @type MenuOption
MENU_OPT_EXIT_TO_CASTLE = ((MENU_OPT_CONTINUE) + 3) --- @type MenuOption
MENU_OPT_SAVE_AND_CONTINUE = MENU_OPT_1 --- @type MenuOption
MENU_OPT_CONTINUE_DONT_SAVE = ((MENU_OPT_SAVE_AND_CONTINUE) + 1) --- @type MenuOption
--- @alias MenuOption
--- | `MENU_OPT_NONE`
@ -642,7 +641,6 @@ MENU_OPT_CONTINUE_DONT_SAVE = MENU_OPT_3 --- @type MenuOption
--- | `MENU_OPT_CAMERA_ANGLE_R`
--- | `MENU_OPT_EXIT_TO_CASTLE`
--- | `MENU_OPT_SAVE_AND_CONTINUE`
--- | `MENU_OPT_SAVE_AND_QUIT`
--- | `MENU_OPT_CONTINUE_DONT_SAVE`
--- @type string

9
docs/lua/constants.md
View file

@ -134,12 +134,11 @@
| MENU_OPT_3 | 3 |
| MENU_OPT_DEFAULT | MENU_OPT_1 |
| MENU_OPT_CONTINUE | MENU_OPT_1 |
| MENU_OPT_EXIT_COURSE | MENU_OPT_2 |
| MENU_OPT_CAMERA_ANGLE_R | MENU_OPT_3 |
| MENU_OPT_EXIT_TO_CASTLE | MENU_OPT_3 + 1 |
| MENU_OPT_EXIT_COURSE | ((MENU_OPT_CONTINUE) + 1) |
| MENU_OPT_CAMERA_ANGLE_R | ((MENU_OPT_CONTINUE) + 2) |
| MENU_OPT_EXIT_TO_CASTLE | ((MENU_OPT_CONTINUE) + 3) |
| MENU_OPT_SAVE_AND_CONTINUE | MENU_OPT_1 |
| MENU_OPT_SAVE_AND_QUIT | MENU_OPT_2 |
| MENU_OPT_CONTINUE_DONT_SAVE | MENU_OPT_3 |
| MENU_OPT_CONTINUE_DONT_SAVE | ((MENU_OPT_SAVE_AND_CONTINUE) + 1) |
- VERSION_REGION
[:arrow_up_small:](#)

10
src/game/area.h
View file

@ -135,14 +135,14 @@ enum MenuOption {
// Course Pause Menu
MENU_OPT_CONTINUE = MENU_OPT_1,
MENU_OPT_EXIT_COURSE = MENU_OPT_2,
MENU_OPT_CAMERA_ANGLE_R = MENU_OPT_3,
MENU_OPT_EXIT_TO_CASTLE = MENU_OPT_3 + 1,
MENU_OPT_EXIT_COURSE,
MENU_OPT_CAMERA_ANGLE_R,
MENU_OPT_EXIT_TO_CASTLE,
// Save Menu
MENU_OPT_SAVE_AND_CONTINUE = MENU_OPT_1,
MENU_OPT_SAVE_AND_QUIT = MENU_OPT_2,
MENU_OPT_CONTINUE_DONT_SAVE = MENU_OPT_3
// MENU_OPT_SAVE_AND_QUIT,
MENU_OPT_CONTINUE_DONT_SAVE
};
extern struct SpawnInfo gPlayerSpawnInfos[];

5
src/game/mario_actions_cutscene.c
View file

@ -37,9 +37,6 @@
#include "pc/lua/smlua.h"
#include "pc/lua/smlua_hooks.h"
// TODO: put this elsewhere
enum SaveOption { SAVE_OPT_SAVE_AND_CONTINUE = 1, /*SAVE_OPT_SAVE_AND_QUIT,*/ SAVE_OPT_CONTINUE_DONT_SAVE };
static struct Object* sIntroWarpPipeObj[MAX_PLAYERS] = { 0 };
static struct Object *sEndPeachObj;
static struct Object *sEndRightToadObj;
@ -288,7 +285,7 @@ void handle_save_menu(struct MarioState *m) {
// wait for the menu to show up
if (is_anim_past_end(m) && gSaveOptSelectIndex != 0) {
// save and continue / save and quit
if (gSaveOptSelectIndex == SAVE_OPT_SAVE_AND_CONTINUE /*|| gSaveOptSelectIndex == SAVE_OPT_SAVE_AND_QUIT*/) {
if (gSaveOptSelectIndex == MENU_OPT_SAVE_AND_CONTINUE /*|| gSaveOptSelectIndex == MENU_OPT_SAVE_AND_QUIT*/) {
save_file_do_save(gCurrSaveFileNum - 1, FALSE);
/*if (gSaveOptSelectIndex == SAVE_OPT_SAVE_AND_QUIT) {

9
src/pc/lua/smlua_constants_autogen.c
View file

@ -530,12 +530,11 @@ const char gSmluaConstants[] = ""
"MENU_OPT_3=3\n"
"MENU_OPT_DEFAULT=MENU_OPT_1\n"
"MENU_OPT_CONTINUE=MENU_OPT_1\n"
"MENU_OPT_EXIT_COURSE=MENU_OPT_2\n"
"MENU_OPT_CAMERA_ANGLE_R=MENU_OPT_3\n"
"MENU_OPT_EXIT_TO_CASTLE=MENU_OPT_3 + 1\n"
"MENU_OPT_EXIT_COURSE=((MENU_OPT_CONTINUE) + 1)\n"
"MENU_OPT_CAMERA_ANGLE_R=((MENU_OPT_CONTINUE) + 2)\n"
"MENU_OPT_EXIT_TO_CASTLE=((MENU_OPT_CONTINUE) + 3)\n"
"MENU_OPT_SAVE_AND_CONTINUE=MENU_OPT_1\n"
"MENU_OPT_SAVE_AND_QUIT=MENU_OPT_2\n"
"MENU_OPT_CONTINUE_DONT_SAVE=MENU_OPT_3\n"
"MENU_OPT_CONTINUE_DONT_SAVE=((MENU_OPT_SAVE_AND_CONTINUE) + 1)\n"
"VERSION_REGION='US'\n"
"id_bhv1Up=0\n"
"id_bhv1upJumpOnApproach=1\n"