Skip to content

Commit 1047cef

Browse files
committed
Fix Panel Closing.
1 parent 90064fe commit 1047cef

File tree

4 files changed

+410
-27
lines changed

4 files changed

+410
-27
lines changed

source/archipelago/APCategoryState.hx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,11 @@ class APCategoryState extends states.CategoryState {
198198
archipelago.APEntryState.ap = null;
199199
archipelago.APInfo.apGame = null;
200200
archipelago.APInfo.ap = null;
201+
archipelago.APInfo.inMinigame = archipelago.APInfo.APMinigame.None;
201202
archipelago.APPlayState.apGame = null;
202203
archipelago.APStyledEntryState.apGame = null;
203204
archipelago.APStyledEntryState.ap = null;
205+
// archipelago.APGameState.instance?.updateSaveData();
204206
archipelago.APGameState.instance = null;
205207
AP = null;
206208
gameState = null;
@@ -232,7 +234,7 @@ class APCategoryState extends states.CategoryState {
232234
// Cancel callback - user canceled the shutdown
233235
trace('User canceled the shutdown process');
234236
// Stay in the current state
235-
}
237+
}, true // Normally, you should not be able to cancel quitting.
236238
);
237239

238240
openSubState(progressDialog);

source/archipelago/APItem.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ConditionHelper {
4646
public static inline function Everywhere():Condition {
4747
return ConditionHelper.create(function(item:APItem):Bool { return true; }, ConditionType.Everywhere);
4848
}
49-
public static inline function PlayState():Condition {
49+
public static inline function PlayState(?oneAtATime:Bool = false):Condition {
5050
return ConditionHelper.create(function(item:APItem):Bool {
5151
if (!Std.is(FlxG.state, states.PlayState)) return false;
5252
var playState = states.PlayState.instance;

source/archipelago/APPlayState.hx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2313,6 +2313,7 @@ class APPlayState extends PlayState {
23132313
paused = true;
23142314
APFreeplayManager.callVictory = APFreeplayManager.isVictorySong(PlayState.SONG.song, currentMod);
23152315
openSubState(new substates.RankingSubstate());
2316+
23162317
return true; //why does endsong need this?????
23172318
}
23182319

0 commit comments

Comments
 (0)