X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstandalone%2FMasterState.hpp;h=26fcf26742a62cb4e05ca49208b5a9df5bc9ec63;hb=69e4d6c0a86a27f9b3f1297e46c55b36059a24b9;hp=6e630200fa9eab8e60b653e7fb5bf76cae1b9d53;hpb=9c5308ba4108bd842af6d9d2e893ea575a7e6ca8;p=blank.git diff --git a/src/standalone/MasterState.hpp b/src/standalone/MasterState.hpp index 6e63020..26fcf26 100644 --- a/src/standalone/MasterState.hpp +++ b/src/standalone/MasterState.hpp @@ -7,7 +7,9 @@ #include "PreloadState.hpp" #include "UnloadState.hpp" #include "../ai/Spawner.hpp" +#include "../audio/SoundBank.hpp" #include "../graphics/SkyBox.hpp" +#include "../shared/ChatState.hpp" #include "../shared/WorldResources.hpp" #include "../ui/DirectInput.hpp" #include "../ui/HUD.hpp" @@ -30,7 +32,8 @@ namespace standalone { class MasterState : public State -, public ClientController { +, public ClientController +, public ChatState::Responder { public: MasterState( @@ -45,6 +48,9 @@ public: void OnResume() override; void OnPause() override; + void OnFocus() override; + void OnBlur() override; + void Handle(const SDL_Event &) override; void Update(int dt) override; void Render(Viewport &) override; @@ -58,10 +64,13 @@ public: void SetDebug(bool) override; void Exit() override; + void OnLineSubmit(const std::string &) override; + private: Config &config; Environment &env; WorldResources res; + SoundBank sounds; const WorldSave &save; World world; ChunkIndex &spawn_index; @@ -80,6 +89,7 @@ private: PreloadState preload; UnloadState unload; + ChatState chat; };