diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
| commit | 5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch) | |
| tree | de739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/scripting/luascript.cpp | |
| parent | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff) | |
| parent | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff) | |
| download | manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2 manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/scripting/luascript.cpp')
| -rw-r--r-- | src/scripting/luascript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp index f5fb6a4e..2b9644da 100644 --- a/src/scripting/luascript.cpp +++ b/src/scripting/luascript.cpp @@ -155,7 +155,7 @@ bool LuaScript::resume() #if LUA_VERSION_NUM < 502 int result = lua_resume(mCurrentState, tmpNbArgs); #else - int result = lua_resume(mCurrentState, NULL, tmpNbArgs); + int result = lua_resume(mCurrentState, nullptr, tmpNbArgs); #endif if (result == 0) // Thread is done |