LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-14 10:13:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

some fixes

Browse Source 
Fixed duration and love naming conventions.
This commit is contained in:
Er2
2022-08-20 18:30:32 +03:00
parent 7c9d6d5694
commit 53b20b1341
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/Joystick.cpp
+3 -3
View File
@@ -69,9 +69,9 @@ STRINGMAP_CLASS_BEGIN(Joystick, Joystick::GamepadType, Joystick::GAMEPAD_TYPE_MA
{ "stadia", Joystick::GAMEPAD_TYPE_STADIA },
{ "virtual", Joystick::GAMEPAD_TYPE_VIRTUAL },
{ "shield", Joystick::GAMEPAD_TYPE_NVIDIA_SHIELD },
{ "joycon_left", Joystick::GAMEPAD_TYPE_JOYCON_LEFT },
{ "joycon_right", Joystick::GAMEPAD_TYPE_JOYCON_RIGHT },
{ "joycon_pair", Joystick::GAMEPAD_TYPE_JOYCON_PAIR },
{ "joyconleft", Joystick::GAMEPAD_TYPE_JOYCON_LEFT },
{ "joyconright", Joystick::GAMEPAD_TYPE_JOYCON_RIGHT },
{ "joyconpair", Joystick::GAMEPAD_TYPE_JOYCON_PAIR },
}
STRINGMAP_CLASS_END(Joystick, Joystick::GamepadType, Joystick::GAMEPAD_TYPE_MAX_ENUM, gamepadType)
src/modules/joystick/sdl/Joystick.cpp
+1 -1
View File
@@ -515,7 +515,7 @@ bool Joystick::setVibration(float left, float right, float duration)
Uint32 length = SDL_HAPTIC_INFINITY;
if (duration >= 0.0f)
{
float maxduration = std::numeric_limits<Uint32>::max() / 1000;
float maxduration = (float) (std::numeric_limits<Uint32>::max() / 1000.0);
length = Uint32(std::min(duration, maxduration) * 1000);
}