Skip to content

Commit 3face01

Browse files
juhdanadSmallJoker
authored andcommittedFeb 10, 2018
Node definition manager refactor (#7016)
* Rename IWritableNodeDefManager to NodeDefManager * Make INodeDefManager functions const * Use "const *NodeDefManager" instead of "*INodeDefManager" * Remove unused INodeDefManager class * Merge NodeDefManager and CNodeDefManager * Document NodeDefManager
1 parent 617d94c commit 3face01

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+585
-459
lines changed
 

Diff for: ‎src/camera.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, f32 tool_r
413413
my_cp.Y = m_camera_position.Y + (m_camera_direction.Y * -i);
414414

415415
// Prevent camera positioned inside nodes
416-
INodeDefManager *nodemgr = m_client->ndef();
416+
const NodeDefManager *nodemgr = m_client->ndef();
417417
MapNode n = m_client->getEnv().getClientMap()
418418
.getNodeNoEx(floatToInt(my_cp, BS));
419419

Diff for: ‎src/client.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Client::Client(
7171
IWritableTextureSource *tsrc,
7272
IWritableShaderSource *shsrc,
7373
IWritableItemDefManager *itemdef,
74-
IWritableNodeDefManager *nodedef,
74+
NodeDefManager *nodedef,
7575
ISoundManager *sound,
7676
MtEventManager *event,
7777
bool ipv6,
@@ -1798,7 +1798,7 @@ IItemDefManager* Client::getItemDefManager()
17981798
{
17991799
return m_itemdef;
18001800
}
1801-
INodeDefManager* Client::getNodeDefManager()
1801+
const NodeDefManager* Client::getNodeDefManager()
18021802
{
18031803
return m_nodedef;
18041804
}

0 commit comments

Comments
 (0)
Please sign in to comment.