andy cant code

7 files changed, 233 insertions, 140 deletions

diff --git a/src/Quest.cpp b/src/Quest.cpp
index bfa8966..4e8522d 100644
--- a/src/Quest.cpp
+++ b/src/Quest.cpp
@@ -7,25 +7,22 @@
 #define END		}),

 

 const Quest QuestList[TOTAL_QUESTS]={

-//	Quest("Test","A test quest",(struct item_t){1,TEST_ITEM}),

-

 // Get quest list

 #include "../config/quest_list.txt"

-

 };

 

 

 Quest::Quest(const char *t,const char *d,struct item_t r){

-	title = new char[strlen(t)+1];	//(char *)calloc(safe_strlen(t),sizeof(char));

-	desc = new char[strlen(d)+1];		//(char *)calloc(safe_strlen(d),sizeof(char));

+	title = new char[strlen(t)+1];

+	desc = new char[strlen(d)+1];

 	strcpy(title,t);

 	strcpy(desc,d);

 	memcpy(&reward,&r,sizeof(struct item_t));

 }

 

 Quest::~Quest(){

-	delete[] title;	//free(title);

-	delete[] desc;	//free(desc);

+	delete[] title;

+	delete[] desc;

 	memset(&reward,0,sizeof(struct item_t));

 }

 

