Merge branch 'master' of http://github.com/tcsullivan/gamedev

13 files changed, 215 insertions, 269 deletions

diff --git a/Changelog b/Changelog
index 0384181..f6309bf 100644
--- a/Changelog
+++ b/Changelog
@@ -712,3 +712,13 @@
 
 	- merged 'remake' with 'master', fixed font issues and world stuffs
 	- continued work on merchant dialog
+
+3/2/2016,
+3/3/2016:
+=========
+
+	- made particle vector not pointers
+	- improved efficiency of code using newly learned C++11 tricks
+	- added StrAttribute() to TinyXML2
+	- more merchant stuff, trading????
+	- improved village XML loading
diff --git a/Makefile b/Makefile
index 305d0d6..1df683c 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,9 @@ EXEC = main
 
 all: $(EXEC)
 
+dirty:
+	rm -rf out/world.o
+
 clean:
 	rm -f $(EXEC)
 	rm -f out/*.o
diff --git a/include/Texture.h b/include/Texture.h
index 659c32d..7201a4c 100644
--- a/include/Texture.h
+++ b/include/Texture.h
@@ -58,7 +58,7 @@ public:
 	 * Contains an array of the GLuints returned from Texture::loadTexture().
 	 */
 
-	GLuint *image = NULL;
+	std::vector<GLuint> image;
 	
 	/**
 	 * Populates the image array from a list of strings, with each string as a
@@ -73,6 +73,7 @@ public:
 	
 	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.
diff --git a/include/entities.h b/include/entities.h
index a1723ee..0714650 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -244,8 +244,8 @@ class Structures : public Entity{
 public:
 	BUILD_SUB bsubtype;
 	World *inWorld;
-	char *inside;
-	char *textureLoc;
+	std::string inside;
+	std::string textureLoc;
 	
 	Structures();
 	~Structures();
@@ -270,11 +270,11 @@ class Object : public Entity{
 private:
 	std::string iname;
 public:
-	char *pickupDialog;
+	std::string pickupDialog;
 	bool questObject = false;
 	
 	Object();
-	Object(std::string in,const char *pd);
+	Object(std::string in,std::string pd);
 	~Object();
 	
 	void reloadTexture(void);
diff --git a/include/tinyxml2.h b/include/tinyxml2.h
index fb7464a..4282642 100755
--- a/include/tinyxml2.h
+++ b/include/tinyxml2.h
@@ -38,6 +38,8 @@ distribution.
 #   include <cstring>

 #endif

 

+#include <string>

+

 /*

    TODO: intern strings instead of allocation.

 */

@@ -1187,6 +1189,11 @@ public:
     */

     const char* Attribute( const char* name, const char* value=0 ) const;

 

+	/** Functions the same as Attribute(), but returns the result

+	    as a std::string.

+	*/

+	std::string StrAttribute( const char* name, const char* value=0 ) const;

+

     /** Given an attribute name, IntAttribute() returns the value

     	of the attribute interpreted as an integer. 0 will be

     	returned if there is an error. For a method with error

diff --git a/include/world.h b/include/world.h
index b3d1071..825d83d 100644
--- a/include/world.h
+++ b/include/world.h
@@ -29,10 +29,10 @@
  * in World::setBackground() to select the appropriate images.
  */
 
-typedef enum {
-	BG_FOREST,		/**< A forest theme. */
-	BG_WOODHOUSE,	/**< An indoor wooden house theme. */
-} WORLD_BG_TYPE;
+enum class WorldBGType : unsigned char {
+	Forest,		/**< A forest theme. */
+	WoodHouse	/**< An indoor wooden house theme. */
+};
 
 /**
  * The weather type enum.
@@ -40,11 +40,11 @@ typedef enum {
  * Weather is set by the world somewhere.
  */
 
-typedef enum {
-	SUNNY = 0,	/**< Sunny/daytime */
-	DARK,		/**< Nighttime */
-	RAIN		/**< Rain (to be implemented)*/
-} WEATHER;
+enum class WorldWeather : unsigned char {
+	Sunny = 0,	/**< Sunny/daytime */
+	Dark,		/**< Nighttime */
+	Rain		/**< Rain (to be implemented)*/
+};
 
 /**
  * The light structure, used to store light coordinates and color.
@@ -76,56 +76,16 @@ class World;
 
 class Village {
 public:
-
-	/**
-	 * The name of the village.
-	 */
-
 	std::string name;
-	
-	/**
-	 * The coordinate of where the village starts.
-	 * 
-	 * This is used to check if the player has entered the village's area.
-	 */
-	
 	vec2 start;
-	
-	/**
-	 * The coordinate of where the village ends.
-	 * 
-	 * This is used to check if the player has entered the village's area.
-	 */
-	
 	vec2 end;
-	
-	/**
-	 * TODO
-	 */
-	
 	bool in;
-
-	/**
-	 * A vector of all structures that are associated with this village.
-	 */
-
 	std::vector<Structures *> build;
 	
