games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Less ugly API declarations

Browse Source
This commit is contained in:
AlexVinS
2021-02-16 17:07:30 +03:00
parent ec6f7b88fe
commit 6d245a7821
59 changed files with 693 additions and 827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
scripting/lua/api/ServerCb.cpp
View File

@ -22,38 +22,43 @@ namespace api
VCMI_REGISTER_CORE_SCRIPT_API(ServerCbProxy, "Server");
const std::vector<ServerCbProxy::RegType> ServerCbProxy::REGISTER =
const std::vector<ServerCbProxy::CustomRegType> ServerCbProxy::REGISTER_CUSTOM =
{
{
"addToBattleLog",
&ServerCbProxy::apply<BattleLogMessage>
&ServerCbProxy::apply<BattleLogMessage>,
false
},
{
"moveUnit",
&ServerCbProxy::apply<BattleStackMoved>
&ServerCbProxy::apply<BattleStackMoved>,
false
},
{
"changeUnits",
&ServerCbProxy::apply<BattleUnitsChanged>
&ServerCbProxy::apply<BattleUnitsChanged>,
false
},
{
"commitPackage",
&ServerCbProxy::commitPackage
&ServerCbProxy::commitPackage,
false
}
};
const std::vector<ServerCbProxy::CustomRegType> ServerCbProxy::REGISTER_CUSTOM =
int ServerCbProxy::commitPackage(lua_State * L)
{
LuaStack S(L);
};
ServerCallback * object = nullptr;
if(!S.tryGet(1, object))
return S.retNil();
lua_remove(L, 1);
int ServerCbProxy::commitPackage(lua_State * L, ServerCallback * object)
{
if(lua_isuserdata(L, 1) != 1)
{
lua_settop(L, 0);
return 0;
}
return S.retVoid();
lua_getfield(L, 1, "toNetpackLight");
lua_insert(L, 1);
@ -61,24 +66,28 @@ int ServerCbProxy::commitPackage(lua_State * L, ServerCallback * object)
int ret = lua_pcall(L, 1, 1, 0);
if(ret != 0 || !lua_islightuserdata(L, 1))
{
lua_settop(L, 0);
return 0;
}
return S.retVoid();
CPackForClient * pack = static_cast<CPackForClient *>(lua_touserdata(L, 1));
object->apply(pack);
lua_settop(L, 0);
return 0;
return S.retVoid();
}
template<typename NetPack>
int ServerCbProxy::apply(lua_State * L, ServerCallback * object)
int ServerCbProxy::apply(lua_State * L)
{
LuaStack S(L);
ServerCallback * object = nullptr;
if(!S.tryGet(1, object))
return S.retNil();
lua_remove(L, 1);
std::shared_ptr<NetPack> pack;
if(!S.tryGet(1, pack))