diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2014-04-27 17:55:49 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2014-05-07 17:14:23 -0400 |
| commit | 1cd512913e4d4ad1fb43d4b6e3d7971bb6c67528 (patch) | |
| tree | 8c1e2c708f567656684e89faee4f7c8e6c5ec673 /src/script/cpp_api/s_base.cpp | |
| parent | fef2729fd0945601e6772780514ee55fec35b068 (diff) | |
| download | minetest-1cd512913e4d4ad1fb43d4b6e3d7971bb6c67528.tar.gz minetest-1cd512913e4d4ad1fb43d4b6e3d7971bb6c67528.tar.bz2 minetest-1cd512913e4d4ad1fb43d4b6e3d7971bb6c67528.zip | |
Organize builtin into subdirectories
Diffstat (limited to 'src/script/cpp_api/s_base.cpp')
| -rw-r--r-- | src/script/cpp_api/s_base.cpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp index 774b3f51d..1a172fd31 100644 --- a/src/script/cpp_api/s_base.cpp +++ b/src/script/cpp_api/s_base.cpp @@ -88,9 +88,9 @@ ScriptApiBase::ScriptApiBase() lua_pop(m_luastack, 1); #endif - m_server = 0; - m_environment = 0; - m_guiengine = 0; + m_server = NULL; + m_environment = NULL; + m_guiengine = NULL; } ScriptApiBase::~ScriptApiBase() @@ -103,24 +103,14 @@ bool ScriptApiBase::loadMod(const std::string &scriptpath, { ModNameStorer modnamestorer(getStack(), modname); - if(!string_allowed(modname, MODNAME_ALLOWED_CHARS)){ + if (!string_allowed(modname, MODNAME_ALLOWED_CHARS)) { errorstream<<"Error loading mod \""<<modname <<"\": modname does not follow naming conventions: " <<"Only chararacters [a-z0-9_] are allowed."<<std::endl; return false; } - bool success = false; - - try{ - success = loadScript(scriptpath); - } - catch(LuaError &e){ - errorstream<<"Error loading mod \""<<modname - <<"\": "<<e.what()<<std::endl; - } - - return success; + return loadScript(scriptpath); } bool ScriptApiBase::loadScript(const std::string &scriptpath) |