-	/**
-	 * Creates a village of name `meme` in the world `w`.
-	 */
-	
 	Village(const char *meme, World *w);
-	
-	/**
-	 * Destructor...
-	 */
-	 
 	~Village(void){}
 };
 
-extern Player *player;
-
 /**
  * The world class. This class does everything a world should do.
  */
@@ -194,7 +154,7 @@ protected:
 	 * Defines the set of background images that should be used for this world.
 	 */
 	
-	WORLD_BG_TYPE bgType;
+	WorldBGType bgType;
 	
 	/**
 	 * The Mix_Music object that holds the background soundtrack for the world.
@@ -206,7 +166,8 @@ protected:
 	 * The file path of the song wished to be loaded by bgmObj.
 	 */
 	
-	char *bgm;
+	std::string bgm;
+	
 	std::vector<std::string>bgFiles;
 	std::vector<std::string>bgFilesIndoors;
 	
@@ -238,11 +199,6 @@ public:
 	
 	char *setToRight(const char *file);
 
-	void callUpdate(){
-		this->update(player,deltaTime);
-	}
-
-
 	/**
 	 * A vector of pointers to every NPC, Structure, Mob, and Object in this
 	 * world.
@@ -279,7 +235,7 @@ public:
 	 * A vector of all particles in this world.
 	 */
 	
-	std::vector<Particles	*>	particles;
+	std::vector<Particles> particles;
 	
 	
 	std::vector<Village 	*>	village;
@@ -294,7 +250,7 @@ public:
 	 * Vector of all building textures for the current world style
 	 */
 
-	std::vector<std::string  >  sTexLoc;
+	std::vector<std::string> sTexLoc;
 	
 	/**
 	 * NULLifies pointers and allocates necessary memory. This should be
@@ -317,8 +273,7 @@ public:
 	 * the structure.
 	 */
 	
-	void addStructure(BUILD_SUB subtype,float x,float y, char* tex, const char *inside);
-	//void addVillage(int buildingCount, int npcMin, int npcMax,const char *inside);
+	void addStructure(BUILD_SUB subtype,float x,float y, std::string tex, std::string inside);
 	
 	/**
 	 * Adds a Mob to the world with the specified type and coordinates.
@@ -346,7 +301,7 @@ public:
 	 * upon object interaction.
 	 */
 	
-	void addObject(/*ITEM_ID id*/std::string in,const char *pickupDialog, float x, float y);
+	void addObject( std::string in, std::string pickupDialog, float x, float y);
 	
 	/**
 	 * Adds a particle to the world with the specified coordinates, dimensions,
@@ -360,13 +315,6 @@ public:
 	 */
 	
 	void addLight(vec2 xy, Color color);
-
-	/**
-	 * Get the next NPC in the NPC vector that currently lacks a written dialog.
-	 * Could be used to assign random NPCs non-random dialogs.
-	 */
-
-	NPC *getAvailableNPC(void);
 	
 	/**
 	 * Updates the coordinates of everything in the world that has coordinates
@@ -388,7 +336,7 @@ public:
 	 * Texturec object.
 	 */
 	
-	void setBackground(WORLD_BG_TYPE bgt);
+	void setBackground(WorldBGType bgt);
 	
 	/**
 	 * Sets the background music for the world, required for the world to be
@@ -401,14 +349,14 @@ public:
 	 *	Sets the worlds style folder
 	 */
 
-	void setStyle(const char* pre); 
+	void setStyle(std::string pre); 
 	
 	/**
 	 * Plays/stops this world's BGM. If `prev` is not NULL, that world's BGM
 	 * will be faded out followed by the fading in of this world's BGM.
 	 */
 	
-	void bgmPlay(World *prev);
+	void bgmPlay(World *prev) const;
 	
 	/**
 	 * Draw the world and entities based on the player's coordinates.
@@ -458,7 +406,7 @@ public:
 	 *	Get's the world's width.
 	 */
 	
-	int getTheWidth(void);
+	int getTheWidth(void) const;
 	
 	void save(void);
 	void load(void);
