From 32bebfd1fc75294d6aff6e7033c0efa63dbc8f24 Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Tue, 6 Dec 2022 00:01:47 +0800 Subject: [PATCH] Rename love.sensor.isAvailable to love.sensor.hasSensor. --- src/modules/sensor/Sensor.h | 2 +- src/modules/sensor/sdl/Sensor.cpp | 2 +- src/modules/sensor/sdl/Sensor.h | 2 +- src/modules/sensor/wrap_Sensor.cpp | 7 +++---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/modules/sensor/Sensor.h b/src/modules/sensor/Sensor.h index 41671f4dd..5461e86c9 100644 --- a/src/modules/sensor/Sensor.h +++ b/src/modules/sensor/Sensor.h @@ -49,7 +49,7 @@ public: /** * Check the availability of the sensor. **/ - virtual bool isAvailable(SensorType type) = 0; + virtual bool hasSensor(SensorType type) = 0; /** * Check if the sensor is enabled. diff --git a/src/modules/sensor/sdl/Sensor.cpp b/src/modules/sensor/sdl/Sensor.cpp index b17e0ff00..9ea706863 100644 --- a/src/modules/sensor/sdl/Sensor.cpp +++ b/src/modules/sensor/sdl/Sensor.cpp @@ -49,7 +49,7 @@ const char *Sensor::getName() const return "love.sensor.sdl"; } -bool Sensor::isAvailable(SensorType type) +bool Sensor::hasSensor(SensorType type) { for (int i = 0; i < SDL_NumSensors(); i++) { diff --git a/src/modules/sensor/sdl/Sensor.h b/src/modules/sensor/sdl/Sensor.h index 398dc0415..609bd376b 100644 --- a/src/modules/sensor/sdl/Sensor.h +++ b/src/modules/sensor/sdl/Sensor.h @@ -46,7 +46,7 @@ public: // Implements Module. const char *getName() const override; - bool isAvailable(SensorType type) override; + bool hasSensor(SensorType type) override; bool isEnabled(SensorType type) override; void setEnabled(SensorType type, bool enable) override; std::vector getData(SensorType type) override; diff --git a/src/modules/sensor/wrap_Sensor.cpp b/src/modules/sensor/wrap_Sensor.cpp index 99528af7e..ef97db4b2 100644 --- a/src/modules/sensor/wrap_Sensor.cpp +++ b/src/modules/sensor/wrap_Sensor.cpp @@ -40,11 +40,11 @@ inline Sensor::SensorType luax_checksensortype(lua_State *L, int i) return type; } -static int w_isAvailable(lua_State *L) +static int w_hasSensor(lua_State *L) { Sensor::SensorType type = luax_checksensortype(L, 1); - lua_pushboolean(L, instance()->isAvailable(type)); + lua_pushboolean(L, instance()->hasSensor(type)); return 1; } @@ -90,8 +90,7 @@ static int w_getName(lua_State *L) static const luaL_Reg functions[] = { - { "isAvailable", w_isAvailable }, - { "hasSensor", w_isAvailable }, + { "hasSensor", w_hasSensor }, { "isEnabled", w_isEnabled }, { "setEnabled", w_setEnabled }, { "getData", w_getData },