3-group-ios/GBA002
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resets sustained inputs when changing games

Browse Source
This commit is contained in:
Riley Testut 2019-08-07 14:42:08 -07:00
parent f5f09f22d4
commit ef57d882b3
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Delta/Emulation/GameViewController.swift
View File

@ -69,6 +69,11 @@ class GameViewController: DeltaCore.GameViewController
self.emulatorCore?.saveHandler = { [weak self] _ in self?.updateGameSave() }
if oldValue?.fileURL != game?.fileURL
{
self.shouldResetSustainedInputs = true
}
self.updateControllerSkin()
self.updateControllers()
@ -118,6 +123,7 @@ class GameViewController: DeltaCore.GameViewController
// Sustain Buttons
private var isSelectingSustainedButtons = false
private var sustainInputsMapping: SustainInputsMapping?
private var shouldResetSustainedInputs = false
private var sustainButtonsContentView: UIView!
private var sustainButtonsBlurView: UIVisualEffectView!
@ -494,13 +500,13 @@ private extension GameViewController
self.view.setNeedsLayout()
self.view.layoutIfNeeded()
// Roundabout way of combining arrays to prevent rare runtime crash in + operator :(
var controllers = [GameController]()
controllers.append(self.controllerView)
controllers.append(contentsOf: ExternalGameControllerManager.shared.connectedControllers)
if let emulatorCore = self.emulatorCore, let game = self.game
{
// Roundabout way of combining arrays to prevent rare runtime crash in + operator :(
var controllers = [GameController]()
controllers.append(self.controllerView)
controllers.append(contentsOf: ExternalGameControllerManager.shared.connectedControllers)
for gameController in controllers
{
if gameController.playerIndex != nil
@ -522,7 +528,20 @@ private extension GameViewController
gameController.removeReceiver(emulatorCore)
}
}
}
}
if self.shouldResetSustainedInputs
{
for controller in controllers
{
for input in controller.sustainedInputs.keys
{
controller.unsustain(input)
}
}
self.shouldResetSustainedInputs = false
}
}
func updateControllerSkin()