improved inventory, debug flags

5 files changed, 98 insertions, 34 deletions

diff --git a/src/common.cpp b/src/common.cpp
index 1152be7..7a51b4e 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1,26 +1,36 @@
 #include <common.h>
 
 GLuint loadTexture(const char *fileName){
-  SDL_Surface *image = IMG_Load(fileName);
- 
-  //SDL_DisplayFormatAlpha(image);
-
-  unsigned object(0);
- 
-  glGenTextures(1, &object);
- 
-  glBindTexture(GL_TEXTURE_2D, object);
- 
-  glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-  glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- 
-  glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-  glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-   
-  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image->w, image->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
- 
-  //Free surface
-  SDL_FreeSurface(image);
- 
-  return object;
+	SDL_Surface *image = IMG_Load(fileName);
+
+	if(!image)return 0;
+
+	//SDL_DisplayFormatAlpha(image);
+
+	unsigned object(0);
+
+	glGenTextures(1, &object);
+
+	glBindTexture(GL_TEXTURE_2D, object);
+
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image->w, image->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
+
+	//Free surface
+	SDL_FreeSurface(image);
+
+	return object;
+}
+
+void DEBUG_printf(const char *s,...){
+	va_list args;
+	printf("%s:%u: ",__FILE__,__LINE__);
+	va_start(args,s);
+	vprintf(s,args);
+	va_end(args);
 }
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index b6b939a..a690203 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -31,6 +31,12 @@ int giveTestQuest(NPC *speaker){
 	return 0;
 }
 
