diff options
| author | Charles Lombardo <clombardo169@gmail.com> | 2024-02-21 13:02:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-21 13:02:58 +0100 |
| commit | 60fc6df407e29932c0b7106e860603aaeea32812 (patch) | |
| tree | 80ea092428f09780c83c86c86114831b2728071a | |
| parent | Merge pull request #13095 from liamwhite/ns-oops (diff) | |
| parent | android: Fix extra stick setting default values (diff) | |
| download | yuzu-60fc6df407e29932c0b7106e860603aaeea32812.tar yuzu-60fc6df407e29932c0b7106e860603aaeea32812.tar.gz yuzu-60fc6df407e29932c0b7106e860603aaeea32812.tar.bz2 yuzu-60fc6df407e29932c0b7106e860603aaeea32812.tar.lz yuzu-60fc6df407e29932c0b7106e860603aaeea32812.tar.xz yuzu-60fc6df407e29932c0b7106e860603aaeea32812.tar.zst yuzu-60fc6df407e29932c0b7106e860603aaeea32812.zip | |
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt index 6907bec02..3ea5f5008 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -780,7 +780,7 @@ class SettingsFragmentPresenter( playerIndex: Int, paramName: String, stick: NativeAnalog, - defaultValue: Int + defaultValue: Float ): AbstractIntSetting = object : AbstractIntSetting { val params get() = NativeInput.getStickParam(playerIndex, stick) @@ -788,7 +788,7 @@ class SettingsFragmentPresenter( override val key = "" override fun getInt(needsGlobal: Boolean): Int = - (params.get(paramName, 0.15f) * 100).toInt() + (params.get(paramName, defaultValue) * 100).toInt() override fun setInt(value: Int) { val tempParams = params @@ -796,12 +796,12 @@ class SettingsFragmentPresenter( NativeInput.setStickParam(playerIndex, stick, tempParams) } - override val defaultValue = defaultValue + override val defaultValue = (defaultValue * 100).toInt() override fun getValueAsString(needsGlobal: Boolean): String = getInt(needsGlobal).toString() - override fun reset() = setInt(defaultValue) + override fun reset() = setInt(this.defaultValue) } private fun getExtraStickSettings( @@ -811,11 +811,11 @@ class SettingsFragmentPresenter( val stickIsController = NativeInput.isController(NativeInput.getStickParam(playerIndex, nativeAnalog)) val modifierRangeSetting = - getStickIntSettingFromParam(playerIndex, "modifier_scale", nativeAnalog, 50) + getStickIntSettingFromParam(playerIndex, "modifier_scale", nativeAnalog, 0.5f) val stickRangeSetting = - getStickIntSettingFromParam(playerIndex, "range", nativeAnalog, 95) + getStickIntSettingFromParam(playerIndex, "range", nativeAnalog, 0.95f) val stickDeadzoneSetting = - getStickIntSettingFromParam(playerIndex, "deadzone", nativeAnalog, 15) + getStickIntSettingFromParam(playerIndex, "deadzone", nativeAnalog, 0.15f) val out = mutableListOf<SettingsItem>().apply { if (stickIsController) { |