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/clientenvironment.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/clientenvironment.h')
-rw-r--r-- | src/clientenvironment.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/clientenvironment.h b/src/clientenvironment.h index e6292b5b7..b30a7a6d7 100644 --- a/src/clientenvironment.h +++ b/src/clientenvironment.h @@ -30,6 +30,7 @@ class ClientMap; class ClientActiveObject; class GenericCAO; class LocalPlayer; +struct PointedThing; /* The client-side environment. @@ -66,15 +67,14 @@ class ClientEnvironment : public Environment { public: ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr, - ITextureSource *texturesource, IGameDef *gamedef, + ITextureSource *texturesource, Client *client, IrrlichtDevice *device); ~ClientEnvironment(); Map & getMap(); ClientMap & getClientMap(); - IGameDef *getGameDef() - { return m_gamedef; } + Client *getGameDef() { return m_client; } void step(f32 dtime); @@ -175,7 +175,7 @@ private: LocalPlayer *m_local_player; scene::ISceneManager *m_smgr; ITextureSource *m_texturesource; - IGameDef *m_gamedef; + Client *m_client; IrrlichtDevice *m_irr; UNORDERED_MAP<u16, ClientActiveObject*> m_active_objects; std::vector<ClientSimpleObject*> m_simple_objects; |