@@ -479,8 +427,6 @@ public:
 
 class Arena : public World {
 private:
-	//vec2	 pxy;
-	//World	*exit;
 	Mob 	*mmob;
 public:
 	Arena(World *leave,Player *p,Mob *m);
@@ -491,7 +437,7 @@ public:
 extern int worldShade;
 extern std::string currentXML;
 
-World *loadWorldFromXML(const char *path);
-World *loadWorldFromXMLNoSave(const char *path);
+World *loadWorldFromXML(std::string path);
+World *loadWorldFromXMLNoSave(std::string path);
 
 #endif // WORLD_H
diff --git a/main.cpp b/main.cpp
index abc4f3c..e96a555 100644
--- a/main.cpp
+++ b/main.cpp
@@ -117,7 +117,6 @@ std::mutex mtx;
 std::condition_variable cv;
 ThreadPool pool(10);
 
-
 /*
  *	loops is used for texture animation. It is believed to be passed to entity
  *	draw functions, although it may be externally referenced instead.
@@ -163,7 +162,7 @@ Menu *currentMenu;
 Menu optionsMenu;
 Menu pauseMenu;
 
-extern WEATHER weather;
+extern WorldWeather weather;
 
 extern int  fadeIntensity;
 extern bool fadeEnable;
@@ -934,10 +933,10 @@ void logic(){
 	 *	Switch between day and night (SUNNY and DARK) if necessary.
 	*/
 	if(!(tickCount%DAY_CYCLE)||!tickCount){
-		if(weather==SUNNY){
-			weather=DARK;
-		}else{
-			weather=SUNNY;
+		if ( weather == WorldWeather::Sunny )
+			weather = WorldWeather::Dark;
+		else {
+			weather = WorldWeather::Sunny;
 			Mix_Pause(2);
 		}
 	}
diff --git a/src/Quest.cpp b/src/Quest.cpp
index 535afc5..e59d79f 100644
--- a/src/Quest.cpp
+++ b/src/Quest.cpp
@@ -33,39 +33,41 @@ int QuestHandler::assign(std::string title,std::string desc,std::string req){
 	return 0;

 }

 

+#include <algorithm>

+

 int QuestHandler::drop(std::string title){

-	for(unsigned int i=0;i<current.size();i++){

-		if(current[i].title == title){

-			current.erase(current.begin()+i);

-			return 0;

-		}

-	}

-	return -1;

+	current.erase( std::remove_if( current.begin(),

+								   current.end(),

+								   [&](Quest q){ return q.title == title; }),

+				   current.end() );

+	

+	return 0;

 }

 

 int QuestHandler::finish(std::string t){

-	for(unsigned int i=0;i<current.size();i++){

-		if(current[i].title == t){

-			for(auto &n : current[i].need){

-				if(player->inv->hasItem(n.name) < n.n)

+	for ( auto c = current.begin(); c != current.end(); c++ ) {

+		if ( (*c).title == t ) {

+			for ( auto &n : (*c).need ) {

+				if ( player->inv->hasItem( n.name ) < n.n )

 					return 0;

 			}

 			

-			for(auto &n : current[i].need){

-				player->inv->takeItem(n.name,n.n);

-			}

+			for ( auto &n : (*c).need )

+				player->inv->takeItem( n.name, n.n );

 			

-			current.erase(current.begin()+i);

+			current.erase( c );

 			return 1;

 		}

 	}

+	

 	return 0;

 }

 

 bool QuestHandler::hasQuest(std::string t){

-	for(unsigned int i=0;i<current.size();i++){

-		if(current[i].title == t)

+	for ( auto &c : current ) {

+		if ( c.title == t )

 			return true;

 	}

+	

 	return false;

 }

diff --git a/src/Texture.cpp b/src/Texture.cpp
index 1aaadf6..731a1d6 100644
--- a/src/Texture.cpp
+++ b/src/Texture.cpp
@@ -1,5 +1,7 @@
+#include <algorithm>
+#include <string>
+
 #include <Texture.h>
-#include <string.h>
 
 /**
  * A structure for keeping track of loaded textures.
@@ -173,32 +175,30 @@ namespace Texture{
 Texturec::Texturec(uint amt, ...){
 	va_list fNames;
 	texState = 0;
-	image = new GLuint[amt];
 	va_start(fNames, amt);
-	for(unsigned int i = 0; i < amt; i++){
-		image[i] = Texture::loadTexture(va_arg(fNames, char *));
-	}
+	for(unsigned int i = 0; i < amt; i++)
+		image.push_back( Texture::loadTexture(va_arg(fNames, char *)) );
 	va_end(fNames);
 }
 
+Texturec::Texturec( std::initializer_list<std::string> l )
+{
+	texState = 0;
+	std::for_each( l.begin(), l.end(), [&](std::string s){ image.push_back( Texture::loadTexture( s ) ); });
+}
+
 Texturec::Texturec(std::vector<std::string>v){
 	texState = 0;
-	image = new GLuint[v.size()];
-	for(unsigned int i = 0; i < v.size(); i++){
-		image[i] = Texture::loadTexture(v[i].c_str());
-	}
+	std::for_each( v.begin(), v.end(), [&](std::string s){ image.push_back( Texture::loadTexture( s ) ); });
 }
 
 Texturec::Texturec(uint amt,const char **paths){
 	texState = 0;
-	image = new GLuint[amt];
-	for(unsigned int i = 0; i < amt; i++){
-		image[i] = Texture::loadTexture(paths[i]);
-	}
+	for(unsigned int i = 0; i < amt; i++)
+		image.push_back( Texture::loadTexture(paths[i]) );
 }
 
 Texturec::~Texturec(){
-	delete[] image;
 }
 
 void Texturec::bind(unsigned int bn){
diff --git a/src/entities.cpp b/src/entities.cpp
index b97767d..8abc727 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -179,10 +179,9 @@ Structures::Structures(){ //sets the structure type
 }
 Structures::~Structures(){
 	delete tex;
+	
 	if(name)
 		delete[] name;
-	if(inside)
-		delete[] inside;
 }
 
 Mob::Mob(int sub){
@@ -242,18 +241,11 @@ Object::Object(){
 	inv = NULL;
 }
 
-Object::Object(std::string in, const char *pd){
+Object::Object(std::string in, std::string pd){
 	iname = in;
 
-	if(pd){
-		pickupDialog = new char[strlen(pd)+1];
-		strcpy(pickupDialog,pd);
-		questObject = true;
-	}else{
-		pickupDialog = new char[1];
-		*pickupDialog = '\0';
-		questObject = false;
-	}
+	pickupDialog = pd;
+	questObject = !pd.empty();
 
 	type = OBJECTT;
 	alive = true;
@@ -266,7 +258,6 @@ Object::Object(std::string in, const char *pd){
 	inv = NULL;
 }
 Object::~Object(){
-	delete[] pickupDialog;
 	delete tex;
 	delete[] name;
 }
@@ -469,10 +460,10 @@ void Merchant::interact(){
 
 void Object::interact(void){
 	if(questObject && alive){
-		ui::dialogBox(player->name,":Yes:No",false,pickupDialog);		
+		ui::dialogBox( player->name, ":Yes:No", false, pickupDialog.c_str());
 		ui::waitForDialog();
 		if(ui::dialogOptChosen == 1){
-			player->inv->addItem(/*(ITEM_ID)(identifier)*/iname, 1);
+			player->inv->addItem( iname, 1 );
 			alive = false;
 		}
 	}else{
@@ -509,21 +500,26 @@ unsigned int Structures::spawn(BUILD_SUB sub, float x, float y){
 	*/
 
 	//unsigned int tempN = (getRand() % 5 + 2);
+	
+	if ( textureLoc.empty() )
+		textureLoc = inWorld->sTexLoc[sub];
+	
 	switch(sub){
 		case STALL_MARKET:
-			tex = new Texturec(1, textureLoc ? textureLoc : inWorld->sTexLoc[sub].c_str());
-			dim = Texture::imageDim(textureLoc ? textureLoc : inWorld->sTexLoc[sub].c_str());
+			tex = new Texturec({ textureLoc });
+			dim = Texture::imageDim( textureLoc );
 			width = dim.x;
 			height = dim.y;
 			break;
 		default:
-			tex = new Texturec(1, textureLoc ? textureLoc : inWorld->sTexLoc[sub].c_str());
-			dim = Texture::imageDim(textureLoc ? textureLoc : inWorld->sTexLoc[sub].c_str());
+			tex = new Texturec({ textureLoc });
+			dim = Texture::imageDim( textureLoc );
 			width = dim.x;
 			height = dim.y;
 			inv = NULL;
 			break;
 	}
+	
 	return 0;
 }
 
@@ -542,7 +538,7 @@ void Mob::wander(int timeRun){
 	   player->loc.x + (width / 2)  > loc.x && player->loc.x + (width / 2)  < loc.x + width  &&
 	   player->loc.y + (height / 3) > loc.y && player->loc.y + (height / 3) < loc.y + height ){
 		Arena *a = new Arena(currentWorld,player,this);
-		a->setBackground(BG_FOREST);
+		a->setBackground( WorldBGType::Forest );
 		a->setBGM("assets/music/embark.wav");
 		ui::toggleWhiteFast();
 		YAYA = true;
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index 3d2ea25..a286db9 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -68,12 +68,12 @@ int commonAIFunc(NPC *speaker){
 				 */
 	
 				if((oxml = exml->FirstChildElement("quest"))){
-					const char *qname;
+					std::string qname;
 					
-					while(oxml){
-						if((qname = oxml->Attribute("assign")))
+					while ( oxml ) {
+						if ( !(qname = oxml->StrAttribute("assign")).empty() )
 							player->qh.assign(qname,"None",(std::string)oxml->GetText());
-						else if((qname = oxml->Attribute("check"))){
+						else if( !(qname = oxml->StrAttribute("check")).empty() ){
 							if(player->qh.hasQuest(qname) && player->qh.finish(qname)){
 								goto CONT;
 							}else{
@@ -283,7 +283,7 @@ void initEverything(void){
 			 * Read in the XML file.
 			 */
 		
-			currentWorld = loadWorldFromXML(xmlFiles[i].c_str());
+			currentWorld = loadWorldFromXML(xmlFiles[i]);
 			break;
 		}
 	}
diff --git a/src/tinyxml2.cpp b/src/tinyxml2.cpp
index c4ea7cd..6198418 100755
--- a/src/tinyxml2.cpp
+++ b/src/tinyxml2.cpp
@@ -1400,6 +1400,18 @@ const XMLAttribute* XMLElement::FindAttribute( const char* name ) const
     return 0;

 }

 

+std::string XMLElement::StrAttribute( const char* name, const char* value ) const

+{

+	std::string str;

+    const XMLAttribute* a = FindAttribute( name );

+    if ( a ) {

+		if ( !value || XMLUtil::StringEqual( a->Value(), value )) {

+			str = a->Value();

+			return str;

+		}

+	}

+    return str;

+}

 

 const char* XMLElement::Attribute( const char* name, const char* value ) const

 {

@@ -1413,7 +1425,6 @@ const char* XMLElement::Attribute( const char* name, const char* value ) const
     return 0;

 }

 

-

 const char* XMLElement::GetText() const

 {

     if ( FirstChild() && FirstChild()->ToText() ) {

diff --git a/src/world.cpp b/src/world.cpp
index 32a3153..e4ce1fd 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -1,3 +1,5 @@
+#include <algorithm>
+
 #include <world.h>
 #include <ui.h>
 
@@ -13,11 +15,15 @@
 
 #define INDOOR_FLOOR_HEIGHT     100
 
+
+extern Player *player;
+
+
 /**
  * Contains the current weather, used in many other places/files.
  */
 
-WEATHER weather = SUNNY;
+WorldWeather weather = WorldWeather::Sunny;
 
 const std::string bgPaths[2][9]={
     {"bg.png",					// Daytime background
@@ -69,15 +75,15 @@ const float bgDraw[4][3]={
  */
 
 void World::
-setBackground( WORLD_BG_TYPE bgt )
+setBackground( WorldBGType bgt )
 {
     // load textures with a limit check
 	switch ( (bgType = bgt) ) {
-	case BG_FOREST:
+	case WorldBGType::Forest:
 		bgTex = new Texturec( bgFiles );
 		break;
         
-	case BG_WOODHOUSE:
+	case WorldBGType::WoodHouse:
 		bgTex = new Texturec( bgFilesIndoors );
 		break;
 
@@ -95,12 +101,12 @@ setBackground( WORLD_BG_TYPE bgt )
  */
 
 void World::
-setStyle( const char *pre )
+setStyle( std::string pre )
 {
     unsigned int i;
     
     // get folder prefix
-	std::string prefix = pre ? pre : "assets/style/classic/";
+	std::string prefix = pre.empty() ? "assets/style/classic/" : pre;
     
 	for ( i = 0; i < arrAmt(buildPaths); i++ )
 		sTexLoc.push_back( prefix + buildPaths[i] );
@@ -125,9 +131,7 @@ setStyle( const char *pre )
 World::
 World( void )
 {
-    // nullify strings
-	bgm = NULL;
-	bgmObj = NULL;
+    bgmObj = NULL;
     
 	toLeft = NULL;
 	toRight = NULL;
@@ -149,9 +153,7 @@ deleteEntities( void )
 		mob.pop_back();
 	}
 
-	while(!merchant.empty()){
-		merchant.pop_back();
-	}
+	merchant.clear();
 	while(!npc.empty()){
 		delete npc.back();
 		npc.pop_back();
@@ -170,19 +172,13 @@ deleteEntities( void )
 	}
     
     // clear entity array
-	while ( !entity.empty() ) {
-		entity.pop_back();
-	}
+	entity.clear();
     
     // free particles
-	while ( !particles.empty() ) {
-		delete particles.back();
-		particles.pop_back();
-	}
+	particles.clear();
     
     // clear light array
-	while ( !light.empty() )
-		light.pop_back();
+	light.clear();
 
     // free villages
 	while ( !village.empty() ) {
@@ -205,10 +201,6 @@ World::
 	if(bgmObj)
 		Mix_FreeMusic(bgmObj);
     
-    // bgm path
-	if(bgm)
-		delete[] bgm;
-
 	delete bgTex;
 	
 	delete[] toLeft;
@@ -311,21 +303,17 @@ update( Player *p, unsigned int delta )
 	}
 
     // iterate through particles
-    for(unsigned int i=0;i<particles.size();i++){
-		if(particles[i]->kill(deltaTime)){
-			delete particles[i];
-			particles.erase(particles.begin()+i);
-		}else if(particles[i]->canMove){
-			particles[i]->loc.y += particles[i]->vely * deltaTime;
-			particles[i]->loc.x += particles[i]->velx * deltaTime;
-
-			for(auto &b : build){
-				if(b->bsubtype==FOUNTAIN){
-					if(particles[i]->loc.x >= b->loc.x && particles[i]->loc.x <= b->loc.x + b->width){
-						if(particles[i]->loc.y <= b->loc.y + b->height * .25){
-							delete particles[i];
-							particles.erase(particles.begin()+i);
-						}
+    particles.erase( std::remove_if( particles.begin(), particles.end(), [&delta](Particles part){ return part.kill( delta ); }), particles.end());
+    for ( auto part = particles.begin(); part != particles.end(); part++ ) {
+		if ( (*part).canMove ) {
+			(*part).loc.y += (*part).vely * delta;
+			(*part).loc.x += (*part).velx * delta;
+
+			for ( auto &b : build ) {
+				if ( b->bsubtype == FOUNTAIN ) {
+					if ( (*part).loc.x >= b->loc.x && (*part).loc.x <= b->loc.x + b->width ) {
+						if ( (*part).loc.y <= b->loc.y + b->height * .25)
+							particles.erase( part );
 					}
 				}
 			}
@@ -349,7 +337,8 @@ update( Player *p, unsigned int delta )
 void World::
 setBGM( std::string path )
 {
-	bgmObj = Mix_LoadMUS( strcpy( (bgm = new char[ path.size() + 1 ]), path.c_str()) );
+	if( !path.empty() )
+		bgmObj = Mix_LoadMUS( (bgm = path).c_str() );
 }
 
 /**
@@ -359,7 +348,7 @@ setBGM( std::string path )
  */
 
 void World::
-bgmPlay( World *prev )
+bgmPlay( World *prev ) const
 {
 	if ( prev ) {
 		if ( bgm != prev->bgm ) {
@@ -442,8 +431,8 @@ draw( Player *p )
 	
 	// draw the stars if the time deems it appropriate
 	
-	if (((( weather == DARK  ) & ( tickCount % DAY_CYCLE )) < DAY_CYCLE / 2)   ||
-	    ((( weather == SUNNY ) & ( tickCount % DAY_CYCLE )) > DAY_CYCLE * .75) ){
+	if (((( weather == WorldWeather::Dark  ) & ( tickCount % DAY_CYCLE )) < DAY_CYCLE / 2)   ||
+	    ((( weather == WorldWeather::Sunny ) & ( tickCount % DAY_CYCLE )) > DAY_CYCLE * .75) ){
 
 		if (tickCount % DAY_CYCLE) {	// The above if statement doesn't check for exact midnight.
 				
@@ -475,7 +464,7 @@ draw( Player *p )
 		}
 	glEnd();
 	
-	for ( i = 0; i < 4; i++ ) {
+	for ( i = 4; i--; ) {
 		bgTex->bindNext();
 		safeSetColorA( bgDraw[i][0] - shadeBackground, bgDraw[i][0] - shadeBackground, bgDraw[i][0] - shadeBackground, bgDraw[i][1] );
 	
@@ -513,11 +502,8 @@ draw( Player *p )
 		iEnd = GROUND_HILLINESS;
 
 	// draw particles and buildings
-	
-	for ( auto &part : particles ) {
-		if ( part->behind )
-			part->draw();
-	}
+
+	std::for_each( particles.begin(), particles.end(), [](Particles part) { if ( part.behind ) part.draw(); });
 	
 	for ( auto &b : build )
 		b->draw();
@@ -640,10 +626,7 @@ draw( Player *p )
      * Draw remaining entities.
      */
 	
-	for ( auto &part : particles ) {
-		if( !part->behind )
-			part->draw();
-	}
+	std::for_each( particles.begin(), particles.end(), [](Particles part) { if ( !part.behind ) part.draw(); });
 	
 	for ( auto &n : npc )
 		n->draw();
@@ -757,7 +740,8 @@ singleDetect( Entity *e )
     
 	if(e->alive){
 	  
-		if(e->type == MOBT && Mobp(e)->subtype == MS_TRIGGER)return;
+		if ( e->type == MOBT && Mobp(e)->subtype == MS_TRIGGER )
+			return;
 	  
 		/*
 		 *	Calculate the line that this entity is currently standing on.
@@ -825,17 +809,18 @@ detect( Player *p )
 	for ( auto &part : particles ) {
 		int l;
 		unsigned int i;
-		l=(part->loc.x + part->width / 2 - worldStart) / HLINE;
+		l=(part.loc.x + part.width / 2 - worldStart) / HLINE;
 		if(l < 0) l=0;
 		i = l;
 		if(i > lineCount-1) i=lineCount-1;
-		if(part->loc.y < worldData[i].groundHeight){
-			part->loc.y = worldData[i].groundHeight;
-			part->vely = 0;
-			part->velx = 0;
-			part->canMove = false;
+		if(part.loc.y < worldData[i].groundHeight){
+			part.loc.y = worldData[i].groundHeight;
+			part.vely = 0;
+			part.velx = 0;
+			part.canMove = false;
 		}else{
-			if(part->gravity && part->vely > -2)part->vely-=.003 * deltaTime;
+			if(part.gravity && part.vely > -2)
+				part.vely-=.003 * deltaTime;
 		}
 	}
 	for(auto &b : build){
@@ -851,14 +836,14 @@ detect( Player *p )
 												{0,0,255}, 
 												2500);
 
-					particles.back()->fountain = true;
+					particles.back().fountain = true;
 				}
 				break;
 			case FIRE_PIT:
 				for(int r = 0; r < (rand()%20)+10;r++){
 					addParticle(rand()%(int)(b->width/2) + b->loc.x+b->width/4, b->loc.y+3*HLINE, HLINE, HLINE, rand()%2 == 0?-(rand()%3)*.01:(rand()%3)*.01,((4+rand()%6)*.005), {255,0,0}, 400);
-					particles.back()->gravity = false;
-					particles.back()->behind = true;
+					particles.back().gravity = false;
+					particles.back().behind = true;
 				}
 				break;
 			default: break;
@@ -882,36 +867,17 @@ detect( Player *p )
 	}*/
 }
 
-void World::addStructure(BUILD_SUB sub, float x,float y, char *tex, const char *inside){
+void World::addStructure(BUILD_SUB sub, float x,float y, std::string tex, std::string inside){
 	build.push_back(new Structures());
 	build.back()->inWorld = this;
 	build.back()->textureLoc = tex;
+	
 	build.back()->spawn(sub,x,y);
-
-	if(inside)
-		strcpy((build.back()->inside = new char[1 + strlen(inside)]),inside);
-	else
-		strcpy((build.back()->inside = new char[1]),"\0");
+	
+	build.back()->inside = inside;
 		
 	entity.push_back(build.back());
 }
-	
-/*void World::addVillage(int bCount, int npcMin, int npcMax,const char *inside){
-	std::cout << npcMin << ", " << npcMax << std::endl;
-	//int xwasd;
-	for(int i = 0; i < bCount; i++){
-		addStructure(HOUSE,x_start + (i * 300),100,inside);
-		std::cout<<"1\n";
-		HERE:
-		xwasd = (rand()%(int)x+1000*HLINE);
-		for(auto &bu : build){
-			if(xwasd > bu->loc.x && xwasd < bu->loc.x+bu->width)goto HERE;
-		}
-		std::cout<<"2\n";
-		addStructure(t,HOUSE,xwasd,y,inside);
-		std::cout<<"3\n";
-	}
-}*/
 
 void World::addMob(int t,float x,float y){
 	mob.push_back(new Mob(t));
@@ -943,34 +909,28 @@ void World::addMerchant(float x, float y){
 	entity.push_back(npc.back());
 }
 
-void World::addObject(/*ITEM_ID i*/std::string in,const char *p, float x, float y){
+void World::addObject( std::string in, std::string p, float x, float y){
 	object.push_back(new Object(in,p));
 	object.back()->spawn(x,y);
 
 	entity.push_back(object.back());
 }
 
-void World::addParticle(float x, float y, float w, float h, float vx, float vy, Color color, int d){
-	particles.push_back(new Particles(x,y,w,h,vx,vy,color,d));
-	particles.back()->canMove = true;
+void World::
+addParticle( float x, float y, float w, float h, float vx, float vy, Color color, int d )
+{
+	particles.emplace_back( x, y, w, h, vx, vy, color, d );
+	particles.back().canMove = true;
 }
 
 void World::addLight(vec2 loc, Color color){
 	if(light.size() < 64){
-		light.push_back(Light());
+		light.emplace_back();
 		light.back().loc = loc;
 		light.back().color = color;
 	}
 }
 
-NPC *World::getAvailableNPC(void){
-	for(auto &n : npc){
-		if(n->aiFunc.empty())
-			return n;
-	}
-	return (NPC *)NULL;
-}
-
 char *World::setToLeft(const char *file){
 	if(toLeft)
 		delete[] toLeft;
@@ -1037,7 +997,7 @@ goInsideStructure( Player *p )
 			   p->loc.x + p->width < b->loc.x + b->width ){
 				inside.push_back((std::string)(currentXML.c_str() + 4));
 				
-				tmp = loadWorldFromXML(b->inside);
+				tmp = loadWorldFromXML(b->inside.c_str());
 				
 				ui::toggleBlackFast();
 				ui::waitForCover();
@@ -1050,7 +1010,7 @@ goInsideStructure( Player *p )
 		strcpy((current = new char[strlen((const char *)(currentXML.c_str() + 4)) + 1]),(const char *)(currentXML.c_str() + 4));
 		tmp = loadWorldFromXML(inside.back().c_str());
 		for(auto &b : tmp->build){
-			if(!strcmp(current,b->inside)){
+			if(!strcmp(current,b->inside.c_str())){
 				inside.pop_back();
 
 				ui::toggleBlackFast();
@@ -1075,7 +1035,9 @@ void World::addHole(unsigned int start,unsigned int end){
 	}
 }
 
-int World::getTheWidth(void){
+int World::
+getTheWidth( void ) const
+{
 	return worldStart * -2;
 }
 
@@ -1269,8 +1231,12 @@ void IndoorWorld::draw(Player *p){
 	 *	Draw all entities.
 	*/
 	
-	for(auto &part : particles) part->draw();
-	for(auto &e : entity) e->draw();
+	for ( auto &part : particles )
+		part.draw();
+
+	for ( auto &e : entity )
+		e->draw();
+
 	p->draw();
 }
 
@@ -1324,18 +1290,23 @@ World *Arena::exitArena(Player *p){
 #include <tinyxml2.h>
 using namespace tinyxml2;
 
-std::string currentXML = "\0";
+std::string currentXML;
 
 extern World *currentWorld;
 
-World *loadWorldFromXML(const char *path){
-	if ( currentXML != "\0" )
+World *loadWorldFromXML(std::string path){
+	if ( !currentXML.empty() )
 		currentWorld->save();
 
 	return loadWorldFromXMLNoSave(path);
 }
 
-World *loadWorldFromXMLNoSave(const char *path){
+/**
+ * Loads a world from the given XML file.
+ */
+
+World *
+loadWorldFromXMLNoSave( std::string path ) {
 	XMLDocument xml;
 	XMLElement *wxml;
 	XMLElement *vil;
@@ -1374,9 +1345,9 @@ World *loadWorldFromXMLNoSave(const char *path){
 			else
 				abort();
 		}else if(!strcmp(name,"style")){
-			tmp->setStyle(wxml->Attribute("folder"));
-			tmp->setBackground((WORLD_BG_TYPE)wxml->UnsignedAttribute("background"));
-			tmp->setBGM(wxml->Attribute("bgm"));
+			tmp->setStyle(wxml->StrAttribute("folder"));
+			tmp->setBackground((WorldBGType)wxml->UnsignedAttribute("background"));
+			tmp->setBGM(wxml->StrAttribute("bgm"));
 		}else if(!strcmp(name,"generation")){
 			if(!strcmp(wxml->Attribute("type"),"Random")){
 				if(Indoor)
@@ -1418,14 +1389,13 @@ World *loadWorldFromXMLNoSave(const char *path){
 			else tmp->npc.back()->dialogIndex = 9999;
 			
 		}else if(!strcmp(name,"structure")){
-			ptr = wxml->Attribute("inside");
 			tmp->addStructure((BUILD_SUB)wxml->UnsignedAttribute("type"),
 							   wxml->QueryFloatAttribute("x",&spawnx) != XML_NO_ERROR ? 
 							   			getRand() % tmp->getTheWidth() / 2.0f : 
 							   			spawnx,
 							   100,
-							   (char*)wxml->Attribute("texture"),
-							   ptr);
+							   wxml->StrAttribute("texture"),
+							   wxml->StrAttribute("inside"));
 		}else if(!strcmp(name,"trigger")){
 			tmp->addMob(MS_TRIGGER,wxml->FloatAttribute("x"),0,commonTriggerFunc);
 			tmp->mob.back()->heyid = wxml->Attribute("id");
@@ -1453,13 +1423,11 @@ World *loadWorldFromXMLNoSave(const char *path){
 		 */
 		 
 		if(!strcmp(name,"structure")){
-			ptr = vil->Attribute("inside");
 			tmp->addStructure((BUILD_SUB)vil->UnsignedAttribute("type"),
 							   vil->QueryFloatAttribute("x", &spawnx) != XML_NO_ERROR ? randx : spawnx,
 							   100,
-							   (char*)vil->Attribute("texture"),
-							   ptr);
-
+							   vil->StrAttribute("texture"),
+							   vil->StrAttribute("inside"));
 		}else if(!strcmp(name, "stall")){
 			if(!strcmp(vil->Attribute("type"),"market")){
 				std::cout << "Market" << std::endl;
@@ -1467,8 +1435,8 @@ World *loadWorldFromXMLNoSave(const char *path){
 							   vil->QueryFloatAttribute("x", &spawnx) != XML_NO_ERROR ? 
 							   randx : spawnx,
 							   100,
-							   (char*)vil->Attribute("texture"),
-							   ptr);
+							   vil->StrAttribute("texture"),
+							   vil->StrAttribute("inside"));
 				tmp->addMerchant(0,100);
 				if(vil->FirstChildElement("buy")){
 					std::cout << "Buy" << std::endl;
@@ -1490,14 +1458,17 @@ World *loadWorldFromXMLNoSave(const char *path){
 							   vil->QueryFloatAttribute("x", &spawnx) != XML_NO_ERROR ? 
 							   randx : spawnx,
 							   100,
-							   (char*)vil->Attribute("texture"),
-							   ptr);
+							   vil->StrAttribute("texture"),
+							   vil->StrAttribute("inside"));
 			}
 		}
-			vptr->build.push_back(tmp->build.back());
+		
+		vptr->build.push_back(tmp->build.back());
+		
 		if(vptr->build.back()->loc.x < vptr->start.x){
 			vptr->start.x = vptr->build.back()->loc.x;
 		}
+		
 		if(vptr->build.back()->loc.x + vptr->build.back()->width > vptr->end.x){
 			vptr->end.x = vptr->build.back()->loc.x + vptr->build.back()->width;
 		}