diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/events.hpp | 4 | ||||
| -rw-r--r-- | include/inventory.hpp | 32 | ||||
| -rw-r--r-- | include/player.hpp | 2 |
3 files changed, 31 insertions, 7 deletions
diff --git a/include/events.hpp b/include/events.hpp index 6251fac..efd5fb8 100644 --- a/include/events.hpp +++ b/include/events.hpp @@ -12,8 +12,6 @@ #include <config.hpp> #include <vector2.hpp> -class World; - ////////////////////////// /// INPUT EVENTS ////////////////////////// @@ -77,6 +75,8 @@ struct GameEndEvent { /// WORLD EVENTS ////////////////////////// +class World; + struct BGMToggleEvent { BGMToggleEvent(std::string f = "", World *w = nullptr) : file(f), world(w) {} diff --git a/include/inventory.hpp b/include/inventory.hpp index 084a2d6..1052b20 100644 --- a/include/inventory.hpp +++ b/include/inventory.hpp @@ -63,24 +63,46 @@ struct InventoryEntry { : item(nullptr), count(0) {} }; +struct UseItemEvent { + Item* item; + vec2 curs; + + UseItemEvent(Item* i, vec2 c) + : item(i), curs(c) {} +}; + /** * @class InventorySystem * Handles the player's inventory system. */ class InventorySystem : public entityx::System<InventorySystem>, public entityx::Receiver<InventorySystem> { private: + constexpr static const char* itemsPath = "config/items.xml"; + constexpr static int entrySize = 70; + constexpr static int hotbarSize = 4; + constexpr static float inventoryZ = -5.0f; + constexpr static unsigned int rowSize = 8; + + /** + * A 'database' of all existing items. + */ + std::unordered_map<std::string, Item> itemList; + /** * A vector for the player's inventory slots. */ std::vector<InventoryEntry> items; - void loadItems(void); + vec2 hotStart, hotEnd; + vec2 fullStart, fullEnd; + + int movingItem = -1; + bool fullInventory = false; + + void loadItems(void); public: - InventorySystem(int size = 20) { - items.resize(size); - loadItems(); - } + InventorySystem(int size = 20); void configure(entityx::EventManager &ev); void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override; diff --git a/include/player.hpp b/include/player.hpp index 2d232ab..2c65717 100644 --- a/include/player.hpp +++ b/include/player.hpp @@ -62,6 +62,8 @@ public: */ void receive(const KeyDownEvent&); + void receive(const UseItemEvent&); + /** * Gets the player's position. * @return the player's position |