Changed love.system.getPowerInfo to return -1 for battery percent and seconds remaining instead of nil, if the value can't be determined

This commit is contained in:
Alex Szpakowski
2013-08-26 00:47:27 -03:00
parent 552585cd82
commit af1cf14b7f
2 changed files with 7 additions and 13 deletions
+1
View File
@@ -172,6 +172,7 @@ LOVE 0.9.0 [Baby Inspector]
* Updated most love.filesystem functions to return nil, error on internal failure.
* Updated love.keypressed's second argument to be a boolean indicating key repeat.
* Updated keyboard key constants for some more modern keyboard keys.
* Updated window code to use adaptive vsync when available, if vsync is enabled.
* Updated the setFilter and setWrap methods, the second argument is now optional.
* Updated Font and ParticleSystem rendering code, now more performant.
* Updated SpriteBatch code, now more performant when adding/setting and (un)binding.
+6 -13
View File
@@ -57,24 +57,17 @@ int w_getClipboardText(lua_State *L)
int w_getPowerInfo(lua_State *L)
{
int seconds = -1, percent = -1;
const char *str;
const char *statestr;
System::PowerState state = instance->getPowerInfo(seconds, percent);
if (!System::getConstant(state, str))
str = "unknown";
if (!System::getConstant(state, statestr))
statestr = "unknown";
lua_pushstring(L, str);
lua_pushstring(L, statestr);
if (percent >= 0)
lua_pushinteger(L, percent);
else
lua_pushnil(L);
if (seconds >= 0)
lua_pushinteger(L, seconds);
else
lua_pushnil(L);
lua_pushinteger(L, percent);
lua_pushinteger(L, seconds);
return 3;
}