Work on merchants and yer mum

3 files changed, 10 insertions, 6 deletions

diff --git a/include/Texture.h b/include/Texture.h
index c6376cb..659c32d 100644
--- a/include/Texture.h
+++ b/include/Texture.h
@@ -27,13 +27,13 @@ namespace Texture{
 	 * later referencing of the texture.
 	 */
 	
-	GLuint loadTexture(const char *fileName);
+	GLuint loadTexture(std::string fileName);
 	
 	void freeTextures(void);
 	
 	void initColorIndex();
 	vec2 getIndex(Color c);
-	dim2 imageDim(const char *fileName);
+	dim2 imageDim(std::string fileName);
 }
 
 /**
diff --git a/include/common.h b/include/common.h
index 557e582..933067b 100644
--- a/include/common.h
+++ b/include/common.h
@@ -69,7 +69,7 @@ typedef struct {
 	float z;
 } vec3;
 
-typedef vec2 dim2;
+typedef ivec2 dim2;
 
 /**
  * This structure contains two sets of coordinates for ray drawing.
diff --git a/include/world.h b/include/world.h
index 228defa..733daae 100644
--- a/include/world.h
+++ b/include/world.h
@@ -129,6 +129,12 @@ public:
 	 */
 	
 	Village(const char *meme, World *w);
+	
+	/**
+	 * Destructor...
+	 */
+	 
+	~Village(void){}
 };
 
 extern Player *player;
@@ -289,9 +295,7 @@ public:
 	std::vector<Particles	*>	particles;
 	
 	
-	
-	
-	std::vector<Village *	 >	village;
+	std::vector<Village 	*>	village;
 	
 	/**
 	 * A vector of all light elements in this world.