diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-01-05 20:18:16 -0500 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-01-05 20:18:16 -0500 |
| commit | f976b5c0f095a881fc20f6ce5dcf5a50ebb2b5da (patch) | |
| tree | 260fa7579e1c361283bda09c2616783c3fdb5b9a /src/SMAPI/Framework/Input | |
| parent | d34f369d35290bca96cc7225d9765d1a8a66fa8b (diff) | |
| parent | 48959375b9ef52abf7c7a9404d43aac6ba780047 (diff) | |
| download | SMAPI-f976b5c0f095a881fc20f6ce5dcf5a50ebb2b5da.tar.gz SMAPI-f976b5c0f095a881fc20f6ce5dcf5a50ebb2b5da.tar.bz2 SMAPI-f976b5c0f095a881fc20f6ce5dcf5a50ebb2b5da.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Framework/Input')
| -rw-r--r-- | src/SMAPI/Framework/Input/SInputState.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/SMAPI/Framework/Input/SInputState.cs b/src/SMAPI/Framework/Input/SInputState.cs index d69e5604..84cea36c 100644 --- a/src/SMAPI/Framework/Input/SInputState.cs +++ b/src/SMAPI/Framework/Input/SInputState.cs @@ -129,6 +129,9 @@ namespace StardewModdingAPI.Framework.Input [Obsolete("This method should only be called by the game itself.")] public override GamePadState GetGamePadState() { + if (Game1.options.gamepadMode == Options.GamepadModes.ForceOff) + return base.GetGamePadState(); + return this.ShouldSuppressNow() ? this.SuppressedController : this.RealController; |