Villages!

5 files changed, 43 insertions, 28 deletions

diff --git a/Changelog b/Changelog
index 0f4fdcf..f3839a8 100644
--- a/Changelog
+++ b/Changelog
@@ -665,3 +665,13 @@
 
 	- made saving functionality for player coordinates, inventory, health and current world
 	- addded structured villages
+
+2/22/2016:
+==========
+
+	- found weird memory leak bug with structure inits
+	- mob deaths are saved
+	- fixed building spawning
+	- volumes are better
+	
+	~ 5 month Changelog anniversary!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/include/ui.h b/include/ui.h
index a3084eb..6a81ff8 100644
--- a/include/ui.h
+++ b/include/ui.h
@@ -61,10 +61,10 @@ public:
 	void gotoParent();
 };
 
-typedef uint8_t BYTE;
+typedef uint8_t  BYTE;
 typedef uint16_t WORD;
 typedef uint32_t DWORD;
-typedef int32_t LONG;
+typedef  int32_t LONG;
 
 typedef struct{
 	WORD 	bfType;
@@ -101,12 +101,14 @@ namespace ui {
 	/*
 	 *	These flags are used elsewhere.
 	*/
-
+	
+	extern unsigned int fontSize;
+	
 	extern bool debug;
 	extern bool posFlag;
-	extern unsigned int fontSize;
-	extern bool			 dialogBoxExists;
+	
 	extern unsigned char dialogOptChosen;
+	extern bool dialogBoxExists;
 	extern bool dialogImportant;
 	extern bool dialogPassive;
 
diff --git a/main.cpp b/main.cpp
index ecff5c6..97f788c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -124,8 +124,6 @@ GLuint shaderProgram;
 GLuint colorIndex;
 GLuint mouseTex;
 
-Mix_Chunk *crickets;
-
 /*
  *	loops is used for texture animation. It is believed to be passed to entity
  *	draw functions, although it may be externally referenced instead.
@@ -170,27 +168,25 @@ void mainLoop(void);
 
 vec2 offset;																			/*	OFFSET!!!!!!!!!!!!!!!!!!!! */
 
-float shit = 0;
-Menu* currentMenu;
-Menu pauseMenu;
+Menu *currentMenu;
 Menu optionsMenu;
-
+Menu pauseMenu;
 
 extern WEATHER weather;
 
+extern int  fadeIntensity;
 extern bool fadeEnable;
 extern bool fadeWhite;
 extern bool fadeFast;
-extern int  fadeIntensity;
 
-unsigned int HLINE		   = 3;
-unsigned int SCREEN_WIDTH  = 1280;
-unsigned int SCREEN_HEIGHT = 720;
-bool		 FULLSCREEN    = false;
+unsigned int SCREEN_WIDTH;
+unsigned int SCREEN_HEIGHT;
+unsigned int HLINE;
+bool FULLSCREEN;
 
-float 		 VOLUME_MASTER = 50;
-float 		 VOLUME_MUSIC  = 25;
-float		 VOLUME_SFX    = 25;
+float VOLUME_MASTER;
+float VOLUME_MUSIC;
+float VOLUME_SFX;
 
 /*******************************************************************************
  * MAIN ************************************************************************
diff --git a/src/entities.cpp b/src/entities.cpp
index 922a07c..6c2da81 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -136,7 +136,7 @@ NPC::~NPC(){
 }
 
 Structures::Structures(){ //sets the structure type
-	health = maxHealth = 25;
+	health = maxHealth = 1;
 	
 	alive = false;
 	near  = false;
@@ -456,6 +456,7 @@ unsigned int Structures::spawn(BUILD_SUB sub, float x, float y){
 	type = STRUCTURET;
 
 	alive = true;
+	canMove = false;
 
 	bsubtype = sub;
 	dim2 dim;
diff --git a/src/world.cpp b/src/world.cpp
index 6e72328..2df0712 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -323,8 +323,10 @@ void World::update(Player *p,unsigned int delta){
 
 	for(auto &e : entity){
 		e->loc.y += e->vel.y * delta;
+		
 		if(e->type != STRUCTURET && e->canMove){
 			e->loc.x += e->vel.x * delta;
+			
 			if(e->vel.x < 0)e->left = true;
 	   		else if(e->vel.x > 0)e->left = false;
 		}
@@ -359,7 +361,7 @@ void World::update(Player *p,unsigned int delta){
 }
 
 void World::setBGM(std::string path){
-	bgm = new char[path.size()];
+	bgm = new char[path.size() + 1];
 	strcpy(bgm,path.c_str());
 	bgmObj = Mix_LoadMUS(bgm);
 }
@@ -819,13 +821,13 @@ void World::singleDetect(Entity *e){
 					break;
 				case MOBT:
 					std::cout<<"Killed a mob..."<<std::endl;
-					for(j=0;j<mob.size();j++){
+					/*for(j=0;j<mob.size();j++){
 						if(mob[j]==e){
 							delete mob[j];
 							mob.erase(mob.begin()+j);
 							break;
 						}
-					}
+					}*/
 					break;
 				case OBJECTT:
 					std::cout<<"Killed an object..."<<std::endl;
@@ -921,7 +923,7 @@ void World::singleDetect(Entity *e){
 		/*
 		 *	Insure that the entity doesn't fall off either edge of the world.
 		*/
-		
+
 		if(e->loc.x < x_start){												// Left bound
 			
 			e->vel.x=0;
@@ -950,7 +952,6 @@ void World::detect(Player *p){
 	*/
 	
 //LOOOOP:
-	static int what = 0;
 	for(auto &e : entity)
 		std::thread(&World::singleDetect,this,e).detach();
 		//hey->singleDetect(e);
@@ -969,8 +970,7 @@ void World::detect(Player *p){
 		}else{
 			if(part->gravity && part->vely > -2)part->vely-=.003 * deltaTime;
 		}
-		what++;
-	}what=0;
+	}
 	for(auto &b : build){
 		switch(b->bsubtype){
 			case FOUNTAIN:
@@ -1259,6 +1259,7 @@ void World::save(void){
 	for(auto &m : mob){
 		data.append(std::to_string((int)m->loc.x) + "\n");
 		data.append(std::to_string((int)m->loc.y) + "\n");
+		data.append(std::to_string((int)m->alive) + "\n");
 	}
 	
 	data.append("dOnE\0");
@@ -1312,6 +1313,9 @@ void World::load(void){
 		std::getline(iss,line);
 		if(line == "dOnE")return;
 		m->loc.y = std::stoi(line);
+		std::getline(iss,line);
+		if(line == "dOnE")return;
+		m->alive = std::stoi(line);
 	}
 	
 	while(std::getline(iss,line)){
@@ -1519,7 +1523,9 @@ World *loadWorldFromXMLNoSave(const char *path){
 	const char *ptr,*name;
 	
 	unsigned int size = 5 + strlen(path);
-	
+
+	if(currentXML)
+		delete[] currentXML;
 	memset((currentXML = new char[size]),0,size);
 	strcpy(currentXML,"xml/");
 	strcat(currentXML,path);