Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2026-01-17 11:01:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

rework log function and protocol

Browse Source 
* remove some protocol ifdefs, replace with game features system
This commit is contained in:
Eduardo Bart
2012-05-28 19:04:44 -03:00
parent 4c80d783d6
commit c01b32b032
51 changed files with 391 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/framework/luascript/luaexception.cpp
View File

@@ -33,21 +33,21 @@ void LuaException::generateLuaErrorMessage(const std::string& error, int traceLe
{
// append trace level to error message
if(traceLevel >= 0)
m_what = stdext::mkstr("LUA ERROR: ", g_lua.traceback(error, traceLevel));
m_what = stdext::format("LUA ERROR: %s", g_lua.traceback(error, traceLevel));
else
m_what = stdext::mkstr("LUA ERROR: ", error);
m_what = stdext::format("LUA ERROR: %s", error);
}
LuaBadNumberOfArgumentsException::LuaBadNumberOfArgumentsException(int expected, int got)
{
std::string error = "attempt to call a function with wrong number of arguments";
if(expected >= 0 && got >= 0)
error = stdext::mkstr(error, " (expected ", expected, ", but got ", got, ")");
error = stdext::format("%s (expected %d, but got %d)", error, expected, got);
generateLuaErrorMessage(error, 1);
}
LuaBadValueCastException::LuaBadValueCastException(const std::string& luaTypeName, const std::string& cppTypeName)
{
std::string error = stdext::mkstr("attempt to cast a '", luaTypeName, "' lua value to '", cppTypeName, "'");
std::string error = stdext::format("attempt to cast a '%s' lua value to '%s'", luaTypeName, cppTypeName);
generateLuaErrorMessage(error, 0);
}

22
src/framework/luascript/luainterface.cpp
View File

@@ -163,12 +163,12 @@ void LuaInterface::registerClassMemberField(const std::string& className,
if(getFunction) {
pushCppFunction(getFunction);
setField(stdext::mkstr("get_", field));
setField(stdext::format("get_%s", field));
}
if(setFunction) {
pushCppFunction(setFunction);
setField(stdext::mkstr("set_", field));
setField(stdext::format("set_%s", field));
}
pop();
@@ -324,9 +324,9 @@ void LuaInterface::loadFunction(const std::string& buffer, const std::string& so
std::string buf;
if(boost::starts_with(buffer, "function"))
buf = stdext::mkstr("__func = ", buffer);
buf = stdext::format("__func = %s", buffer);
else
buf = stdext::mkstr("__func = function(self)\n", buffer,"\nend");
buf = stdext::format("__func = function(self)\n%s\nend", buffer);
loadBuffer(buf, source);
safeCall();
@@ -343,7 +343,7 @@ void LuaInterface::evaluateExpression(const std::string& expression, const std::
{
// evaluates the expression
if(!expression.empty()) {
std::string buffer = stdext::mkstr("__exp = (", expression, ")");
std::string buffer = stdext::format("__exp = (%s)", expression);
loadBuffer(buffer, source);
safeCall();
@@ -480,7 +480,7 @@ int LuaInterface::protectedCall(int numArgs, int requestedResults)
throw LuaException("attempt to call a non function value", 0);
}
} catch(LuaException &e) {
logError("protected lua call failed: ", e.what());
logError("protected lua call failed: %s", e.what());
}
// pushes nil values if needed
@@ -515,7 +515,7 @@ int LuaInterface::luaScriptLoader(lua_State* L)
g_lua.loadScript(fileName);
return 1;
} catch(LuaException& e) {
logError("failed to load script file '", fileName, "' :'", e.what());
logError("failed to load script file '%s': %s", fileName, e.what());
return 0;
}
}
@@ -531,7 +531,7 @@ int LuaInterface::luaScriptRunner(lua_State* L)
g_lua.call(0, LUA_MULTRET);
return g_lua.stackSize();
} catch(LuaException& e) {
logError("failed to load script file '", fileName, "' :'", e.what());
logError("failed to load script file '%s': %s", fileName, e.what());
return 0;
}
}
@@ -548,7 +548,7 @@ int LuaInterface::luaScriptsRunner(lua_State* L)
g_lua.loadScript(directory + "/" + fileName);
g_lua.call(0, 0);
} catch(LuaException& e) {
logError("failed to load script file '", fileName, "' :'", e.what());
logError("failed to load script file '%s': %s", fileName, e.what());
}
}
return 0;
@@ -583,7 +583,7 @@ int LuaInterface::luaCppFunctionCallback(lua_State* L)
g_lua.m_cppCallbackDepth--;
assert(numRets == g_lua.stackSize());
} catch(LuaException &e) {
logError("lua cpp callback failed: ", e.what());
logError("lua cpp callback failed: %s", e.what());
}
return numRets;
@@ -1019,7 +1019,7 @@ void LuaInterface::pushObject(const LuaObjectPtr& obj)
new(newUserdata(sizeof(LuaObjectPtr))) LuaObjectPtr(obj);
// set the userdata metatable
getGlobal(stdext::mkstr(obj->getClassName(), "_mt"));
getGlobal(stdext::format("%s_mt", obj->getClassName()));
assert(!isNil());
setMetatable();
}

4
src/framework/luascript/luavaluecasts.h
View File

@@ -205,7 +205,7 @@ bool luavalue_cast(int index, std::function<void(Args...)>& func) {
"did you forget to hold a reference for that function?", 0);
}
} catch(LuaException& e) {
logError("lua function callback failed: ", e.what());
logError("lua function callback failed: %s", e.what());
}
};
return true;
@@ -239,7 +239,7 @@ luavalue_cast(int index, std::function<Ret(Args...)>& func) {
"did you forget to hold a reference for that function?", 0);
}
} catch(LuaException& e) {
logError("lua function callback failed: ", e.what());
logError("lua function callback failed: %s", e.what());
}
return Ret();
};