Browse Source

some fixes

Fixed duration and love naming conventions.
Er2 3 years ago
parent
commit
53b20b1341
2 changed files with 4 additions and 4 deletions
  1. 3 3
      src/modules/joystick/Joystick.cpp
  2. 1 1
      src/modules/joystick/sdl/Joystick.cpp

+ 3 - 3
src/modules/joystick/Joystick.cpp

@@ -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)
 

+ 1 - 1
src/modules/joystick/sdl/Joystick.cpp

@@ -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);
 	}