spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes in observer:setlocationflags

pull/122/head
Hleb Valoshka 2018-11-14 20:45:21 +03:00 committed by pirogronian
parent 0ecb2eb509
commit c1d1f0ead4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/celestia/celx_observer.cpp
View File

@ -901,10 +901,11 @@ static int observer_setlocationflags(lua_State* l)
if (!lua_istable(l, 2))
{
celx.doError("Argument to observer:setlocationflags() must be a table");
return 0;
}
lua_pushnil(l);
uint64_t locationFlags = obs->getLocationFilter();
auto locationFlags = obs->getLocationFilter();
while (lua_next(l, -2) != 0)
{
string key;
@ -916,6 +917,7 @@ static int observer_setlocationflags(lua_State* l)
else
{
celx.doError("Keys in table-argument to observer:setlocationflags() must be strings");
return 0;
}
if (lua_isboolean(l, -1))
{
@ -924,6 +926,7 @@ static int observer_setlocationflags(lua_State* l)
else
{
celx.doError("Values in table-argument to observer:setlocationflags() must be boolean");
return 0;
}
if (CelxLua::LocationFlagMap.count(key) == 0)
{
@ -931,7 +934,7 @@ static int observer_setlocationflags(lua_State* l)
}
else
{
uint64_t flag = CelxLua::LocationFlagMap[key];
const auto flag = CelxLua::LocationFlagMap[key];
if (value)
{
locationFlags |= flag;