hpp+

src/frontend/ContentGfxCache.cpp

@@ -1,5 +1,7 @@
 #include "ContentGfxCache.hpp"
 
+#include "UiDocument.hpp"
+
 #include "../assets/Assets.h"
 #include "../content/Content.h"
 #include "../content/ContentPack.h"
@@ -7,7 +9,6 @@
 #include "../graphics/core/Atlas.hpp"
 #include "../maths/UVRegion.hpp"
 #include "../voxels/Block.h"
-#include "UiDocument.hpp"
 
 #include <string>
 

src/frontend/LevelFrontend.cpp

@@ -1,4 +1,6 @@
-#include "LevelFrontend.h"
+#include "LevelFrontend.hpp"
+
+#include "ContentGfxCache.hpp"
 
 #include "../assets/Assets.h"
 #include "../audio/audio.hpp"
@@ -9,7 +11,6 @@
 #include "../logic/PlayerController.h"
 #include "../voxels/Block.h"
 #include "../world/Level.h"
-#include "ContentGfxCache.hpp"
 
 LevelFrontend::LevelFrontend(LevelController* controller, Assets* assets) 
   : level(controller->getLevel()),

src/frontend/LevelFrontend.hpp

@@ -1,5 +1,5 @@
-#ifndef FRONTEND_LEVEL_FRONTEND_H_
-#define FRONTEND_LEVEL_FRONTEND_H_
+#ifndef FRONTEND_LEVEL_FRONTEND_HPP_
+#define FRONTEND_LEVEL_FRONTEND_HPP_
 
 #include <memory>
 
@@ -23,4 +23,4 @@ public:
     LevelController* getController() const;
 };
 
-#endif // FRONTEND_LEVEL_FRONTEND_H_
+#endif // FRONTEND_LEVEL_FRONTEND_HPP_

src/frontend/hud.cpp

@@ -1,5 +1,9 @@
 #include "hud.hpp"
 
+#include "ContentGfxCache.hpp"
+#include "LevelFrontend.hpp"
+#include "UiDocument.hpp"
+
 #include "../assets/Assets.h"
 #include "../content/Content.h"
 #include "../core_defs.h"
@@ -39,9 +43,6 @@
 #include "../window/Window.hpp"
 #include "../world/Level.h"
 #include "../world/World.h"
-#include "ContentGfxCache.hpp"
-#include "LevelFrontend.h"
-#include "UiDocument.hpp"
 
 #include <assert.h>
 #include <memory>

src/frontend/locale.cpp

@@ -1,13 +1,14 @@
-#include "langs.h"
+#include "locale.hpp"
 
-#include <iostream>
+#include "../coders/json.h"
+#include "../coders/commons.h"
+#include "../content/ContentPack.h"
+#include "../files/files.h"
+#include "../util/stringutil.h"
+#include "../data/dynamic.h"
+#include "../debug/Logger.hpp"
 
-#include "../../coders/json.h"
-#include "../../coders/commons.h"
-#include "../../content/ContentPack.h"
-#include "../../files/files.h"
-#include "../../util/stringutil.h"
-#include "../../data/dynamic.h"
+static debug::Logger logger("locale");
 
 namespace fs = std::filesystem;
 

src/frontend/locale.hpp

@@ -1,5 +1,7 @@
-#ifndef FRONTEND_LOCALE_LANGS_H
-#define FRONTEND_LOCALE_LANGS_H
+#ifndef FRONTEND_LOCALES_HPP_
+#define FRONTEND_LOCALES_HPP_
+
+#include "../content/ContentPack.h"
 
 #include <string>
 #include <vector>
@@ -7,8 +9,6 @@
 #include <filesystem>
 #include <unordered_map>
 
-#include "../../content/ContentPack.h"
-
 namespace langs {
     const char LANG_FILE_EXT[] = ".txt";
     const char TEXTS_FOLDER[] = "texts";
@@ -69,4 +69,4 @@ namespace langs {
                       const std::vector<ContentPack>& packs);
 }
 
-#endif // FRONTEND_LOCALE_LANGS_H
+#endif // FRONTEND_LOCALES_HPP_

src/frontend/menu.cpp

@@ -1,7 +1,7 @@
 #include "menu.hpp"
 
-#include <filesystem>
-#include <glm/glm.hpp>
+#include "locale.hpp"
+#include "UiDocument.hpp"
 
 #include "../delegates.h"
 #include "../engine.h"
@@ -16,8 +16,9 @@
 #include "../coders/commons.h"
 #include "../util/stringutil.h"
 #include "../window/Window.hpp"
-#include "locale/langs.h"
-#include "UiDocument.hpp"
+
+#include <filesystem>
+#include <glm/glm.hpp>
 
 namespace fs = std::filesystem;
 using namespace gui;

src/frontend/screens/LevelScreen.cpp

@@ -1,7 +1,7 @@
 #include "LevelScreen.hpp"
 
 #include "../hud.hpp"
-#include "../LevelFrontend.h"
+#include "../LevelFrontend.hpp"
 #include "../../debug/Logger.hpp"
 #include "../../audio/audio.hpp"
 #include "../../coders/imageio.hpp"