fix: make fisherman rumble text work #2279
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
briaguya-ai
commented
Dec 26, 2022
| @@ -1757,14 +1757,11 @@ extern "C" void AudioPlayer_Play(const uint8_t* buf, uint32_t len) { | |||
| } | |||
| } | |||
|
|
|||
| extern "C" int Controller_ShouldRumble(size_t i) { | |||
| extern "C" int Controller_ShouldRumble(size_t slot) { | |||
There was a problem hiding this comment.
this is only ever called from that one place in padmgr https://github.com/HarbourMasters/Shipwright/search?q=Controller_ShouldRumble
dcvz
approved these changes
Dec 26, 2022
soh/soh/OTRGlobals.cpp
Outdated
| return 1; | ||
| } | ||
| auto physicalDevice = controlDeck->GetPhysicalDeviceFromVirtualSlot(slot); | ||
| if (physicalDevice->getProfile(slot)->UseRumble && physicalDevice->CanRumble()) { |
There was a problem hiding this comment.
Do we need to check for null reference here?
There was a problem hiding this comment.
possibly, i'll try to break it real quick and see how to best protect against that
briaguya-ai
force-pushed
the
fix-rumble-text
branch
from
7d9dc37
to
7dca23f
Compare
we weren't correctly setting the pakType in padMgr because the depreciated `gRumbleEnabled` cvar was being checked
briaguya-ai
force-pushed
the
fix-rumble-text
branch
from
7dca23f
to
a9434a4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
we weren't correctly setting the pakType in padMgr because the depreciated
gRumbleEnabledcvar was being checkedfixes #170
Build Artifacts