Merge pull request #15336 from Fusion243/experimental

Fixed a couple bugs i found in prerelease
ShadowMario · Aug 17, 2024 · 2cddc2f · 2cddc2f
2 parents e4fde76 + 184768c
commit 2cddc2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -419,6 +419,7 @@ class PlayState extends MusicBeatState
  initHScript(folder + file);
  #end
  }
+ #end
 
  var camPos:FlxPoint = FlxPoint.get(girlfriendCameraOffset[0], girlfriendCameraOffset[1]);
  if(gf != null)
@@ -433,7 +434,7 @@ class PlayState extends MusicBeatState
  gf.visible = false;
  }
 
-
+ #if (LUA_ALLOWED || HSCRIPT_ALLOWED)
  // STAGE SCRIPTS
  #if LUA_ALLOWED startLuasNamed('stages/' + curStage + '.lua'); #end
  #if HSCRIPT_ALLOWED startHScriptsNamed('stages/' + curStage + '.hx'); #end

diff --git a/source/states/StoryMenuState.hx b/source/states/StoryMenuState.hx
@@ -48,6 +48,7 @@ class StoryMenuState extends MusicBeatState
  Paths.clearStoredMemory();
  Paths.clearUnusedMemory();
 
+ persistentUpdate = persistentDraw = true;
  PlayState.isStoryMode = true;
  WeekData.reloadWeekFiles(true);
 
@@ -67,7 +68,6 @@ class StoryMenuState extends MusicBeatState
  }
 
  if(curWeek >= WeekData.weeksList.length) curWeek = 0;
- persistentUpdate = persistentDraw = true;
 
  scoreText = new FlxText(10, 10, 0, Language.getPhrase('week_score', 'WEEK SCORE: {1}', [lerpScore]), 36);
  scoreText.setFormat("VCR OSD Mono", 32);