diff options
| author | Dániel Juhász <juhdanad@gmail.com> | 2018-02-10 22:04:16 +0200 |
|---|---|---|
| committer | SmallJoker <SmallJoker@users.noreply.github.com> | 2018-02-10 21:04:16 +0100 |
| commit | 3face01a202040e4feff3b0936b4aa89c051c98d (patch) | |
| tree | ccdad6773aa9705cc07fdc9f71f28bae395f353e /src/game.cpp | |
| parent | 617d94c8038e3ff035eaeef7ccdfa4f442feb873 (diff) | |
| download | minetest-3face01a202040e4feff3b0936b4aa89c051c98d.tar.gz minetest-3face01a202040e4feff3b0936b4aa89c051c98d.tar.bz2 minetest-3face01a202040e4feff3b0936b4aa89c051c98d.zip | |
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
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game.cpp b/src/game.cpp index 598be12d6..2145d565d 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -255,7 +255,7 @@ public: class SoundMaker { ISoundManager *m_sound; - INodeDefManager *m_ndef; + const NodeDefManager *m_ndef; public: bool makes_footstep_sound; float m_player_step_timer; @@ -264,7 +264,7 @@ public: SimpleSoundSpec m_player_leftpunch_sound; SimpleSoundSpec m_player_rightpunch_sound; - SoundMaker(ISoundManager *sound, INodeDefManager *ndef): + SoundMaker(ISoundManager *sound, const NodeDefManager *ndef): m_sound(sound), m_ndef(ndef), makes_footstep_sound(true), @@ -809,7 +809,7 @@ private: // When created, these will be filled with data received from the server IWritableItemDefManager *itemdef_manager = nullptr; - IWritableNodeDefManager *nodedef_manager = nullptr; + NodeDefManager *nodedef_manager = nullptr; GameOnDemandSoundFetcher soundfetcher; // useful when testing ISoundManager *sound = nullptr; @@ -3066,7 +3066,7 @@ PointedThing Game::updatePointedThing( ClientEnvironment &env = client->getEnv(); ClientMap &map = env.getClientMap(); - INodeDefManager *nodedef = map.getNodeDefManager(); + const NodeDefManager *nodedef = map.getNodeDefManager(); runData.selected_object = NULL; @@ -3252,7 +3252,7 @@ bool Game::nodePlacementPrediction(const ItemDefinition &playeritem_def, const ItemStack &playeritem, const v3s16 &nodepos, const v3s16 &neighbourpos) { std::string prediction = playeritem_def.node_placement_prediction; - INodeDefManager *nodedef = client->ndef(); + const NodeDefManager *nodedef = client->ndef(); ClientMap &map = client->getEnv().getClientMap(); MapNode node; bool is_valid_position; |