+int giveStuff(NPC *speaker){
+	ui::dialogBox(speaker->name,"Take my stuff you ugly whore");
+	player->inv->addItem(SWORD_ITEM,1);
+	return 0;
+}
+
 void initEverything(void){
 	unsigned int i;
 	
@@ -59,5 +65,6 @@ void initEverything(void){
 	NPCp(entity[1])->addAIFunc(giveTestQuest);
 	for(i=0;i<entity.size()+1;i++){
 		entity[i]->inWorld=test;
+		if(entity[i]->type==NPCT&&i>1)NPCp(entity[i])->addAIFunc(giveStuff);
 	}
 }
diff --git a/src/inventory.cpp b/src/inventory.cpp
index b8905dd..3882fb0 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -1,11 +1,34 @@
 #include <inventory.h>
 #include <ui.h>
 
+#define ITEM_COUNT 2	// Total number of items that actually exist
+
 const char *itemName[]={
 	"\0",
-	"Dank Maymay"
+	"Dank Maymay",
+	"Sword"
+};
+
+const char *ITEM_SPRITE[]={
+	"\0",							// Null
+	"assets/items/ITEM_TEST.png",	// Dank maymay
+	"assets/items/ITEM_SWORD.png"
 };
 
+GLuint *ITEM_TEX;
+
+unsigned int initInventorySprites(void){
+	unsigned int i,loadCount=0;
+	ITEM_TEX=(GLuint *)calloc(ITEM_COUNT,sizeof(GLuint));
+	for(i=0;i<ITEM_COUNT;i++){
+		if((ITEM_TEX[i]=loadTexture(ITEM_SPRITE[i+1])))loadCount++;
+	}
+#ifdef DEBUG
+	DEBUG_printf("Loaded %u/%u item texture(s).\n",loadCount,ITEM_COUNT);
+#endif // DEBUG
+	return loadCount;
+}
+
 Inventory::Inventory(unsigned int s){
 	size=s;
 	item=(struct item_t *)calloc(size,sizeof(struct item_t));
@@ -48,11 +71,22 @@ extern Player *player;
 
 void Inventory::draw(void){
 	unsigned int i=0;
-	float y=SCREEN_HEIGHT/2;
+	float y=SCREEN_HEIGHT/2,xoff;
 	ui::putText(player->loc.x-SCREEN_WIDTH/2,y,"Inventory:");
 	while(item[i].count){
+		y-=HLINE*12;
+		xoff=ui::putText(player->loc.x-SCREEN_WIDTH/2,y,"%d x ",item[i].count);
+		glEnable(GL_TEXTURE_2D);
+		glBindTexture(GL_TEXTURE_2D,ITEM_TEX[item[i].id-1]);
+		glBegin(GL_QUADS);
+			glTexCoord2i(0,1);glVertex2i(xoff		  ,y);
+			glTexCoord2i(1,1);glVertex2i(xoff+HLINE*10,y);
+			glTexCoord2i(1,0);glVertex2i(xoff+HLINE*10,y+HLINE*10);
+			glTexCoord2i(0,0);glVertex2i(xoff		  ,y+HLINE*10);
+		glEnd();
 		y-=ui::fontSize*1.15;
-		ui::putText(player->loc.x-SCREEN_WIDTH/2,y,"%d x %s",item[i].count,itemName[(unsigned)item[i].id]);
+		ui::putText(player->loc.x-SCREEN_WIDTH/2,y,"%s",itemName[(unsigned)item[i].id]);
+		glDisable(GL_TEXTURE_2D);
 		i++;
 	}
 }
diff --git a/src/ui.cpp b/src/ui.cpp
index e4af3e2..68601d8 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -28,12 +28,18 @@ namespace ui {
 			abort();
 		}
 		fontSize=12; // to be safe
+#ifdef DEBUG
+		DEBUG_printf("Initialized FreeType2.\n");
+#endif // DEBUG
 	}
 	void setFontFace(const char *ttf){
 		if(FT_New_Face(ftl,ttf,0,&ftf)){
 			std::cout<<"Error! Couldn't open "<<ttf<<"."<<std::endl;
 			abort();
-		}	
+		}
+#ifdef DEBUG
+		DEBUG_printf("Using font %s\n",ttf);
+#endif // DEBUG
 	}
 	void setFontSize(unsigned int size){
 		fontSize=size;
@@ -110,7 +116,7 @@ namespace ui {
 		glDeleteTextures(1,&ftex);
 		return w;
 	}
-	void putString(const float x,const float y,const char *s){
+	float putString(const float x,const float y,const char *s){
 		unsigned int i=0,j;
 		float xo=x,yo=y;
 		do{
@@ -123,16 +129,19 @@ namespace ui {
 				xo+=putChar(xo,yo,s[i])+fontSize*.1;
 			}
 		}while(s[i++]);
+		return xo;
 	}
-	void putText(const float x,const float y,const char *str,...){	// putText() simply runs 'str' and the extra arguments though
+	float putText(const float x,const float y,const char *str,...){	// putText() simply runs 'str' and the extra arguments though
 		va_list args;												// vsnprintf(), which'll store the complete string to a buffer
 		char *buf;													// that's then passed to putString()
+		float width;
 		buf=(char *)calloc(128,sizeof(char));
 		va_start(args,str);
 		vsnprintf(buf,128,str,args);
 		va_end(args);
-		putString(x,y,buf);
+		width=putString(x,y,buf);
 		free(buf);
+		return width;
 	}
 	void dialogBox(const char *name,const char *text,...){
 		unsigned int name_len;
diff --git a/src/world.cpp b/src/world.cpp
index 18a0725..72287be 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -158,7 +158,15 @@ void World::singleDetect(Entity *e){
 	unsigned int i;
 	if(e->alive){
 		i=(e->loc.x+e->width/2-x_start)/HLINE;	// Calculate what line the player is currently on
-		if(e->loc.y>line[i].y-.002*deltaTime){	// Snap the player to the top of that line if the player is inside it
+		if(e->type==STRUCTURET||e->loc.y<line[i].y){
+			e->vel.y=0;
+			e->ground=true;
+			e->loc.y=line[i].y-.001*deltaTime;	
+			if(e->type==STRUCTURET){
+				std::cout<<e->loc.x<<" "<<e->loc.y<<std::endl;
+				return;
+			}
+		}else if(e->loc.y>line[i].y-.002*deltaTime){	// Snap the player to the top of that line if the player is inside it
 			for(i=0;i<platform.size();i++){
 				if(((e->loc.x+e->width>platform[i].p1.x)&(e->loc.x+e->width<platform[i].p2.x))||
 				   ((e->loc.x<platform[i].p2.x)&(e->loc.x>platform[i].p1.x))){
@@ -173,10 +181,6 @@ void World::singleDetect(Entity *e){
 				}
 			}
 			e->vel.y-=.001*deltaTime;
-		}else if(e->loc.y<line[i].y){
-			e->vel.y=0;
-			e->ground=true;
-			e->loc.y=line[i].y-.001*deltaTime;	
 		}
 		if(e->loc.x<x_start){				// Keep the player inside world bounds (ui.cpp handles world jumping)
 			e->vel.x=0;