izzy/Ghostship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Ghostship.git synced 2026-06-19 01:17:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/jp_support' into star-select-enhancement

Browse Source
This commit is contained in:
Lywx
2023-10-11 09:06:15 -06:00
committed by GitHub
parent 4cde650a41 ee2a1df3aa
commit 3c2d1b8b6d
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/interaction.c
+1 -1
View File
@@ -768,7 +768,7 @@ u32 interact_water_ring(struct MarioState *m, UNUSED u32 interactType, struct Ob
u32 interact_star_or_key(struct MarioState *m, UNUSED u32 interactType, struct Object *o) {
u32 starIndex;
u32 starGrabAction = ACT_STAR_DANCE_EXIT;
u32 noExit = (o->oInteractionSubtype & INT_SUBTYPE_NO_EXIT) != 0;
u32 noExit = (o->oInteractionSubtype & INT_SUBTYPE_NO_EXIT) != 0 || CVarGetInteger("gStarNoExit", 0);
u32 grandStar = (o->oInteractionSubtype & INT_SUBTYPE_GRAND_STAR) != 0;
if (m->health >= 0x100) {
src/port/ui/ImguiUI.cpp
+2
View File
@@ -404,6 +404,8 @@ void DrawEnhancementsMenu() {
UIWidgets::Tooltip("Disable Level of Detail (LOD) to avoid models using lower poly versions at a distance");
UIWidgets::PaddedEnhancementCheckbox("Select any star from menu", "gSelectAllStars", true, false);
UIWidgets::Tooltip("Let's you select any star from the menu regardless of the courses completion status.");
UIWidgets::PaddedEnhancementCheckbox("Collecting Stars Will Not Exit Level", "gStarNoExit", true, false);
UIWidgets::Tooltip("Stars act like the 100 coin star and will not take you out of the level");
UIWidgets::PaddedEnhancementCheckbox("Avoid playing peach cutscene", "gDisablePeachCutscene", true, false);
UIWidgets::Tooltip("Avoid playing the peach cutscene when starting a new game");
ImGui::EndMenu();