mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 13:49:40 +00:00
Code Issues Releases Wiki Activity

[Server] Add forgotten type for callbacks

Browse source
This commit is contained in:
Koncord 2017-02-18 12:58:12 +08:00
parent 0d75264221
commit 1fb2176cfa
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw-mp/Script/LangLua/LangLua.cpp
View file

@ -184,6 +184,9 @@ boost::any LangLua::Call(const char *name, const char *argl, const std::vector<b
luabridge::Stack<const char *>::push(lua, boost::any_cast<const char *>(args.at(i))); luabridge::Stack<const char *>::push(lua, boost::any_cast<const char *>(args.at(i)));
break; break;
case 'b':
luabridge::Stack<bool>::push(lua, boost::any_cast<int>(args.at(i)));
break;
default: default:
throw runtime_error("Lua call: Unknown argument identifier " + argl[i]); throw runtime_error("Lua call: Unknown argument identifier " + argl[i]);
} }

18
apps/openmw-mp/Script/ScriptFunctions.cpp
View file

@ -30,46 +30,36 @@ void ScriptFunctions::GetArguments(std::vector<boost::any> &params, va_list args
switch (c) switch (c)
{ {
case 'i': case 'i':
{
params.emplace_back(va_arg(args, unsigned int)); params.emplace_back(va_arg(args, unsigned int));
break; break;
}
case 'q': case 'q':
{
params.emplace_back(va_arg(args, signed int)); params.emplace_back(va_arg(args, signed int));
break; break;
}
case 'l': case 'l':
{
params.emplace_back(va_arg(args, unsigned long long)); params.emplace_back(va_arg(args, unsigned long long));
break; break;
}
case 'w': case 'w':
{
params.emplace_back(va_arg(args, signed long long)); params.emplace_back(va_arg(args, signed long long));
break; break;
}
case 'f': case 'f':
{
params.emplace_back(va_arg(args, double)); params.emplace_back(va_arg(args, double));
break; break;
}
case 'p': case 'p':
{
params.emplace_back(va_arg(args, void*)); params.emplace_back(va_arg(args, void*));
break; break;
}
case 's': case 's':
{
params.emplace_back(va_arg(args, const char*)); params.emplace_back(va_arg(args, const char*));
break; break;
}
case 'b':
params.emplace_back(va_arg(args, int));
break;
default: default:
throw runtime_error("C++ call: Unknown argument identifier " + c); throw runtime_error("C++ call: Unknown argument identifier " + c);