c++'d more stuff

8 files changed, 94 insertions, 152 deletions

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/entities.h b/include/entities.h
index 3b8a19b..334bfeb 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -254,11 +254,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/world.h b/include/world.h
index 7b9383a..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.
@@ -345,7 +301,7 @@ public:
 	 * upon object interaction.
 	 */
 	
-	void addObject(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,
@@ -359,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
@@ -387,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
@@ -400,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.
@@ -457,7 +406,7 @@ public:
 	 *	Get's the world's width.
 	 */
 	
-	int getTheWidth(void);
+	int getTheWidth(void) const;
 	
 	void save(void);
 	void load(void);
@@ -488,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 3769379..e96a555 100644
--- a/main.cpp
+++ b/main.cpp
@@ -162,7 +162,7 @@ Menu *currentMenu;
 Menu optionsMenu;
 Menu pauseMenu;
 
-extern WEATHER weather;
+extern WorldWeather weather;
 
 extern int  fadeIntensity;
 extern bool fadeEnable;
@@ -933,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/entities.cpp b/src/entities.cpp
index 4291b0a..5c60386 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -241,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;
@@ -265,7 +258,6 @@ Object::Object(std::string in, const char *pd){
 	inv = NULL;
 }
 Object::~Object(){
-	delete[] pickupDialog;
 	delete tex;
 	delete[] name;
 }
@@ -464,10 +456,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{
@@ -523,6 +515,7 @@ unsigned int Structures::spawn(BUILD_SUB sub, float x, float y){
 			inv = NULL;
 			break;
 	}
+	
 	return 0;
 }
 
@@ -541,7 +534,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/world.cpp b/src/world.cpp
index a9e0fd9..bef6fc0 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -15,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
@@ -71,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;
 
@@ -97,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] );
@@ -127,9 +131,7 @@ setStyle( const char *pre )
 World::
 World( void )
 {
-    // nullify strings
-	bgm = NULL;
-	bgmObj = NULL;
+    bgmObj = NULL;
     
 	toLeft = NULL;
 	toRight = NULL;
@@ -199,10 +201,6 @@ World::
 	if(bgmObj)
 		Mix_FreeMusic(bgmObj);
     
-    // bgm path
-	if(bgm)
-		delete[] bgm;
-
 	delete bgTex;
 	
 	delete[] toLeft;
@@ -339,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() );
 }
 
 /**
@@ -349,7 +348,7 @@ setBGM( std::string path )
  */
 
 void World::
-bgmPlay( World *prev )
+bgmPlay( World *prev ) const
 {
 	if ( prev ) {
 		if ( bgm != prev->bgm ) {
@@ -432,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.
 				
@@ -872,6 +871,7 @@ void World::addStructure(BUILD_SUB sub, float x,float y, std::string tex, std::s
 	build.push_back(new Structures());
 	build.back()->inWorld = this;
 	build.back()->textureLoc = tex;
+	
 	build.back()->spawn(sub,x,y);
 	
 	build.back()->inside = inside;
@@ -909,7 +909,7 @@ 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);
 
@@ -925,20 +925,12 @@ addParticle( float x, float y, float w, float h, float vx, float vy, Color color
 
 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;
@@ -1043,7 +1035,9 @@ void World::addHole(unsigned int start,unsigned int end){
 	}
 }
 
-int World::getTheWidth(void){
+int World::
+getTheWidth( void ) const
+{
 	return worldStart * -2;
 }
 
@@ -1300,7 +1294,7 @@ std::string currentXML;
 
 extern World *currentWorld;
 
-World *loadWorldFromXML(const char *path){
+World *loadWorldFromXML(std::string path){
 	if ( !currentXML.empty() )
 		currentWorld->save();
 
@@ -1312,7 +1306,7 @@ World *loadWorldFromXML(const char *path){
  */
 
 World *
-loadWorldFromXMLNoSave( const char *path ) {
+loadWorldFromXMLNoSave( std::string path ) {
 	XMLDocument xml;
 	XMLElement *wxml;
 	XMLElement *vil;
@@ -1351,9 +1345,9 @@ 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)
@@ -1395,14 +1389,13 @@ 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");
@@ -1428,13 +1421,12 @@ loadWorldFromXMLNoSave( const char *path ) {
 		 * 	READS DATA ABOUT STRUCTURE CONTAINED IN VILLAGE
 		 */
 		 
-		if(!strcmp(name,"structure")){		
+		if(!strcmp(name,"structure")){
 			tmp->addStructure((BUILD_SUB)vil->UnsignedAttribute("type"),
 							   vil->QueryFloatAttribute("x", &spawnx) != XML_NO_ERROR ? randx : spawnx,
 							   100,
 							   vil->StrAttribute("texture"),
 							   vil->StrAttribute("inside"));
-
 		}else if(!strcmp(name, "stall")){
 			if(!strcmp(vil->Attribute("type"),"market")){
 				std::cout << "Market" << std::endl;
@@ -1462,10 +1454,13 @@ loadWorldFromXMLNoSave( const char *path ) {
 							   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;
 		}