fix opening entry window during deletion choice
This commit is contained in:
@@ -162,12 +162,13 @@
|
|||||||
(prop &mut :FlxSave save null)
|
(prop &mut :FlxSave save null)
|
||||||
(prop &mut :SimpleWindow entryWindow null)
|
(prop &mut :SimpleWindow entryWindow null)
|
||||||
(prop &mut :SimpleWindow puzzlePackChoiceWindow null)
|
(prop &mut :SimpleWindow puzzlePackChoiceWindow null)
|
||||||
|
(prop &mut :SimpleWindow entryDeletionWindow null)
|
||||||
|
|
||||||
(method windowIsShown []
|
(method windowIsShown []
|
||||||
(or (tempWindowIsShown) (and entryWindow (entryWindow.isShown))))
|
(or (tempWindowIsShown) (and entryWindow (entryWindow.isShown))))
|
||||||
|
|
||||||
(method tempWindowIsShown []
|
(method tempWindowIsShown []
|
||||||
(doFor window [puzzlePackChoiceWindow]
|
(doFor window [puzzlePackChoiceWindow entryDeletionWindow]
|
||||||
(when (and window (window.isShown))
|
(when (and window (window.isShown))
|
||||||
(return true)))
|
(return true)))
|
||||||
false)
|
false)
|
||||||
@@ -278,6 +279,7 @@
|
|||||||
(entryWindow.show)
|
(entryWindow.show)
|
||||||
}
|
}
|
||||||
null null FlxColor.WHITE 0.9 0.9 true)]
|
null null FlxColor.WHITE 0.9 0.9 true)]
|
||||||
|
(set entryDeletionWindow delWindow)
|
||||||
(set delWindow.cameras [uiCamera]))))
|
(set delWindow.cameras [uiCamera]))))
|
||||||
(when (= rewardFileIndex (- m.rewardFiles.length 1))
|
(when (= rewardFileIndex (- m.rewardFiles.length 1))
|
||||||
(_makeText "Abandon this puzzle" 0
|
(_makeText "Abandon this puzzle" 0
|
||||||
|
|||||||
Reference in New Issue
Block a user