cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix changes made while commenting

pull/685/head
Greenlamp 2024-05-09 17:38:59 +02:00
parent ecbcb0bf70
commit 22e7845480
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/inputs-controller.ts
View File

@ -69,7 +69,6 @@ export class InputsController {
// at the launch, we retrieved the previously chosen gamepad // at the launch, we retrieved the previously chosen gamepad
if (localStorage.hasOwnProperty('chosenGamepad')) { if (localStorage.hasOwnProperty('chosenGamepad')) {
this.chosenGamepad = localStorage.getItem('chosenGamepad'); this.chosenGamepad = localStorage.getItem('chosenGamepad');
this.initChosenGamepad(this.chosenGamepad, false)
} }
// Handle the game losing focus // Handle the game losing focus
this.scene.game.events.on(Phaser.Core.Events.BLUR, () => { this.scene.game.events.on(Phaser.Core.Events.BLUR, () => {
@ -150,14 +149,13 @@ export class InputsController {
return this.gamepads.filter(g => !this.disconnectedGamepads.includes(g.id)).map(g => g.id); return this.gamepads.filter(g => !this.disconnectedGamepads.includes(g.id)).map(g => g.id);
} }
initChosenGamepad(gamepadName?: String, save: boolean = true): void { initChosenGamepad(gamepadName?: String): void {
// if we have a gamepad name in parameter, we set the chosen gamepad with this value // if we have a gamepad name in parameter, we set the chosen gamepad with this value
let name = gamepadName; let name = gamepadName;
if (gamepadName) if (gamepadName)
this.chosenGamepad = gamepadName; this.chosenGamepad = gamepadName;
else else
name = this.chosenGamepad; // otherwise we use the chosen gamepad's name name = this.chosenGamepad; // otherwise we use the chosen gamepad's name
if (save) // we always set the session variable unless it's called from init()
localStorage.setItem('chosenGamepad', name); localStorage.setItem('chosenGamepad', name);
// we update the ui with the chosen gamepad // we update the ui with the chosen gamepad
const handler = this.scene.ui?.handlers[Mode.SETTINGS_GAMEPAD] as SettingsGamepadUiHandler; const handler = this.scene.ui?.handlers[Mode.SETTINGS_GAMEPAD] as SettingsGamepadUiHandler;
@ -194,8 +192,6 @@ export class InputsController {
// We check if a gamepad reconnect by looking in the disconnectedGamepads array if is there // We check if a gamepad reconnect by looking in the disconnectedGamepads array if is there
// If he is there, we remove it. // If he is there, we remove it.
this.disconnectedGamepads = this.disconnectedGamepads.filter(g => g !== thisGamepad.id); this.disconnectedGamepads = this.disconnectedGamepads.filter(g => g !== thisGamepad.id);
// if (this.disconnectedGamepads.some(g => g === thisGamepad.id)) {
// }
} }
setupGamepad(thisGamepad: Phaser.Input.Gamepad.Gamepad): void { setupGamepad(thisGamepad: Phaser.Input.Gamepad.Gamepad): void {
@ -208,6 +204,7 @@ export class InputsController {
if (!this.player[gamepad]) this.player[gamepad] = {}; if (!this.player[gamepad]) this.player[gamepad] = {};
this.player[gamepad]['mapping'] = mappedPad.gamepadMapping; this.player[gamepad]['mapping'] = mappedPad.gamepadMapping;
} }
if (this.chosenGamepad === thisGamepad.id) this.initChosenGamepad(this.chosenGamepad)
} }
refreshGamepads(): void { refreshGamepads(): void {