diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/entities.hpp | 11 | ||||
| -rw-r--r-- | include/mob.hpp | 7 | ||||
| -rw-r--r-- | include/save_util.hpp | 36 | ||||
| -rw-r--r-- | include/world.hpp | 3 |
4 files changed, 52 insertions, 5 deletions
diff --git a/include/entities.hpp b/include/entities.hpp index e406397..b04705c 100644 --- a/include/entities.hpp +++ b/include/entities.hpp @@ -16,6 +16,7 @@ #include <quest.hpp> #include <inventory.hpp> #include <texture.hpp> +#include <save_util.hpp> // local library includes #include <tinyxml2.h> @@ -241,6 +242,7 @@ public: // constructs the entity with an XML thing-thang virtual void createFromXML(XMLElement *e, World *w=nullptr) =0; + virtual void saveToXML(void) =0; // a common constructor, clears variables Entity(void); @@ -259,6 +261,7 @@ public: void save(void); void sspawn(float x,float y); void createFromXML(XMLElement *e, World *w); + void saveToXML(void); }; class Structures : public Entity { @@ -273,6 +276,7 @@ public: unsigned int spawn(BUILD_SUB, float, float); void createFromXML(XMLElement *e, World *w); + void saveToXML(void); }; @@ -293,9 +297,10 @@ public: void addAIFunc(bool preload); - virtual void interact(); - virtual void wander(int); + void interact(); + void wander(int); void createFromXML(XMLElement *e, World *w); + void saveToXML(void); }; class Merchant : public NPC { @@ -317,6 +322,7 @@ public: ~Merchant(); void wander(int); + void saveToXML(void); }; class Object : public Entity{ @@ -338,6 +344,7 @@ public: return (name == o.name) && (loc == o.loc); } void createFromXML(XMLElement *e, World *w); + void saveToXML(void); }; /** diff --git a/include/mob.hpp b/include/mob.hpp index 450cf69..0dd50ac 100644 --- a/include/mob.hpp +++ b/include/mob.hpp @@ -8,6 +8,7 @@ #include <entities.hpp> #include <gametime.hpp> #include <ui.hpp> +#include <save_util.hpp> // local library headers #include <tinyxml2.h> @@ -60,6 +61,7 @@ public: void onHit(unsigned int); bool bindTex(void); void createFromXML(XMLElement *e, World *w) final; + void saveToXML(void) final; }; class Door : public Mob { @@ -70,6 +72,7 @@ public: void onHit(unsigned int); bool bindTex(void); void createFromXML(XMLElement *e, World *w) final; + void saveToXML(void) final; }; class Cat : public Mob { @@ -80,6 +83,7 @@ public: void onHit(unsigned int); bool bindTex(void); void createFromXML(XMLElement *e, World *w) final; + void saveToXML(void) final; }; class Rabbit : public Mob { @@ -90,6 +94,7 @@ public: void onHit(unsigned int); bool bindTex(void); void createFromXML(XMLElement *e, World *w) final; + void saveToXML(void) final; }; class Bird : public Mob { @@ -102,6 +107,7 @@ public: void onHit(unsigned int); bool bindTex(void); void createFromXML(XMLElement *e, World *w) final; + void saveToXML(void) final; }; class Trigger : public Mob { @@ -115,6 +121,7 @@ public: void onHit(unsigned int); bool bindTex(void); void createFromXML(XMLElement *e, World *w) final; + void saveToXML(void) final; }; #endif // MOB_H_ diff --git a/include/save_util.hpp b/include/save_util.hpp new file mode 100644 index 0000000..3d5cf54 --- /dev/null +++ b/include/save_util.hpp @@ -0,0 +1,36 @@ +#ifndef SAVE_UTIL_H_ +#define SAVE_UTIL_H_ + +/* + * Save macros. + */ + +#define E_SAVE_COORDS { xmle->SetAttribute("x", loc.x); xmle->SetAttribute("y", loc.y); } + +#define E_SAVE_HEALTH xmle->SetAttribute("health", health); + +/* + * Load macos. + */ + +#define E_LOAD_COORDS(yy) { float n; \ + if (xmle->QueryFloatAttribute("x", &n) == XML_NO_ERROR) \ + spawn(n, yy); \ + else \ + spawn(xmle->FloatAttribute("spawnx"), 100); \ + \ + if (xmle->QueryFloatAttribute("y", &n) == XML_NO_ERROR) \ + loc.y = n; } + +#define E_LOAD_HEALTH { float n; \ + \ + if (xmle->QueryFloatAttribute("maxHealth", &n) != XML_NO_ERROR) \ + maxHealth = 1; \ + \ + if (xmle->QueryFloatAttribute("health", &n) == XML_NO_ERROR) \ + health = n; \ + else \ + health = maxHealth; } + + +#endif // SAVE_UTIL_H_ diff --git a/include/world.hpp b/include/world.hpp index 26811ae..c5730f8 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -401,9 +401,6 @@ public: // saves the world's data to an XML file void save(void); - // attempts to load world data from an XML file - void load(void); - // plays/pauses the world's music, according to if a new world is being entered void bgmPlay(World *prev) const; |