From 112dbba7c4d38bf780e4e2f05bdff106b52ce2f9 Mon Sep 17 00:00:00 2001 From: Kahrl Date: Sun, 14 Jul 2013 00:55:47 +0200 Subject: Change ContentFeatures array to a vector --- src/script/lua_api/l_item.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/script') diff --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp index 4069c61ce..6182c037b 100644 --- a/src/script/lua_api/l_item.cpp +++ b/src/script/lua_api/l_item.cpp @@ -432,10 +432,15 @@ int ModApiItemMod::l_register_item_raw(lua_State *L) idef->registerItem(def); // Read the node definition (content features) and register it - if(def.type == ITEM_NODE) - { + if(def.type == ITEM_NODE){ ContentFeatures f = read_content_features(L, table); - ndef->set(f.name, f); + content_t id = ndef->set(f.name, f); + + if(id > MAX_REGISTERED_CONTENT){ + throw LuaError(L, "Number of registerable nodes (" + + itos(MAX_REGISTERED_CONTENT+1) + + ") exceeded (" + name + ")"); + } } return 0; /* number of results */ -- cgit v1.2.3