diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/entities.h | 5 | ||||
| -rw-r--r-- | include/inventory.h | 2 | ||||
| -rw-r--r-- | include/world.h | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/include/entities.h b/include/entities.h index 9cc1b31..d234768 100644 --- a/include/entities.h +++ b/include/entities.h @@ -6,6 +6,8 @@ #include <inventory.h> #include <Texture.h> +#include <sstream> + #define DEBUG #define NPCp(n) ((NPC *)n) @@ -175,7 +177,8 @@ public: Player(); ~Player(); - void interact(); + void save(void); + void sspawn(float x,float y); }; class NPC : public Entity{ diff --git a/include/inventory.h b/include/inventory.h index af859a5..8225ab2 100644 --- a/include/inventory.h +++ b/include/inventory.h @@ -31,10 +31,10 @@ struct item_t{ class Inventory { private: - std::vector<item_t> items; unsigned int size; int os = 0; public: + std::vector<item_t> items; unsigned int sel; bool invOpen = false; bool invOpening = false; diff --git a/include/world.h b/include/world.h index 47e11f5..0e26ed9 100644 --- a/include/world.h +++ b/include/world.h @@ -342,7 +342,7 @@ public: * playable. */ - void setBGM(const char *path); + void setBGM(std::string path); /** * Plays/stops this world's BGM. If `prev` is not NULL, that world's BGM @@ -439,5 +439,6 @@ extern int worldShade; extern char *currentXML; World *loadWorldFromXML(const char *path); +World *loadWorldFromXMLNoSave(const char *path); #endif // WORLD_H |