oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

GameUI refactor (part 1/X): GameUI object creation + GameUIFlags move to GameUI

Browse source 
Game class is too huge and has too specialization on various subjects, like UI, formspecs, client, renderer. Start to move UI related things to GameUI object and cleanup them

Other improvements:
* updateChat: more performance on error messages by remove string copies
* Initialize all game class members in definition instead of constructor (with nullptr instead of NULL)
* Drop unused Client::show{GameChat,GameHud,Profiler,GameFog}
* Add GameUI unittests
This commit is contained in:
Loic Blot 2018-01-03 14:28:55 +01:00 • committed by Loïc Blot
parent 549cfd9db8
commit 0ebaed430a
9 changed files with 229 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/client.h
View file

@ -112,7 +112,7 @@ private:
};
class ClientScripting;
struct GameUIFlags;
class GameUI;
class Client : public con::PeerHandler, public InventoryManager, public IGameDef
{
@ -133,7 +133,7 @@ public:
ISoundManager *sound,
MtEventManager *event,
bool ipv6,
GameUIFlags *game_ui_flags
GameUI *game_ui
);
~Client();
@ -400,12 +400,7 @@ public:
void pushToEventQueue(ClientEvent *event);
void showGameChat(bool show = true);
void showGameHud(bool show = true);
void showMinimap(bool show = true);
void showProfiler(bool show = true);
void showGameFog(bool show = true);
void showGameDebug(bool show = true);
const Address getServerAddress();
@ -570,6 +565,8 @@ private:
// own state
LocalClientState m_state;
GameUI *m_game_ui;
// Used for saving server map to disk client-side
MapDatabase *m_localdb = nullptr;
IntervalLimiter m_localdb_save_interval;
@ -580,7 +577,6 @@ private:
std::unordered_map<std::string, ModMetadata *> m_mod_storages;
float m_mod_storage_save_timer = 10.0f;
std::vector<ModSpec> m_mods;
GameUIFlags *m_game_ui_flags;
bool m_shutdown = false;