Lighting!

5 files changed, 224 insertions, 73 deletions

diff --git a/include/common.hpp b/include/common.hpp
index 1ef8b8a..f7507cb 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -266,6 +266,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/coolarray.hpp b/include/coolarray.hpp
new file mode 100644
index 0000000..3e167b7
--- /dev/null
+++ b/include/coolarray.hpp
@@ -0,0 +1,113 @@
+#ifndef COOLARRAY_H_
+#define COOLARRAY_H_
+
+#include <memory>
+#include <initializer_list>
+
+template<class T>
+class CoolArray {
+private:
+	T *buffer;
+	size_t _size, _capacity;
+public:
+	CoolArray(void) {
+		buffer = nullptr;
+		_size = 0;
+		_capacity = 0;
+	}
+
+	CoolArray(size_t n, const T& value) {
+		buffer = new T[n];
+		_size = n;
+		_capacity = n;
+		std::fill(buffer, buffer + _size, value);
+	}
+
+	~CoolArray(void) {
+		delete[] buffer;
+	}
+
+	T& operator[](size_t idx) {
+		return buffer[idx];
+	}
+
+	void operator=(std::initializer_list<T> a) {
+		if (buffer != nullptr)
+			delete[] buffer;
+
+		_size = a.size();
+		buffer = new T[_size];
+		_capacity = _size;
+		std::copy(a.begin(), a.end(), buffer);
+	}
+
+	template<class Func>
+	void remove_if(Func f) {
+		for (size_t i = 0; i < _size; ++i) {
+			if (f(buffer[i]))
+				std::move(buffer + i + 1, buffer + _size--, buffer + i);
+		}
+	}
+
+	void reserve(size_t n) {
+		if (buffer != nullptr) {
+			T *newbuf = new T[n];
+			std::copy(buffer, buffer + (_size < n ? _size : n), newbuf);
+			_capacity = n;
+			delete[] buffer;
+			buffer = newbuf;
+		} else {
+			buffer = new T[n];
+			_capacity = n;
+		}
+	}
+		
+	void resize(size_t n) {
+		reserve(n);
+		_size = n;
+	}
+
+	void clear(void) {
+		delete[] buffer;
+		_size = 0;
+		_capacity = 0;
+	}
+
+	size_t size(void) const {
+		return _size;
+	}
+
+	size_t capacity(void) const {
+		return _capacity;
+	}
+
+	T& front(void) {
+		return buffer[0];
+	}
+
+	T& back(void) {
+		return buffer[_size - 1];
+	}
+
+	T* begin(void) {
+		return buffer;
+	}
+
+	T* end(void) {
+		return buffer + _size;
+	}
+
+	void push_back(const T& x) {
+		if (_size >= _capacity)
+			reserve(_capacity + 5);
+
+		buffer[_size++] = x;
+	}
+
+	void pop_back(void) {
+		--_size;
+	}
+};
+
+
+#endif // COOLARRAY_H_
diff --git a/include/entities.hpp b/include/entities.hpp
index d2185c4..7c712c9 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
 ** --------------------------------------------------------------------------*/
@@ -103,64 +107,6 @@ extern const unsigned int NPC_INV_SIZE;
 class World;
 
 /**
- * The particle class, handles a single particle.
- */
-class Particles{
-public:
-	// the location of the particle
-	vec2 loc;
-	float zOffset;
-
-	// the width of the particle, in pixels
-	float width;
-
-	// the height of the particle, in pixels
-	float height;
-
-	// the velocity of the particle, in pixels
-	vec2 vel;
-
-	// the color of the particle
-	Color color;
-
-	// TODO
-	vec2 index;
-
-	// the amount of milliseconds left for the particle to live
-	float duration;
-
-	// when true, the particle will move
-	bool canMove;
-
-	// TODO
-	bool fountain;
-
-	// when true, the particle will be affected by gravity
-	bool gravity;
-
-	// when true, draws the particle behind structures
-	bool behind;
-
-	// when true, the particle will bounce on impact with ground
-	bool bounce;
-
-	// creates a particle with the desired characteristics
-	Particles(float x, float y, float w, float h, float vx, float vy, Color c, float d);
-
-	// allows the particle to be destroyed
-	~Particles(void){}
-
-	// draws the particle
-	void draw(GLfloat*& p) const;
-
-	// updates a particle
-	void update(float _gravity, float ground_y);
-
-	// returns true if the particle should be killed
-	bool kill(float delta);
-};
-
-/**
  * The entity class.
  * This class contains common functions and variables for all types of
  * entities, i.e. a common structure.
@@ -187,6 +133,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 +185,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 +239,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 +249,7 @@ public:
 	virtual ~Entity(){}
 };
 
-class Player : public Entity{
+class Player : public Entity {
 public:
 	Entity *ride;
 	QuestHandler qh;
@@ -305,9 +258,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 +272,7 @@ public:
 	~Structures();
 
 	unsigned int spawn(BUILD_SUB, float, float);
+	void createFromXML(XMLElement *e, World *w);
 };
 
 
@@ -340,6 +295,7 @@ public:
 
 	virtual void interact();
 	virtual void wander(int);
+	void createFromXML(XMLElement *e, World *w);
 };
 
 class Merchant : public NPC {
@@ -379,8 +335,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);
 };
 
 /**
@@ -422,6 +379,70 @@ public:
 	{
 		flame = true;
 	}
+	
+	void createFromXML(XMLElement *e);
+};
+
+/**
+ * The particle class, handles a single particle.
+ */
+class Particles{
+public:
+	// the location of the particle
+	vec2 loc;
+	float zOffset;
+
+	// the width of the particle, in pixels
+	float width;
+
+	// the height of the particle, in pixels
+	float height;
+
+	// the velocity of the particle, in pixels
+	vec2 vel;
+
+	// the color of the particle
+	Color color;
+
+	// TODO
+	vec2 index;
+
+	// the amount of milliseconds left for the particle to live
+	float duration;
+
+	// when true, the particle will move
+	bool canMove;
+
+	// TODO
+	bool fountain;
+
+	// when true, the particle will be affected by gravity
+	bool gravity;
+
+	// when true, draws the particle behind structures
+	bool behind;
+
+	// when true, the particle will bounce on impact with ground
+	bool bounce;
+
+	Structures *stu;
+
+	Particles(void){}
+
+	// creates a particle with the desired characteristics
+	Particles(float x, float y, float w, float h, float vx, float vy, Color c, float d);
+
+	// allows the particle to be destroyed
+	~Particles(void){}
+
+	// draws the particle
+	void draw(GLfloat*& p) const;
+
+	// updates a particle
+	void update(float _gravity, float ground_y);
+
+	// returns true if the particle should be killed
+	bool timeUp(void);
 };
 
 #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 ecfa14f..8c241a9 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -9,13 +9,14 @@
 // local game includes
 #include <common.hpp>
 #include <entities.hpp>
+#include <coolarray.hpp>
 
 /**
  * The background type enum.
  * 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. */
 };
@@ -256,7 +257,7 @@ protected:
 	 *
 	 * @see addParticle()
 	 */
-	std::vector<Particles>    particles;
+	CoolArray<Particles>    particles;
 
 	/**
 	 * A vector of all structures in the world.
@@ -465,14 +466,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 +550,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 +567,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;