3 files changed, 6 insertions, 49 deletions
diff --git a/include/inventory.hpp b/include/inventory.hpp
index bee2fbd..c34eadb 100644
--- a/include/inventory.hpp
+++ b/include/inventory.hpp
@@ -17,9 +17,10 @@ class Entity;
 class Item {
 private:
 	bool beingUsed;
-
+protected:
 	std::vector<Entity*> interact;
 public:
+
 	// what we want to call each item
 	std::string name;
 
diff --git a/include/texture.hpp b/include/texture.hpp
index 22a2459..ecf85e4 100644
--- a/include/texture.hpp
+++ b/include/texture.hpp
@@ -86,69 +86,22 @@ public:
 
 class Texturec{
 private:
-
-	/**
-	 * Contains the index in the image array of the currently loaded texture.
-	 */
-
 	unsigned int texState;
 
 public:
 
-	/**
-	 * Contains an array of the GLuints returned from Texture::loadTexture().
-	 */
-
 	std::vector<GLuint> image;
-
-	/**
-	 * Contains the dimensions of each texture in the vector
-	 */
-	 //TODO
-	//std::vector<vec2> imageDim;
-
-	/**
-	 * Stores the location of all the images
-	 */
 	std::vector<std::string> texLoc;
 
-	/**
-	 * Populates the image array from a list of strings, with each string as a
-	 * separate argument.
-	 */
-
 	Texturec(uint amt, ...);
-
-	/**
-	 * Populates the image array from an array of strings.
-	 */
-
 	Texturec(uint amt,const char **paths);
 	Texturec(std::vector<std::string>vec);
 	Texturec(std::initializer_list<std::string> l);
 
-	/**
-	 * Frees memory taken by the image array.
-	 */
-
 	~Texturec();
 
-	/**
-	 * Binds the next texture in the array, incrementing texState.
-	 */
-
 	void bindNext();
-
-	/**
-	 * Binds the previous texture in the array, decrementing texState.
-	 */
-
 	void bindPrev();
-
-	/**
-	 * Binds the texture with the provided index.
-	 */
-
 	void bind(unsigned int);
 };
 
diff --git a/include/world.hpp b/include/world.hpp
index 5d30161..2dd166a 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -320,11 +320,14 @@ private:
 public:
 
 	// creates the arena with the world being left for it
-	Arena(World *leave, Player *p, Mob *m);
+	Arena(void);
 
 	// frees memory
 	~Arena(void);
 
+	// starts a new fight??
+	void fight(World *leave, const Player *p, Mob *m);
+
 	// attempts to exit the arena, returning what world the player should be in
 	WorldSwitchInfo exitArena(Player *p);
 };