oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

Refactor Game class (part 2) (#5422)

Browse source 
* showPauseMenu is now part of game
* remove many flags parameters passed to game functions, use the member.
* rename VolatileRunFlags to GameUIFlags (this will permit to share structure with client and CSM
* updatePointedThing: remove pointer ref, we already have the pointer in rundata
* move some attributes outside of VolatileRunFlags after renaming, to game class
* rename statustext to m_statustext
* make some const variables static
* All those changes permit to reduce a little bit function class cost and will permit to interface CSM with some interesting Game flags
* Expose GameUIFlags to client
* Client now have GameUIFlags parameter and setters for other classes
* Fix minimap show/hide in Lua because we now have access to the real flag
This commit is contained in:
Loïc Blot 2017-03-19 13:18:52 +01:00 • committed by GitHub
parent 2e3778ec0c
commit 3c4ac70348
6 changed files with 285 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/client.h
View file

@ -307,6 +307,7 @@ private:
};
class ClientScripting;
class GameUIFlags;
class Client : public con::PeerHandler, public InventoryManager, public IGameDef
{
@ -326,7 +327,8 @@ public:
IWritableNodeDefManager *nodedef,
ISoundManager *sound,
MtEventManager *event,
bool ipv6
bool ipv6,
GameUIFlags *game_ui_flags
);
~Client();
@ -578,6 +580,13 @@ public:
m_client_event_queue.push(event);
}
void showGameChat(const bool show = true);
void showGameHud(const bool show = true);
void showMinimap(const bool show = true);
void showProfiler(const bool show = true);
void showGameFog(const bool show = true);
void showGameDebug(const bool show = true);
private:
// Virtual methods from con::PeerHandler
@ -725,6 +734,7 @@ private:
bool m_modding_enabled;
UNORDERED_MAP<std::string, ModMetadata *> m_mod_storages;
float m_mod_storage_save_timer;
GameUIFlags *m_game_ui_flags;
DISABLE_CLASS_COPY(Client);
};