diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/entities.hpp | 3 | ||||
| -rw-r--r-- | include/inventory.hpp | 7 | ||||
| -rw-r--r-- | include/texture.hpp | 3 | ||||
| -rw-r--r-- | include/world.hpp | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/include/entities.hpp b/include/entities.hpp index 4abb3cb..2d96a9f 100644 --- a/include/entities.hpp +++ b/include/entities.hpp @@ -386,9 +386,8 @@ public: }; class Object : public Entity{ -private: - std::string iname; public: + std::string iname; std::string pickupDialog; bool questObject = false; diff --git a/include/inventory.hpp b/include/inventory.hpp index a85e537..ca402b3 100644 --- a/include/inventory.hpp +++ b/include/inventory.hpp @@ -219,13 +219,16 @@ public: /*********************************************************************************** * OLD STUFF THAT NEEDS TO GET UPDATED * **********************************************************************************/ + +using InventorySlot = std::pair<Item *, unsigned int>; + class Inventory { private: unsigned int size; //how many slots our inventory has unsigned int sel; //what item is currently selected int os = 0; public: - std::vector<std::pair<Item*, uint>> Items; + std::vector<InventorySlot> Items; bool invOpen = false; //is the inventory open bool invOpening = false; //is the opening animation playing @@ -253,6 +256,8 @@ public: void setSelectionDown(); void draw(void); // Draws a text list of items in this inventory (should only be called for the player for now) + + const Item* getCurrentItem(void); }; void initInventorySprites(void); diff --git a/include/texture.hpp b/include/texture.hpp index c301af1..7f22a79 100644 --- a/include/texture.hpp +++ b/include/texture.hpp @@ -46,6 +46,9 @@ public: TextureIterator(void) { position = std::begin(textures); } + ~TextureIterator(void) { + textures.clear(); + } TextureIterator(const std::vector<std::string> &l) { for (const auto &s : l) textures.emplace_back(Texture::loadTexture(s), s); diff --git a/include/world.hpp b/include/world.hpp index a2de048..9a892d8 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -66,7 +66,7 @@ extern std::string currentXML; /** * Defines how many game ticks it takes to go from day to night or vice versa. */ -constexpr const unsigned int DAY_CYCLE = 12000; +constexpr const unsigned int DAY_CYCLE = 10000; /** * Defines the velocity of player when moved by the keyboard |