Cleanup Vol. 2

dbeef · Dec 26, 2023 · 52b6d05 · 52b6d05
1 parent cc7ad8f
commit 52b6d05
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/src/game-loop/CMakeLists.txt b/src/game-loop/CMakeLists.txt
@@ -326,6 +326,10 @@ add_library(GameLoop STATIC
 
         # Other:
 
+        src/other/CheatConsoleInterpreter.cpp
+        src/other/NpcType.cpp
+        src/other/ItemType.cpp
+        src/game-loop/GameLoopState.cpp
         src/populator/Populator.cpp
         src/populator/Shop.cpp
         include/populator/Populator.hpp
@@ -339,6 +343,7 @@ add_library(GameLoop STATIC
         src/populator/LootFactory.cpp
         src/populator/NpcFactory.cpp
         interface/other/PhysicsComponentType.hpp
+        interface/game-loop/GameLoopState.hpp
         interface/other/Inventory.hpp
         interface/other/InventoryEvent.hpp
         interface/other/ItemType.hpp
@@ -350,7 +355,8 @@ add_library(GameLoop STATIC
         include/populator/ItemFactory.hpp
         include/populator/NpcFactory.hpp
         include/populator/LootFactory.hpp
-        src/other/NpcType.cpp src/other/ItemType.cpp include/other/CheatConsoleInterpreter.h src/other/CheatConsoleInterpreter.cpp interface/game-loop/GameLoopState.hpp src/game-loop/GameLoopState.cpp)
+        include/other/CheatConsoleInterpreter.h
+)
 
 target_include_directories(GameLoop
         PRIVATE include interface

diff --git a/src/game-loop/src/populator/Populator.cpp b/src/game-loop/src/populator/Populator.cpp
@@ -59,8 +59,6 @@ void Populator::generate_inventory_items(entt::entity main_dude)
     {
         entt::entity item = entt::null;
 
-        // TODO: ItemFactory, NpcFactory, LootFactory that takes an enum  
-
         switch (item_type)
         {
             case ItemType::ARROW: item = prefabs::Arrow::create(); break;

diff --git a/src/level/CMakeLists.txt b/src/level/CMakeLists.txt
@@ -4,6 +4,7 @@ add_library(Level STATIC
         src/Level.cpp
         src/MapTile.cpp
         src/TileBatch.cpp
+        src/LootType.cpp
         interface/Level.hpp
         interface/MapTile.hpp
         interface/MapTileType.hpp
@@ -21,7 +22,7 @@ add_library(Level STATIC
         include/ShopRooms.hpp
         include/SplashScreenRooms.hpp
         interface/NPCType.hpp
-        src/LootType.cpp)
+        )
 
 target_include_directories(Level
         PRIVATE include interface

diff --git a/src/level/interface/LootType.hpp b/src/level/interface/LootType.hpp
@@ -3,8 +3,9 @@
 #include <cstdint>
 
 using LootType_t = std::uint16_t;
-enum class LootType : LootType_t // FIXME
+enum class LootType : LootType_t
 {
+    // FIXME: Does not represent all types of loot
     NOTHING = 0,
     ANY = 1,
     SHOP_ITEM = 2,

diff --git a/src/texture-bank/CMakeLists.txt b/src/texture-bank/CMakeLists.txt
@@ -13,7 +13,8 @@ add_library(TextureBank STATIC
         interface/spritesheet-frames/MainDudeSpritesheetFrames.hpp
         interface/spritesheet-frames/FontSpritesheetFrames.hpp
         interface/spritesheet-frames/NPCSpritesheetFrames.hpp
-        interface/spritesheet-frames/CaveLevelSpritesheetFrames.hpp)
+        interface/spritesheet-frames/CaveLevelSpritesheetFrames.hpp
+        )
 
 target_include_directories(TextureBank
         PRIVATE include interface