X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FInterface.hpp;h=82eade3be2b06771e49ffd159409520c12f42bbb;hb=376fc1fca87fcdd22dabadf6d01d245ef8c3cedd;hp=1ade2d1bf326b4d776f60e4eb8e1821ae85a5c40;hpb=a1f911f8257f614f874c201fede5d5206f5b7e80;p=blank.git diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp index 1ade2d1..82eade3 100644 --- a/src/ui/Interface.hpp +++ b/src/ui/Interface.hpp @@ -1,13 +1,13 @@ #ifndef BLANK_UI_INTERFACE_HPP_ #define BLANK_UI_INTERFACE_HPP_ +#include "FixedText.hpp" #include "HUD.hpp" +#include "MessageBox.hpp" #include "../app/FPSController.hpp" #include "../app/IntervalTimer.hpp" #include "../audio/Sound.hpp" -#include "../graphics/FixedText.hpp" #include "../graphics/Font.hpp" -#include "../graphics/MessageBox.hpp" #include "../model/geometry.hpp" #include "../model/OutlineModel.hpp" #include "../world/Block.hpp" @@ -18,10 +18,8 @@ namespace blank { -class Assets; -class Audio; class Chunk; -class FrameCounter; +class Environment; class Viewport; class World; @@ -39,7 +37,7 @@ public: bool visual_disabled = false; }; - Interface(const Config &, const Assets &, Audio &, const FrameCounter &, World &); + Interface(const Config &, Environment &, World &); void HandlePress(const SDL_KeyboardEvent &); void HandleRelease(const SDL_KeyboardEvent &); @@ -86,8 +84,7 @@ private: void CheckAim(); private: - Audio &audio; - const FrameCounter &counter; + Environment &env; World &world; FPSController ctrl; Font font;