From 01a31f374b953b9d40548f8369289a8c6dc48b77 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Thu, 8 Oct 2015 09:29:22 -0400
Subject: fixed mouse

---
 src/inventory.cpp | 18 +++++++++++++++++-
 src/world.cpp     |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/inventory.cpp b/src/inventory.cpp
index 3882fb0..83c40f6 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -30,6 +30,7 @@ unsigned int initInventorySprites(void){
 }
 
 Inventory::Inventory(unsigned int s){
+	sel=0;
 	size=s;
 	item=(struct item_t *)calloc(size,sizeof(struct item_t));
 }
@@ -37,19 +38,32 @@ Inventory::Inventory(unsigned int s){
 Inventory::~Inventory(void){
 	free(item);
 }
-	
+
+void Inventory::setSelection(unsigned int s){
+	sel=s;
+}
+
 int Inventory::addItem(ITEM_ID id,unsigned char count){
 	unsigned int i;
 	for(i=0;i<size;i++){
 		if(item[i].id==id){
 			item[i].count+=count;
+#ifdef DEBUG
+			DEBUG_printf("Gave player %u more %s(s).\n",count,itemName[i]);
+#endif // DEBUG
 			return 0;
 		}else if(!item[i].count){
 			item[i].id=id;
 			item[i].count=count;
+#ifdef DEBUG
+			DEBUG_printf("Gave player %u %s(s).\n",count,itemName[i]);
+#endif // DEBUG
 			return 0;
 		}
 	}
+#ifdef DEBUG
+	DEBUG_printf("Failed to add non-existant item with id %u.\n",id);
+#endif // DEBUG
 	return -1;
 }
 
@@ -78,6 +92,8 @@ void Inventory::draw(void){
 		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]);
+		if(sel==i)glColor3ub(255,0,255);
+		else      glColor3ub(255,255,255);
 		glBegin(GL_QUADS);
 			glTexCoord2i(0,1);glVertex2i(xoff		  ,y);
 			glTexCoord2i(1,1);glVertex2i(xoff+HLINE*10,y);
diff --git a/src/world.cpp b/src/world.cpp
index 72287be..1498016 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -163,7 +163,7 @@ void World::singleDetect(Entity *e){
 			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;
+				//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
-- 
cgit v1.2.3