0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Lua team references comparable with ==

Browse source
This commit is contained in:
Celtic Minstrel 2016-08-26 17:14:16 -04:00
parent 27b0fe6d7b
commit 36bced059b
2 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/scripting/lua_team.cpp
View file

@ -46,7 +46,7 @@ static const char * Team = "side";
static int impl_side_get(lua_State *L)
{
// Hidden metamethod, so arg1 has to be a pointer to a team.
team &t = **static_cast<team **>(luaL_checkudata(L, 1, Team));
team &t = luaW_checkteam(L, 1);
char const *m = luaL_checkstring(L, 2);
// Find the corresponding attribute.
@ -104,7 +104,7 @@ static int impl_side_get(lua_State *L)
static int impl_side_set(lua_State *L)
{
// Hidden metamethod, so arg1 has to be a pointer to a team.
team &t = **static_cast<team **>(luaL_checkudata(L, 1, Team));
team &t = luaW_checkteam(L, 1);
char const *m = luaL_checkstring(L, 2);
// Find the corresponding attribute.
@ -150,6 +150,18 @@ static int impl_side_set(lua_State *L)
return luaL_argerror(L, 2, err_msg.c_str());
}
static int impl_side_equal(lua_State *L)
{
// Hidden metamethod, so arg1 has to be a pointer to a team.
team &t1 = luaW_checkteam(L, 1);
if(team* t2 = luaW_toteam(L, 2)) {
lua_pushboolean(L, t1.side() == t2->side());
} else {
lua_pushboolean(L, false);
}
return 1;
}
namespace lua_team {
std::string register_metatable(lua_State * L)
@ -159,6 +171,7 @@ namespace lua_team {
static luaL_Reg const callbacks[] = {
{ "__index", &impl_side_get},
{ "__newindex", &impl_side_set},
{ "__eq", &impl_side_equal},
{ nullptr, nullptr }
};
luaL_setfuncs(L, callbacks, 0);
@ -176,3 +189,16 @@ void luaW_pushteam(lua_State *L, team & tm)
*t = &tm;
luaL_setmetatable(L, Team);
}
team& luaW_checkteam(lua_State* L, int idx)
{
return **static_cast<team **>(luaL_checkudata(L, idx, Team));
}
team* luaW_toteam(lua_State* L, int idx)
{
if(void* p = luaL_testudata(L, idx, Team)) {
return *static_cast<team **>(p);
}
return nullptr;
}

8
src/scripting/lua_team.hpp
View file

@ -28,7 +28,13 @@ namespace lua_team {
std::string register_metatable(lua_State *);
} //end namespace lua_team
// Create a full userdata containing a pointer to the team.
/// Create a full userdata containing a pointer to the team.
void luaW_pushteam(lua_State *, team &);
/// Test if the top stack element is a team, and if so, return it
team* luaW_toteam(lua_State*, int);
/// Test if the top stack element is a team, and if not, error
team& luaW_checkteam(lua_State*, int);
#endif