krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests 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)));
break;
case 'b':
luabridge::Stack<bool>::push(lua, boost::any_cast<int>(args.at(i)));
break;
default:
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)
{
case 'i':
{
params.emplace_back(va_arg(args, unsigned int));
break;
}
case 'q':
{
params.emplace_back(va_arg(args, signed int));
break;
}
case 'l':
{
params.emplace_back(va_arg(args, unsigned long long));
break;
}
case 'w':
{
params.emplace_back(va_arg(args, signed long long));
break;
}
case 'f':
{
params.emplace_back(va_arg(args, double));
break;
}
case 'p':
{
params.emplace_back(va_arg(args, void*));
break;
}
case 's':
{
params.emplace_back(va_arg(args, const char*));
break;
}
case 'b':
params.emplace_back(va_arg(args, int));
break;
default:
throw runtime_error("C++ call: Unknown argument identifier " + c);