mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-07-03 13:10:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into independence

Browse Source
This commit is contained in:
Sonic Dreamcaster
2024-12-07 13:41:31 -03:00
parent 9e1da7c485 bff2324fae
commit dcd0b3ea78
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mods/levelselect.c
+1 -1
View File
@@ -112,7 +112,7 @@ void Map_LevelSelect(void) {
}
// Bypass briefing
if (CVarGetInteger("gSkipBriefing", 0) == 1) {
if ((CVarGetInteger("gSkipBriefing", 0) == 1) || (sCurrentPlanetId == PLANET_VENOM)) {
if ((timer == 0) && (startLevel == 1)) {
if ((sMapState == 2) && (sMapSubState > 0)) {
if (sCurrentPlanetId == PLANET_VENOM) {
src/overlays/ovl_menu/fox_map.c
+5 -1
View File
@@ -4093,6 +4093,10 @@ bool Map_LevelPlayedStatus_Check(PlanetId planet) {
case PLANET_SOLAR:
planetSaveSlot = SAVE_SLOT_SOLAR;
break;
default:
planetSaveSlot = planet;
break;
}
if (CVarGetInteger("gLevelSelector", 0) && gMissionNumber == 6) {
@@ -6086,7 +6090,7 @@ void Map_BriefingRadio_Update(void) {
if ((D_menu_801CF018 > 0) && (D_menu_801CF018 != 100)) {
Map_BriefingRadio_Draw(gCurrentRadioPortrait);
Map_BriefingRadio_Draw(D_menu_801AF420[!D_menu_801CD940]);
if (CVarGetInteger("gLevelSelector", 0) && (sCurrentPlanetId == 6)) {
if (CVarGetInteger("gLevelSelector", 0) && (gMissionNumber == 6)) {
return;
}
func_radio_800BB388();