luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 09:05:19 +02:00
Code Activity

Node definition manager refactor (#7016)

Browse Source 
* Rename IWritableNodeDefManager to NodeDefManager
* Make INodeDefManager functions const
* Use "const *NodeDefManager" instead of "*INodeDefManager"
* Remove unused INodeDefManager class
* Merge NodeDefManager and CNodeDefManager
* Document NodeDefManager
This commit is contained in:
Dániel Juhász
2018-02-10 22:04:16 +02:00
committed by SmallJoker
parent 617d94c803
commit 3face01a20
61 changed files with 583 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/common/c_content.cpp
View File

@@ -1075,7 +1075,7 @@ NodeBox read_nodebox(lua_State *L, int index)
}
/******************************************************************************/
MapNode readnode(lua_State *L, int index, INodeDefManager *ndef)
MapNode readnode(lua_State *L, int index, const NodeDefManager *ndef)
{
lua_getfield(L, index, "name");
if (!lua_isstring(L, -1))
@@ -1099,7 +1099,7 @@ MapNode readnode(lua_State *L, int index, INodeDefManager *ndef)
}
/******************************************************************************/
void pushnode(lua_State *L, const MapNode &n, INodeDefManager *ndef)
void pushnode(lua_State *L, const MapNode &n, const NodeDefManager *ndef)
{
lua_newtable(L);
lua_pushstring(L, ndef->get(n).name.c_str());

6
src/script/common/c_content.h
View File

@@ -44,7 +44,7 @@ extern "C" {
namespace Json { class Value; }
struct MapNode;
class INodeDefManager;
class NodeDefManager;
struct PointedThing;
struct ItemStack;
struct ItemDefinition;
@@ -120,9 +120,9 @@ void read_inventory_list (lua_State *L, int tableindex,
Server *srv, int forcesize=-1);
MapNode readnode (lua_State *L, int index,
INodeDefManager *ndef);
const NodeDefManager *ndef);
void pushnode (lua_State *L, const MapNode &n,
INodeDefManager *ndef);
const NodeDefManager *ndef);
void read_groups (lua_State *L, int index,