diff options
| author | Ner'zhul <nerzhul@users.noreply.github.com> | 2017-01-09 20:39:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-09 20:39:22 +0100 |
| commit | 8e7449e09253e138716d8dbad6a2ab5c6e089e28 (patch) | |
| tree | ca6895fb557229445b04639efe7fc57b3e33157b /src/content_cao.h | |
| parent | 11df7e886a674e280e3ec6f895c11fc1e70eb7b3 (diff) | |
| download | minetest-8e7449e09253e138716d8dbad6a2ab5c6e089e28.tar.gz minetest-8e7449e09253e138716d8dbad6a2ab5c6e089e28.tar.bz2 minetest-8e7449e09253e138716d8dbad6a2ab5c6e089e28.zip | |
Environment & IGameDef code refactoring (#4985)
* Environment code refactoring
* Cleanup includes & class declarations in client & server environment to improve build speed
* ServerEnvironment::m_gamedef is now a pointer to Server instead of IGameDef, permitting to cleanup many casts.
* Cleanup IGameDef
* Move ITextureSource* IGameDef::getTextureSource() to Client only.
* Also move ITextureSource *IGameDef::tsrc() helper
* drop getShaderSource, getSceneManager, getSoundManager & getCamera abstract call
* drop unused emerge() call
* cleanup server unused functions (mentionned before)
* Drop one unused parameter from ContentFeatures::updateTextures
* move checkLocalPrivilege to Client
* Remove some unnecessary casts
* create_formspec_menu: remove IWritableTextureSource pointer, as client already knows it
* Fix some comments
* Change required IGameDef to Server/Client pointers
* Previous change that game.cpp sometimes calls functions with Client + InventoryManager + IGameDef in same functions but it's the same objects
* Remove duplicate Client pointer in GUIFormSpecMenu::GUIFormSpecMenu
* drop ClientMap::sectorWasDrawn which is unused
Diffstat (limited to 'src/content_cao.h')
| -rw-r--r-- | src/content_cao.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/content_cao.h b/src/content_cao.h index a158e8296..96a160055 100644 --- a/src/content_cao.h +++ b/src/content_cao.h @@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "itemgroup.h" class Camera; +class Client; struct Nametag; /* @@ -68,7 +69,7 @@ private: // scene::ISceneManager *m_smgr; IrrlichtDevice *m_irr; - IGameDef *m_gamedef; + Client *m_client; aabb3f m_selection_box; scene::IMeshSceneNode *m_meshnode; scene::IAnimatedMeshSceneNode *m_animated_meshnode; @@ -109,13 +110,13 @@ private: std::vector<u16> m_children; public: - GenericCAO(IGameDef *gamedef, ClientEnvironment *env); + GenericCAO(Client *client, ClientEnvironment *env); ~GenericCAO(); - static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env) + static ClientActiveObject* create(Client *client, ClientEnvironment *env) { - return new GenericCAO(gamedef, env); + return new GenericCAO(client, env); } inline ActiveObjectType getType() const |