Merge branch 'master' of https://github.com/celeron55/minetest

CMakeLists.txt

@@ -10,7 +10,7 @@ project(minetest)
 # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH dev-20111204-1)
+set(VERSION_PATCH dev-20111209-1)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")

data/mods/default/init.lua

@@ -110,6 +110,7 @@
 -- minetest.chat_send_all(text)
 -- minetest.chat_send_player(name, text)
 -- minetest.get_player_privs(name) -> set of privs
+-- minetest.get_modpath(modname) -> eg. "/home/user/.minetest/usermods/modname"
 --
 -- stackstring_take_item(stackstring) -> stackstring, item
 -- stackstring_put_item(stackstring, item) -> stackstring, success

data/mods/experimental/init.lua

@@ -169,7 +169,7 @@ minetest.register_node("experimental:tnt", {
 minetest.register_on_punchnode(function(p, node)
 	if node.name == "experimental:tnt" then
 		minetest.env:remove_node(p)
-		minetest.env:add_luaentity(p, "experimental:tnt")
+		minetest.env:add_entity(p, "experimental:tnt")
 		nodeupdate(p)
 	end
 end)
@@ -405,4 +405,6 @@ minetest.register_abm({
     end,
 })--]]
 
+print("experimental modpath="..dump(minetest.get_modpath("experimental")))
 
+-- END

src/game.cpp

@@ -902,7 +902,7 @@ void the_game(
 	bool got_content = false;
 	{
 		float frametime = 0.033;
-		const float timeout = 5.0;
+		const float timeout = 30.0;
 		float time_counter = 0.0;
 		for(;;)
 		{

src/mods.h

@@ -17,6 +17,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#ifndef MODS_HEADER
+#define MODS_HEADER
+
 #include "irrlichttypes.h"
 #include <set>
 #include <string>
@@ -59,3 +62,5 @@ struct ModSpec
 core::list<ModSpec> getMods(core::list<std::string> &modspaths)
 		throw(ModError);
 
+#endif
+

src/scriptapi.cpp

@@ -164,7 +164,7 @@ void check_modname_prefix(lua_State *L, std::string &name)
 			"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"))
 		throw LuaError(L, std::string("Name \"")+name
 				+"\" does not follow naming conventions: "
-				+"\"contains unallowed characters)");
+				+"\"contains unallowed characters");
 }
 
 static v3f readFloatPos(lua_State *L, int index)
@@ -1334,6 +1334,23 @@ static int l_get_player_privs(lua_State *L)
 	return 1;
 }
 
+// get_modpath(modname)
+static int l_get_modpath(lua_State *L)
+{
+	const char *modname = luaL_checkstring(L, 1);
+	// Get server from registry
+	lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
+	Server *server = (Server*)lua_touserdata(L, -1);
+	// Do it
+	const ModSpec *mod = server->getModSpec(modname);
+	if(!mod){
+		lua_pushnil(L);
+		return 1;
+	}
+	lua_pushstring(L, mod->path.c_str());
+	return 1;
+}
+
 static const struct luaL_Reg minetest_f [] = {
 	{"register_nodedef_defaults", l_register_nodedef_defaults},
 	{"register_entity", l_register_entity},
@@ -1350,6 +1367,7 @@ static const struct luaL_Reg minetest_f [] = {
 	{"chat_send_all", l_chat_send_all},
 	{"chat_send_player", l_chat_send_player},
 	{"get_player_privs", l_get_player_privs},
+	{"get_modpath", l_get_modpath},
 	{NULL, NULL}
 };
 
@@ -2672,6 +2690,14 @@ bool scriptapi_loadmod(lua_State *L, const std::string &scriptpath,
 {
 	ModNameStorer modnamestorer(L, modname);
 
+	if(!string_allowed(modname, "abcdefghijklmnopqrstuvwxyz"
+			"0123456789_")){
+		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{

src/server.cpp

@@ -910,10 +910,10 @@ Server::Server(
 		throw ModError("Failed to load and run "+builtinpath);
 	}
 	// Load and run "mod" scripts
-	core::list<ModSpec> mods = getMods(m_modspaths);
-	for(core::list<ModSpec>::Iterator i = mods.begin();
-			i != mods.end(); i++){
-		ModSpec mod = *i;
+	m_mods = getMods(m_modspaths);
+	for(core::list<ModSpec>::Iterator i = m_mods.begin();
+			i != m_mods.end(); i++){
+		const ModSpec &mod = *i;
 		infostream<<"Server: Loading mod \""<<mod.name<<"\""<<std::endl;
 		std::string scriptpath = mod.path + DIR_DELIM + "init.lua";
 		bool success = scriptapi_loadmod(m_lua, scriptpath, mod.name);
@@ -4203,10 +4203,9 @@ void Server::SendTextures(u16 peer_id)
 	texture_bunches.push_back(core::list<SendableTexture>());
 	
 	u32 texture_size_bunch_total = 0;
-	core::list<ModSpec> mods = getMods(m_modspaths);
-	for(core::list<ModSpec>::Iterator i = mods.begin();
-			i != mods.end(); i++){
-		ModSpec mod = *i;
+	for(core::list<ModSpec>::Iterator i = m_mods.begin();
+			i != m_mods.end(); i++){
+		const ModSpec &mod = *i;
 		std::string texturepath = mod.path + DIR_DELIM + "textures";
 		std::vector<fs::DirListNode> dirlist = fs::GetDirListing(texturepath);
 		for(u32 j=0; j<dirlist.size(); j++){
@@ -4560,6 +4559,17 @@ IWritableCraftItemDefManager* Server::getWritableCraftItemDefManager()
 	return m_craftitemdef;
 }
 
+const ModSpec* Server::getModSpec(const std::string &modname)
+{
+	for(core::list<ModSpec>::Iterator i = m_mods.begin();
+			i != m_mods.end(); i++){
+		const ModSpec &mod = *i;
+		if(mod.name == modname)
+			return &mod;
+	}
+	return NULL;
+}
+
 v3f findSpawnPos(ServerMap &map)
 {
 	//return v3f(50,50,50)*BS;

src/server.h

@@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gamedef.h"
 #include "serialization.h" // For SER_FMT_VER_INVALID
 #include "serverremoteplayer.h"
+#include "mods.h"
 struct LuaState;
 typedef struct lua_State lua_State;
 class IWritableToolDefManager;
@@ -502,6 +503,8 @@ public:
 	IWritableCraftDefManager* getWritableCraftDefManager();
 	IWritableCraftItemDefManager* getWritableCraftItemDefManager();
 
+	const ModSpec* getModSpec(const std::string &modname);
+
 private:
 
 	// con::PeerHandler implementation.
@@ -646,6 +649,9 @@ private:
 	// CraftItem definition manager
 	IWritableCraftItemDefManager *m_craftitemdef;
 	
+	// Mods
+	core::list<ModSpec> m_mods;
+	
 	/*
 		Threads
 	*/