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

Sensor: Check if getConstant is successful.

Browse Source
This commit is contained in:
Miku AuahDark
2022-12-06 09:50:01 +08:00
parent 64d79eed18
commit bc1c619599
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/event/sdl/Event.cpp
+7 -4
View File
@@ -463,8 +463,10 @@ Message *Event::convert(const SDL_Event &e)
if (e.sensor.which == id) if (e.sensor.which == id)
{ {
// Found sensor // Found sensor
const char *sensorType = "unknown"; const char *sensorType;
sensor::Sensor::getConstant(sensor::sdl::Sensor::convert(SDL_SensorGetType(sensor)), sensorType); if (!sensor::Sensor::getConstant(sensor::sdl::Sensor::convert(SDL_SensorGetType(sensor)), sensorType))
sensorType = "unknown";
vargs.emplace_back(sensorType, strlen(sensorType)); vargs.emplace_back(sensorType, strlen(sensorType));
// Both accelerometer and gyroscope only pass up to 3 values. // Both accelerometer and gyroscope only pass up to 3 values.
// https://github.com/libsdl-org/SDL/blob/SDL2/include/SDL_sensor.h#L81-L127 // https://github.com/libsdl-org/SDL/blob/SDL2/include/SDL_sensor.h#L81-L127
@@ -603,9 +605,10 @@ Message *Event::convertJoystickEvent(const SDL_Event &e) const
{ {
using Sensor = love::sensor::Sensor; using Sensor = love::sensor::Sensor;
const char *sensorName = "unknown"; const char *sensorName;
Sensor::SensorType sensorType = love::sensor::sdl::Sensor::convert((SDL_SensorType) e.csensor.sensor); Sensor::SensorType sensorType = love::sensor::sdl::Sensor::convert((SDL_SensorType) e.csensor.sensor);
Sensor::getConstant(sensorType, sensorName); if (!Sensor::getConstant(sensorType, sensorName))
sensorName = "unknown";
vargs.emplace_back(joysticktype, stick); vargs.emplace_back(joysticktype, stick);
vargs.emplace_back(sensorName, strlen(sensorName)); vargs.emplace_back(sensorName, strlen(sensorName));