Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
40a5580e
Commit
40a5580e
authored
Jan 27, 2023
by
Eidolon
Browse files
Options
Downloads
Patches
Plain Diff
Revert "sdl: Yet more SDL rumble version-guards"
This reverts commit
df28ffd7
.
parent
f9c9e082
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!1926
Revert Gamepads for now
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/sdl/i_gamepad.c
+0
-14
0 additions, 14 deletions
src/sdl/i_gamepad.c
with
0 additions
and
14 deletions
src/sdl/i_gamepad.c
+
0
−
14
View file @
40a5580e
...
...
@@ -66,11 +66,7 @@ void I_InitGamepads(void)
if
(
!
InitGamepadSubsystems
())
return
;
#if SDL_VERSION_ATLEAST(2,0,9)
rumble_supported
=
!
M_CheckParm
(
"-norumble"
);
#else
rumble_supported
=
false
;
#endif
for
(
UINT8
i
=
0
;
i
<
NUM_GAMEPADS
;
i
++
)
controllers
[
i
].
info
=
&
gamepads
[
i
];
...
...
@@ -731,20 +727,14 @@ boolean I_RumbleSupported(void)
static
boolean
Controller_Rumble
(
ControllerInfo
*
c
)
{
#if SDL_VERSION_ATLEAST(2,0,9)
if
(
SDL_GameControllerRumble
(
c
->
dev
,
c
->
rumble
.
large_magnitude
,
c
->
rumble
.
small_magnitude
,
0
)
==
-
1
)
return
false
;
return
true
;
#else
(
void
)
c
;
return
false
;
#endif
}
void
I_ToggleControllerRumble
(
boolean
unpause
)
{
#if SDL_VERSION_ATLEAST(2,0,9)
if
(
!
I_RumbleSupported
()
||
rumble_paused
==
!
unpause
)
return
;
...
...
@@ -764,10 +754,6 @@ void I_ToggleControllerRumble(boolean unpause)
controller
->
rumble
.
expiration
=
controller
->
rumble
.
time_left
=
0
;
}
}
#else
(
void
)
unpause
;
return
;
#endif
}
void
I_UpdateControllers
(
void
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment