entitys can modify xml

4 files changed, 47 insertions, 14 deletions

diff --git a/include/common.hpp b/include/common.hpp
index 934ede5..4fa74d7 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -265,6 +265,8 @@ void strVectorSortAlpha(std::vector<std::string> *v);
 
 // reads the given file into a buffer and returns a pointer to the buffer
 const char *readFile(const char *path);
+std::string readFile(const std::string& path);
+std::vector<std::string> readFileA(const std::string& path);
 
 // aborts the program, printing the given error
 void UserError(std::string reason);
diff --git a/include/entities.hpp b/include/entities.hpp
index ca4ef2b..5a8e19b 100644
--- a/include/entities.hpp
+++ b/include/entities.hpp
@@ -17,6 +17,10 @@
 #include <inventory.hpp>
 #include <texture.hpp>
 
+// local library includes
+#include <tinyxml2.h>
+using namespace tinyxml2;
+
 /* ----------------------------------------------------------------------------
 ** Structures section
 ** --------------------------------------------------------------------------*/
@@ -187,6 +191,10 @@ protected:
 
 	// the max cooldown display
 	float maxHitDuration;
+
+	// the entity's XML element, for saving/loading stuff
+	XMLElement *xmle;
+
 public:
 	// contains the entity's coordinates, in pixels
 	vec2 loc;
@@ -235,7 +243,7 @@ public:
 	int	subtype;
 
 	// the entity's name, randomly generated on spawn
-	char *name;
+	std::string name;
 
 	// the entity's gender
 	GENDER  gender;
@@ -289,6 +297,9 @@ public:
 	// returns true if the coordinate is within the entity
 	bool isInside(vec2 coord) const;
 
+	// constructs the entity with an XML thing-thang
+	virtual void createFromXML(XMLElement *e, World *w=nullptr) =0;
+
 	// a common constructor, clears variables
 	Entity(void);
 
@@ -296,7 +307,7 @@ public:
 	virtual ~Entity(){}
 };
 
-class Player : public Entity{
+class Player : public Entity {
 public:
 	Entity *ride;
 	QuestHandler qh;
@@ -305,9 +316,10 @@ public:
 	~Player();
 	void save(void);
 	void sspawn(float x,float y);
+	void createFromXML(XMLElement *e, World *w);
 };
 
-class Structures : public Entity{
+class Structures : public Entity {
 public:
 	BUILD_SUB bsubtype;
 	World *inWorld;
@@ -318,6 +330,7 @@ public:
 	~Structures();
 
 	unsigned int spawn(BUILD_SUB, float, float);
+	void createFromXML(XMLElement *e, World *w);
 };
 
 
@@ -340,6 +353,7 @@ public:
 
 	virtual void interact();
 	virtual void wander(int);
+	void createFromXML(XMLElement *e, World *w);
 };
 
 class Merchant : public NPC {
@@ -379,8 +393,9 @@ public:
 	void interact(void);
 
 	bool operator==(const Object &o) {
-		return !strcmp(name, o.name) && (loc == o.loc);
+		return (name == o.name) && (loc == o.loc);
 	}
+	void createFromXML(XMLElement *e, World *w);
 };
 
 /**
@@ -414,6 +429,8 @@ public:
 	void makeFlame(void){
 		flame = true;
 	}
+	
+	void createFromXML(XMLElement *e);
 };
 
 #include <mob.hpp>
diff --git a/include/mob.hpp b/include/mob.hpp
index 4425159..450cf69 100644
--- a/include/mob.hpp
+++ b/include/mob.hpp
@@ -20,6 +20,7 @@ using Drop = std::tuple<std::string, unsigned int, float>;
 
 class Mob : public Entity {
 protected:
+	XMLElement *xmle;
 	std::forward_list<Drop> drop;
 
     unsigned int actCounter;
@@ -41,7 +42,6 @@ public:
 	virtual void onDeath(void);
 
     virtual bool bindTex(void) =0;
-    virtual void createFromXML(const XMLElement *e) =0;
 };
 
 constexpr Mob *Mobp(Entity *e) {
@@ -59,7 +59,7 @@ public:
     void act(void);
 	void onHit(unsigned int);
     bool bindTex(void);
-    void createFromXML(const XMLElement *e);
+    void createFromXML(XMLElement *e, World *w) final;
 };
 
 class Door : public Mob {
@@ -69,7 +69,7 @@ public:
     void act(void);
 	void onHit(unsigned int);
     bool bindTex(void);
-    void createFromXML(const XMLElement *e);
+    void createFromXML(XMLElement *e, World *w) final;
 };
 
 class Cat : public Mob {
@@ -79,7 +79,7 @@ public:
     void act(void);
 	void onHit(unsigned int);
     bool bindTex(void);
-    void createFromXML(const XMLElement *e);
+	void createFromXML(XMLElement *e, World *w) final;
 };
 
 class Rabbit : public Mob {
@@ -89,7 +89,7 @@ public:
     void act(void);
 	void onHit(unsigned int);
     bool bindTex(void);
-    void createFromXML(const XMLElement *e);
+    void createFromXML(XMLElement *e, World *w) final;
 };
 
 class Bird : public Mob {
@@ -101,7 +101,7 @@ public:
     void act(void);
 	void onHit(unsigned int);
     bool bindTex(void);
-    void createFromXML(const XMLElement *e);
+    void createFromXML(XMLElement *e, World *w) final;
 };
 
 class Trigger : public Mob {
@@ -114,7 +114,7 @@ public:
     void act(void);
 	void onHit(unsigned int);
     bool bindTex(void);
-    void createFromXML(const XMLElement *e);
+    void createFromXML(XMLElement *e, World *w) final;
 };
 
 #endif // MOB_H_
diff --git a/include/world.hpp b/include/world.hpp
index ce50244..f6a432d 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -15,7 +15,7 @@
  * This enum contains all different possibilities for world backgrounds; used
  * in World::setBackground() to select the appropriate images.
  */
-enum class WorldBGType : unsigned char {
+enum class WorldBGType : unsigned int {
 	Forest,		/**< A forest theme. */
 	WoodHouse	/**< An indoor wooden house theme. */
 };
@@ -465,14 +465,14 @@ public:
 
 	void addMob(Mob *m, vec2 coord);
 
-	void addNPC(float x, float y);
+	void addNPC(NPC *n);
 
 	void addObject(std::string in, std::string pickupDialog, float x, float y);
 
 	void addParticle(float x, float y, float w, float h, float vx, float vy, Color color, int dur);
 	void addParticle(float x, float y, float w, float h, float vx, float vy, Color color, int dur, unsigned char flags);
 
-	void addStructure(BUILD_SUB subtype, float x, float y, std::string tex, std::string inside);
+	void addStructure(Structures *s);
 
 	Village *addVillage(std::string name, World *world);
 };
@@ -549,6 +549,12 @@ public:
 };
 
 /**
+ * Constructs an XML object for accessing/modifying the current world's XML
+ * file.
+ */
+const XMLDocument& loadWorldXML(void);
+
+/**
  * Loads the player into the world created by the given XML file. If a world is
  * already loaded it will be saved before the transition is made.
  */
@@ -560,8 +566,16 @@ World *loadWorldFromXML(std::string path);
  */
 World *loadWorldFromXMLNoSave(std::string path);
 
+/**
+ * Loads a world using a pointer to the current world (used for loading adjacent
+ * worlds that have already been read into memory.
+ */
 World *loadWorldFromPtr(World *ptr);
 
+/**
+ * Casts a normal world to an indoor world, to access IndoorWorld-exclusive
+ * elements.
+ */
 constexpr IndoorWorld *Indoorp(World *w)
 {
     return (IndoorWorld *)w;