From 1fb2176cfa3e4eec3d603ce7e4aafc0c178dd48b Mon Sep 17 00:00:00 2001 From: Koncord Date: Sat, 18 Feb 2017 12:58:12 +0800 Subject: [PATCH] [Server] Add forgotten type for callbacks --- apps/openmw-mp/Script/LangLua/LangLua.cpp | 3 +++ apps/openmw-mp/Script/ScriptFunctions.cpp | 18 ++++-------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/apps/openmw-mp/Script/LangLua/LangLua.cpp b/apps/openmw-mp/Script/LangLua/LangLua.cpp index 4f7782ed9..cfe7d21b7 100644 --- a/apps/openmw-mp/Script/LangLua/LangLua.cpp +++ b/apps/openmw-mp/Script/LangLua/LangLua.cpp @@ -184,6 +184,9 @@ boost::any LangLua::Call(const char *name, const char *argl, const std::vector::push(lua, boost::any_cast(args.at(i))); break; + case 'b': + luabridge::Stack::push(lua, boost::any_cast(args.at(i))); + break; default: throw runtime_error("Lua call: Unknown argument identifier " + argl[i]); } diff --git a/apps/openmw-mp/Script/ScriptFunctions.cpp b/apps/openmw-mp/Script/ScriptFunctions.cpp index f0658aace..42f9ec557 100644 --- a/apps/openmw-mp/Script/ScriptFunctions.cpp +++ b/apps/openmw-mp/Script/ScriptFunctions.cpp @@ -30,46 +30,36 @@ void ScriptFunctions::GetArguments(std::vector ¶ms, 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);