diff --git a/src/Texture.cpp b/src/Texture.cpp
index 8b40513..a3a8afe 100644
--- a/src/Texture.cpp
+++ b/src/Texture.cpp
@@ -13,7 +13,6 @@ namespace Texture{
 	GLuint loadTexture(const char *fileName){
 		SDL_Surface *image;
 		GLuint object = 0;
-		unsigned int i;
 
 		for(unsigned int i=0;i<LoadedTextureCounter;i++){
 			if(!strcmp(LoadedTexture[i]->name,fileName)){
@@ -74,9 +73,13 @@ Texturec::Texturec(uint amt, ...){
 	va_end(fNames);
 }
 
+Texturec::~Texturec(){
+	delete[] image;
+}
+
 void Texturec::bind(unsigned int bn){
 	texState = bn;
-	glBindTexture(GL_TEXTURE_2D, image[texState]);
+	glBindTexture(GL_TEXTURE_2D,image[(int)texState]);
 }
 
 void Texturec::bindNext(){
diff --git a/src/entities.cpp b/src/entities.cpp
index 4e582c9..100eefb 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -10,6 +10,39 @@ extern Player *player;
 
 extern const char *itemName;
 
+void getRandomName(Entity *e){
+	int tempNum,max=0;
+	char buf,*bufs;
+	
+	rewind(names);
+	
+	bufs = new char[16];	//(char *)malloc(16);
+	
+	for(;!feof(names);max++){
+		fgets(bufs,16,(FILE*)names);
+	}
+	
+	tempNum = rand() % max;
+	rewind(names);
+	
+	for(int i=0;i<tempNum;i++){
+		fgets(bufs,16,(FILE*)names);
+	}
+	
+	switch(fgetc(names)){
+	case 'm': e->gender = MALE;  break;
+	case 'f': e->gender = FEMALE;break;
+	default : break;
+	}
+	
+	if((fgets(bufs,16,(FILE*)names)) != NULL){
+		bufs[strlen(bufs)-1] = '\0';
+		strcpy(e->name,bufs);
+	}
+	
+	delete[] bufs;
+}
+
 void Entity::spawn(float x, float y){	//spawns the entity you pass to it based off of coords and global entity settings
 	loc.x = x;
 	loc.y = y;
@@ -33,8 +66,8 @@ void Entity::spawn(float x, float y){	//spawns the entity you pass to it based o
 		}
 	}
 	
-	name = new char[16];	//(char*)malloc(16);
-	getName();
+	name = new char[16];
+	getRandomName(this);
 }
 
 Player::Player(){ //sets all of the player specific traits on object creation
@@ -48,6 +81,11 @@ Player::Player(){ //sets all of the player specific traits on object creation
 	tex = new Texturec(3, "assets/player1.png", "assets/player.png", "assets/player2.png");
 	inv = new Inventory(PLAYER_INV_SIZE);
 }
+Player::~Player(){
+	delete inv;
+	delete tex;
+	delete[] name;
+}
 
 NPC::NPC(){	//sets all of the NPC specific traits on object creation
 	width = HLINE * 10;
@@ -63,6 +101,15 @@ NPC::NPC(){	//sets all of the NPC specific traits on object creation
 	tex = new Texturec(1,"assets/NPC.png");
 	inv = new Inventory(NPC_INV_SIZE);
 }
+NPC::~NPC(){
+	while(!aiFunc.empty()){
+		aiFunc.pop_back();
+	}
+	
+	delete inv;
+	delete tex;
+	delete[] name;
+}
 
 Structures::Structures(){ //sets the structure type
 	health = maxHealth = 1;
@@ -74,6 +121,11 @@ Structures::Structures(){ //sets the structure type
 	
 	inWorld = NULL;
 }
+Structures::~Structures(){
+	delete inv;
+	delete tex;
+	delete[] name;
+}
 
 Mob::Mob(int sub){
 	type = MOBT;
@@ -99,6 +151,11 @@ Mob::Mob(int sub){
 	
 	inv = new Inventory(NPC_INV_SIZE);
 }
+Mob::~Mob(){
+	delete inv;
+	delete tex;
+	delete[] name;
+}
 
 Object::Object(ITEM_ID id, bool qo, const char *pd){
 	identifier = id;
@@ -107,6 +164,7 @@ Object::Object(ITEM_ID id, bool qo, const char *pd){
 	pickupDialog = new char[strlen(pd)+1];
 	strcpy(pickupDialog,pd);
 	
+
 	type = OBJECTT;
 	alive = true;
 	near = false;
@@ -115,8 +173,15 @@ Object::Object(ITEM_ID id, bool qo, const char *pd){
 
 	maxHealth = health = 1;
 	tex = new Texturec(1,getItemTexturePath(id));
-}
 
+}
+Object::~Object(){
+	delete[] pickupDialog;
+	
+	delete inv;
+	delete tex;
+	delete[] name;
+}
 
 void Entity::draw(void){		//draws the entities
 	glPushMatrix();
@@ -208,38 +273,6 @@ NOPE:
 	}
 }
 
-void Entity::getName(){
-	rewind(names);
-	char buf,*bufs = new char[16];	//(char *)malloc(16);
-	int tempNum,max = 0;
-	for(;!feof(names);max++){
-		fgets(bufs,16,(FILE*)names);
-	}
-	tempNum = rand()%max;
-	rewind(names);
-	for(int i=0;i<tempNum;i++){
-		fgets(bufs,16,(FILE*)names);
-	}
-	switch(fgetc(names)){
-	case 'm':
-		gender = MALE;
-		//std::puts("Male");
-		break;
-	case 'f':
-		gender = FEMALE;
-		//std::puts("Female");
-		break;
-	default:
-		break;
-	}
-	if((fgets(bufs,16,(FILE*)names)) != NULL){
-		//std::puts(bufs);
-		bufs[strlen(bufs)-1] = '\0';
-		strcpy(name,bufs);
-	}
-	delete[] bufs;	//free(bufs);
-}
-
 void Player::interact(){ //the function that will cause the player to search for things to interact with
 	
 }
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index 2fd7424..b7eab72 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -5,42 +5,6 @@
 
 extern World	*currentWorld;
 extern Player	*player;
-extern void mainLoop(void);
-extern SDL_Window *window;
-extern bool fadeEnable;
-
-void story(void){
-	for(int i=0;i<600;i++){
-		glMatrixMode(GL_PROJECTION);
-		glPushMatrix();
-		glLoadIdentity();
-		glOrtho((offset.x-SCREEN_WIDTH/2),(offset.x+SCREEN_WIDTH/2),offset.y-SCREEN_HEIGHT/2,offset.y+SCREEN_HEIGHT/2,-1,1);
-		glMatrixMode(GL_MODELVIEW);
-		glPushMatrix();
-		glLoadIdentity();
-		glEnable(GL_STENCIL_TEST);
-		glPushMatrix();
-
-		glPushAttrib( GL_DEPTH_BUFFER_BIT | GL_LIGHTING_BIT );
-		glClear(GL_COLOR_BUFFER_BIT);
-
-		glColor4f(0.0f,0.0f,0.0f,0.0f);
-		glRectf(-SCREEN_WIDTH/2,0,SCREEN_WIDTH/2,SCREEN_HEIGHT);
-		glColor4f(1.0f,1.0f,1.0f,1.0f);
-		ui::importantText("Oh hello, where are you?");
-		//ui::setFontSize(16);
-		//ui::putText(54,540,"BITC.");
-
-		glPopMatrix();
-		SDL_GL_SwapWindow(window);
-	}
-}
-
-void waitForDialog(void){
-	do{
-		mainLoop();
-	}while(ui::dialogBoxExists);
-}
 
 int compTestQuest(NPC *speaker){
 	ui::dialogBox(speaker->name,NULL,"Ooo, that's a nice quest you got there. Lemme finish that for you ;).");
@@ -51,16 +15,13 @@ int compTestQuest(NPC *speaker){
 int giveTestQuest(NPC *speaker){
 	unsigned char i;
 	
-	char opt[]=":Yes:No";
-	ui::dialogBox(speaker->name,opt,"Here, have a quest!");
-	
-	waitForDialog();
+	ui::dialogBox(speaker->name,":Yes:No","Here, have a quest!");
+	ui::waitForDialog();
 	
 	if(ui::dialogOptChosen == 1){
 	
 		ui::dialogBox(speaker->name,NULL,"Have a good day! :)");
-
-		waitForDialog();
+		ui::waitForDialog();
 
 		player->qh.assign("Test");
 		currentWorld->npc[1]->addAIFunc(compTestQuest,true);
@@ -73,14 +34,12 @@ int giveTestQuest(NPC *speaker){
 static Arena *a;
 
 void CUTSCENEEE(void){
-	char opt[]=":K.";
 	player->vel.x = 0;
-	ui::dialogBox(player->name,opt,"No way I\'m gettin\' up this hill.");
 	
-	waitForDialog();
+	ui::dialogBox(player->name,":K.","No way I\'m gettin\' up this hill.");
+	ui::waitForDialog();
 
 	a = new Arena(currentWorld,player);
-	
 	currentWorld = a;
 	
 	/*player->right = true;
@@ -91,6 +50,13 @@ void CUTSCENEEE(void){
 float playerSpawnHillFunc(float x){
 	return (float)(pow(2,(-x+200)/5) + 80);
 }
+
+static World *test;
+static World *playerSpawnHill;
+static IndoorWorld *iw;
+
+void destroyEverything(void);
+
 void initEverything(void){
 	unsigned int i;
 	
@@ -98,17 +64,18 @@ void initEverything(void){
 	 *	World creation:
 	*/
 	
-	World *test=new World();
-	World *playerSpawnHill=new World();
+	test=new World();
 	
 	test->generate(SCREEN_WIDTH*2);
-	test->addHole(100,150);
-	
 	test->setBackground(BG_FOREST);
+	
+	test->addHole(100,150);
 	test->addLayer(400);
 	
-	playerSpawnHill->generateFunc(1280,playerSpawnHillFunc);
+	playerSpawnHill=new World();
+	
 	playerSpawnHill->setBackground(BG_FOREST);
+	playerSpawnHill->generateFunc(1280,playerSpawnHillFunc);
 	//playerSpawnHill->generate(1920);
 
 	/*
@@ -116,6 +83,7 @@ void initEverything(void){
 	*/
 	
 	currentWorld=playerSpawnHill;
+	
 	playerSpawnHill->toRight=test;
 	test->toLeft=playerSpawnHill;
 	
@@ -130,22 +98,21 @@ void initEverything(void){
 	 *	Create a structure (this will create villagers when spawned).
 	*/
 	
-	IndoorWorld *iw=new IndoorWorld();
+	iw=new IndoorWorld();
 	iw->generate(200);
 	
-	currentWorld->addStructure(STRUCTURET,(rand()%120*HLINE),10,test,iw);
-	
 	/*
-	 *	Spawn some mobs.
+	 *	Spawn some entities.
 	*/
 
+	playerSpawnHill->addStructure(STRUCTURET,(rand()%120*HLINE),10,test,iw);
 	playerSpawnHill->addMob(MS_TRIGGER,-1300,0,CUTSCENEEE);
 	
+	playerSpawnHill->addObject(SWORD_WOOD, false, "", 500,200);
+	playerSpawnHill->addObject(FLASHLIGHT, true, "This looks important, do you want to pick it up?",600,200);
+	
 	test->addMob(MS_RABBIT,200,100);
 	test->addMob(MS_BIRD,-500,500);
-	
-	currentWorld->addObject(SWORD_WOOD, false, "", 500,200);
-	currentWorld->addObject(FLASHLIGHT, true, "This looks important, do you want to pick it up?",600,200);
 
 	/*currentWorld->addObject(DEBUG_ITEM, 500,200);
 	currentWorld->addObject(TEST_ITEM,  550,200);
@@ -153,9 +120,52 @@ void initEverything(void){
 	currentWorld->addObject(SWORD_WOOD, 650,200);
 	currentWorld->addObject(FLASHLIGHT, true, "This looks important, do you want to pick it up?",700,200);
 	*/
-	/*
-	 *	Link all the entities that were just created to the initial world, and setup a test AI function. 
-	*/
 	
-	currentWorld->npc[0]->addAIFunc(giveTestQuest,false);
+	playerSpawnHill->npc[0]->addAIFunc(giveTestQuest,false);
+	
+	atexit(destroyEverything);
+}
+
+extern std::vector<int (*)(NPC *)> AIpreload;
+extern std::vector<NPC *> AIpreaddr;
+
+void destroyEverything(void){
+	delete test;
+	delete playerSpawnHill;
+	
+	while(!AIpreload.empty()){
+		AIpreload.pop_back();
+	}
+	while(!AIpreaddr.empty()){
+		AIpreaddr.pop_back();
+	}
+	
+	//delete iw;	// segfaults
 }
+
+/*void story(void){
+	for(int i=0;i<600;i++){
+		glMatrixMode(GL_PROJECTION);
+		glPushMatrix();
+		glLoadIdentity();
+		glOrtho((offset.x-SCREEN_WIDTH/2),(offset.x+SCREEN_WIDTH/2),offset.y-SCREEN_HEIGHT/2,offset.y+SCREEN_HEIGHT/2,-1,1);
+		glMatrixMode(GL_MODELVIEW);
+		glPushMatrix();
+		glLoadIdentity();
+		glEnable(GL_STENCIL_TEST);
+		glPushMatrix();
+
+		glPushAttrib( GL_DEPTH_BUFFER_BIT | GL_LIGHTING_BIT );
+		glClear(GL_COLOR_BUFFER_BIT);
+
+		glColor4f(0.0f,0.0f,0.0f,0.0f);
+		glRectf(-SCREEN_WIDTH/2,0,SCREEN_WIDTH/2,SCREEN_HEIGHT);
+		glColor4f(1.0f,1.0f,1.0f,1.0f);
+		ui::importantText("Oh hello, where are you?");
+		//ui::setFontSize(16);
+		//ui::putText(54,540,"BITC.");
+
+		glPopMatrix();
+		SDL_GL_SwapWindow(window);
+	}
+}*/
diff --git a/src/inventory.cpp b/src/inventory.cpp
index cd01c11..28612ae 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -7,10 +7,6 @@
 extern Player *player;
 extern GLuint invUI;
 
-static Item item[5]= {
-	#include "../config/items.h"
-};
-
 void itemDraw(Player *p,ITEM_ID id);
 
 char *getItemTexturePath(ITEM_ID id){
@@ -25,8 +21,8 @@ Item::Item(ITEM_ID i, const char *n, ITEM_TYPE t, float w, float h, int m, const
 	maxStackSize = m;
 	count = 0;
 
-	name 		= new char[strlen(n)+1];	//(char*)calloc(strlen(n ),sizeof(char));
-	textureLoc 	= new char[strlen(tl)+1];	//(char*)calloc(strlen(tl),sizeof(char));
+	name 		= new char[strlen(n)+1];
+	textureLoc 	= new char[strlen(tl)+1];
 
 	strcpy(name,n);
 	strcpy(textureLoc,tl);
@@ -37,14 +33,13 @@ Item::Item(ITEM_ID i, const char *n, ITEM_TYPE t, float w, float h, int m, const
 Inventory::Inventory(unsigned int s){
 	sel=0;
 	size=s;
-	inv = new struct item_t[size];	//(struct item_t *)calloc(size,sizeof(struct item_t));
+	inv = new struct item_t[size];
 	memset(inv,0,size*sizeof(struct item_t));
 	tossd=false;
 }
 
 Inventory::~Inventory(void){
 	delete[] inv;
-	//free(item);
 }
 
 void Inventory::setSelection(unsigned int s){
@@ -86,6 +81,7 @@ int Inventory::takeItem(ITEM_ID id,unsigned char count){
 void Inventory::draw(void){
 	ui::putText(offset.x-SCREEN_WIDTH/2,480,"%d",sel);
 	unsigned int i=0;
+	static unsigned int lop = 0;
 	float y,xoff;
 	static int numSlot = 7;
 	static std::vector<int>dfp(numSlot);
@@ -106,9 +102,9 @@ void Inventory::draw(void){
 		end = 0;
 		for(auto &d : dfp){
 			if(a != 0){
-				if(dfp[a-1]>25)d+=25;
+				if(dfp[a-1]>50)d+=1.65*deltaTime;
 			}else{
-				d += 25;
+				d += 1.65*deltaTime;
 			}
 			if(d >= range)
 				d = range;
@@ -118,15 +114,9 @@ void Inventory::draw(void){
 	}else if(!invOpening){
 		for(auto &d : dfp){
 			if(d > 0){
-				if(a != 0){
-					//d-=25;
-					if(dfp[a-1]+25<d || dfp[a-1]<=0)d-=25;
-				}else{
-					d-=25;
-				}
+				d-=1.65*deltaTime;
 			}else end++;
-			a++;
-		}a=0;
+		}
 		if(end >= numSlot)invOpen=false;
 	}
 	if(invOpen){
@@ -136,14 +126,24 @@ void Inventory::draw(void){
 			curCoord[a].y += float((dfp[a]) * sin(angle*PI/180));
 			r.end = curCoord[a];
 
-			item[inv[i].id].tex->bind(0);			
-			glColor4f(1.0f, 1.0f, 1.0f, (float)dfp[a]/(float)range);
+			glColor4f(0.0f, 0.0f, 0.0f, ((float)dfp[a]/(float)range));
  			glBegin(GL_QUADS);
-				glTexCoord2i(0,1);glVertex2i(r.end.x,		r.end.y);
-				glTexCoord2i(1,1);glVertex2i(r.end.x+45,	r.end.y);
-				glTexCoord2i(1,0);glVertex2i(r.end.x+45,	r.end.y+45);
-				glTexCoord2i(0,0);glVertex2i(r.end.x,		r.end.y+45);
+				glVertex2i(r.end.x,		r.end.y);
+				glVertex2i(r.end.x+45,	r.end.y);
+				glVertex2i(r.end.x+45,	r.end.y+45);
+				glVertex2i(r.end.x,		r.end.y+45);
 			glEnd();
+
+			if(inv[a].count > 0){
+				glBindTexture(GL_TEXTURE_2D, item[inv[a].id].text);			
+				glColor4f(1.0f, 1.0f, 1.0f, (float)dfp[a]/(float)range);
+	 			glBegin(GL_QUADS);
+					glTexCoord2i(0,1);glVertex2i(r.end.x,		r.end.y);
+					glTexCoord2i(1,1);glVertex2i(r.end.x+45,	r.end.y);
+					glTexCoord2i(1,0);glVertex2i(r.end.x+45,	r.end.y+45);
+					glTexCoord2i(0,0);glVertex2i(r.end.x,		r.end.y+45);
+				glEnd();
+			}
 			a++;
 		}
 	}
@@ -181,6 +181,7 @@ void Inventory::draw(void){
 	}*/
 	
 	if(inv[sel].count)itemDraw(player,inv[sel].id);
+	lop++;
 }
 
 static vec2 item_coord = {0,0};
diff --git a/src/ui.cpp b/src/ui.cpp
index 324192d..8d57c36 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -49,6 +49,8 @@ static char *dialogOptText[4];
 static float dialogOptLoc[4][3];
 static unsigned char dialogOptCount = 0;
 
+extern void mainLoop(void);
+
 /*
  *	Toggled by pressing 'q', disables some controls when true.
 */
@@ -366,11 +368,10 @@ namespace ui {
 		
 		return width;
 	}
-	
-	void dialogBox(const char *name,char *opt,const char *text,...){
+	void dialogBox(const char *name,const char *opt,const char *text,...){
 		va_list dialogArgs;
 		unsigned int len;
-		char *sopt;
+		char *sopt,*soptbuf;
 		
 		/*
 		 *	Set up the text buffer.
@@ -404,7 +405,9 @@ namespace ui {
 		dialogOptChosen=0;
 		dialogOptCount=0;
 		
-		sopt=strtok(opt,":");
+		soptbuf = new char[strlen(opt)+1];
+		
+		sopt=strtok(soptbuf,":");
 		while(sopt != NULL){
 			dialogOptText[dialogOptCount] = new char[strlen(sopt)+1];	//(char *)malloc(strlen(sopt));
 			strcpy(dialogOptText[dialogOptCount++],sopt);
@@ -418,6 +421,11 @@ namespace ui {
 		dialogBoxExists = true;
 		
 	}
+	void waitForDialog(void){
+		do{
+			mainLoop();
+		}while(ui::dialogBoxExists);
+	}
 	void importantText(const char *text,...){
 		va_list textArgs;
 		char *ttext,*rtext;
diff --git a/src/world.cpp b/src/world.cpp
index c977c7f..5cc3f2a 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -71,6 +71,39 @@ World::World(void){
 	memset(star,0,100*sizeof(vec2));
 }
 
+void World::deleteEntities(void){
+	while(!mob.empty()){
+		delete mob.back();
+		mob.pop_back();
+	}
+	while(!npc.empty()){
+		delete npc.back();
+		npc.pop_back();
+	}
+	while(!build.empty()){
+		delete build.back();
+		build.pop_back();
+	}
+	while(!object.empty()){
+		delete object.back();
+		object.pop_back();
+	}
+	while(!entity.empty()) entity.pop_back();
+}
+
+World::~World(void){
+	
+	if(behind){
+		delete behind;
+	}
+	
+	delete bgTex;
+	delete[] star;
+	delete[] line;
+	
+	deleteEntities();
+}
+
 void World::generate(unsigned int width){	// Generates the world and sets all variables contained in the World class.
 	unsigned int i;
 	float inc;
@@ -196,10 +229,6 @@ void World::generateFunc(unsigned int width,float(*func)(float)){
 	}
 }
 
-World::~World(void){
-	delete[] line;
-}
-
 void World::update(Player *p,unsigned int delta){
 	p->loc.y+= p->vel.y			 *delta;
 	p->loc.x+=(p->vel.x*p->speed)*delta;
@@ -654,7 +683,7 @@ void World::singleDetect(Entity *e){
 		
 		}else{
 			
-			if(e->vel.y > -2)e->vel.y-=.001 * deltaTime;
+			if(e->vel.y > -2)e->vel.y-=.003 * deltaTime;
 			
 		}
 		
@@ -836,7 +865,11 @@ IndoorWorld::IndoorWorld(void){
 }
 
 IndoorWorld::~IndoorWorld(void){
-	delete[] line;	//free(line);
+	delete bgTex;
+	delete[] star;
+	delete[] line;
+
+	deleteEntities();
 }
 
 void IndoorWorld::generate(unsigned int width){		// Generates a flat area of width 'width'
@@ -897,6 +930,14 @@ Arena::Arena(World *leave,Player *p){
 	pxy = p->loc;
 }
 
+Arena::~Arena(void){
+	delete bgTex;
+	delete[] star;
+	delete[] line;
+	
+	deleteEntities();
+}
+
 World *Arena::exitArena(Player *p){
 	npc[0]->loc.x = door.x;
 	npc[0]->loc.y = door.y;