Fixed addItem

4 files changed, 60 insertions, 56 deletions

diff --git a/src/entities.cpp b/src/entities.cpp
index c840b6e..3488d62 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -36,7 +36,7 @@ void getRandomName(Entity *e){
 	}
 	
 	if((fgets(bufs,16,(FILE*)names)) != NULL){
-		bufs[strlen(bufs)-1] = '\0';
+		bufs[strlen(bufs)] = '\0';
 		strcpy(e->name,bufs);
 	}
 	
@@ -183,17 +183,17 @@ Object::~Object(){
 
 void Entity::draw(void){		//draws the entities
 	glPushMatrix();
+	glColor3ub(255,255,255);
 	if(type==NPCT){
 		if(NPCp(this)->aiFunc.size()){
 			glColor3ub(255,255,0);
 			glRectf(loc.x+width/3,loc.y+height,loc.x+width*2/3,loc.y+height+width/3);
-		}if(gender == MALE){
+		}
+		if(gender == MALE){
 			glColor3ub(255,255,255);
 		}else if(gender == FEMALE){
 			glColor3ub(255,105,180);
 		}
-	}else{
-		glColor3ub(255,255,255);
 	}
 	if(left){
 		glScalef(-1.0f,1.0f,1.0f);
@@ -202,58 +202,44 @@ void Entity::draw(void){		//draws the entities
 	glMatrixMode(GL_TEXTURE);
 	glLoadIdentity();
 	glEnable(GL_TEXTURE_2D);
-	if(type == PLAYERT){
+	switch(type){
+	case PLAYERT:
 		static int texState = 0;
 		static bool up = true;
 		if(loops % (int)((float)4/(float)speed) == 0){
 			if(up){
-				texState+=1;
-				if(texState==2)up=false;
+				if(++texState==2)up=false;
 				tex->bindNext();
-			}else if(!up){
-				texState-=1;
-				if(texState==0)up=true;
+			}else{
+				if(!--texState)up=true;
 				tex->bindPrev();
 			}
 		}
-		if(ground == 0){
+		if(!ground){
 			tex->bind(0);
-		}else if(vel.x != 0){
-			switch(texState){
-				case 0:
-					tex->bind(0);
-				break;
-				case 1:
-					tex->bind(1);
-				break;
-				case 2:
-					tex->bind(2);
-				break;
-			}
+		}else if(vel.x){
+			tex->bind(texState);
 		}else{
 			tex->bind(1);
 		}
-	}else if(type == MOBT){
+		break;
+	case MOBT:
 		switch(subtype){
 			case MS_RABBIT:
-				if(ground == 0){
-					tex->bind(1);
-				}else if(ground == 1){
-					tex->bind(0);
-				}
-				break;
-			case MS_BIRD:
-				tex->bind(0);
+				tex->bind(!ground);
 				break;
 			case MS_TRIGGER:
 				goto NOPE;
 				break;
+			case MS_BIRD:
 			default:
 				tex->bind(0);
 				break;
 		}
-	}else{
+		break;
+	default:
 		tex->bind(0);
+		break;
 	}
 	glColor3ub(255,255,255);
 	glBegin(GL_QUADS);
@@ -266,9 +252,7 @@ NOPE:
 	glDisable(GL_TEXTURE_2D);
 	glMatrixMode(GL_MODELVIEW);
 	glPopMatrix();
-	if(near){
-		ui::putStringCentered(loc.x+width/2,loc.y-ui::fontSize-HLINE/2,name);
-	}
+	if(near)ui::putStringCentered(loc.x+width/2,loc.y-ui::fontSize-HLINE/2,name);
 }
 
 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 eb5ce79..8809c49 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -51,7 +51,7 @@ void CUTSCENEEE(Mob *callee){
 void CUTSCENEEE2(Mob *callee){
 	player->vel.x = 0;
 	ui::dialogBox(player->name,":Yeah.",
-	"What the fuck is this dead end supposed to mean, and why does this place smell like soap?");
+	"What the fuck is this dead end supposed to mean, and why this place smell like soap.");
 	ui::waitForDialog();
 	callee->alive = false;
 }
@@ -125,10 +125,10 @@ void initEverything(void){
 	playerSpawnHill->addStructure(STRUCTURET,(rand()%120*HLINE),100,test,iw);
 	playerSpawnHill->addMob(MS_TRIGGER,-1300,0,CUTSCENEEE);
 	
-	playerSpawnHill->addObject(SWORD_WOOD, false, "", 480,200);
-	playerSpawnHill->addObject(FLASHLIGHT, false, "", 500,200);
-	playerSpawnHill->addObject(PLAYER_BAG, false, "", 520,200);
-	playerSpawnHill->addObject(TEST_ITEM, false, "", 540,200);
+	playerSpawnHill->addObject(SWORD_WOOD, false, "", 480,300);
+	playerSpawnHill->addObject(FLASHLIGHT, false, "", 500,300);
+	playerSpawnHill->addObject(PLAYER_BAG, false, "", 520,300);
+	playerSpawnHill->addObject(TEST_ITEM,  false, "", 540,300);
 	//playerSpawnHill->addObject(FLASHLIGHT, true, "This looks important, do you want to pick it up?",600,200);
 	
 	test->addMob(MS_RABBIT,200,100);
diff --git a/src/inventory.cpp b/src/inventory.cpp
index f789334..8bf8d42 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -12,8 +12,7 @@ static const Item item[ITEM_COUNT]= {
 };
 
 static GLuint itemtex[ITEM_COUNT];
-
-void itemDraw(Player *p,ITEM_ID id);
+void itemDraw(Player *p,ITEM_ID id, ITEM_TYPE type);
 
 void initInventorySprites(void){
 	unsigned int i;
@@ -69,16 +68,14 @@ int Inventory::addItem(ITEM_ID id,unsigned char count){
 	//std::cout << id << "," << inv[os].id << std::endl;
 	
 	for(unsigned int i = 0; i < size; i++){
-		if(id == inv[i].id){
+		if(inv[i].id == id){
 			inv[i].count += count;
-			break;
-		}else{
-			inv[os].id = id;
-			inv[os].count = count;
-			os++;
-			break;
+			return 0;
 		}
 	}
+	inv[os].id = id;
+	inv[os].count += count;
+	os++;
 
 #ifdef DEBUG
 	DEBUG_printf("Gave player %u more %s(s)(ID: %d).\n",count,item[id].name,item[id].id);
@@ -148,7 +145,7 @@ void Inventory::draw(void){
 			curCoord[a].y += float((dfp[a]) * sin(angle*PI/180));
 			r.end = curCoord[a];
 
-			glColor4f(1.0f, 1.0f, 1.0f, ((float)dfp[a]/(float)range)*0.4f);
+			glColor4f(0.0f, 0.0f, 0.0f, ((float)dfp[a]/(float)range)*0.5f);
  			glBegin(GL_QUADS);
 				glVertex2i(r.end.x-(itemWide/2),			r.end.y-(itemWide/2));
 				glVertex2i(r.end.x-(itemWide/2)+itemWide,	r.end.y-(itemWide/2));
@@ -258,12 +255,24 @@ void Inventory::draw(void){
 		}
 		if(inv[highlight].count > 0)ui::putStringCentered(player->loc.x+player->width/2, player->loc.y + range*.75,item[inv[highlight].id].name);
 	}
-	if(inv[sel].count)itemDraw(player,inv[sel].id);
+	if(inv[sel].count)itemDraw(player,inv[sel].id,item[inv[sel].id].type);
 	lop++;
 }
 
-void itemDraw(Player *p,ITEM_ID id){
+void itemDraw(Player *p,ITEM_ID id,ITEM_TYPE type){
+	static float angle = 0.0f;
+	glPushMatrix();
 	if(!id)return;
+	switch(type){
+	case SWORD:
+		angle = 15.0f;
+		break;
+	default:
+		angle = 0.0f;
+	}
+	//glTranslatef(player->loc.x*2,player->loc.y*2,0);
+	glTranslatef(0-player->loc.x*2,0,0);
+	glRotatef(angle, 0.0f, 1.0f, 0.0f);
 	glEnable(GL_TEXTURE_2D);
 	glBindTexture(GL_TEXTURE_2D,itemtex[id]);
 	glColor4ub(255,255,255,255);
@@ -274,11 +283,20 @@ void itemDraw(Player *p,ITEM_ID id){
 		glTexCoord2i(0,0);glVertex2f(p->loc.x,				 p->loc.y+item[id].height);
 	glEnd();
 	glDisable(GL_TEXTURE_2D);
+	glTranslatef(player->loc.x*2,0,0);
+	glPopMatrix();
 }
 
 int Inventory::useItem(void){
-	ITEM_ID id = item[inv[sel].id].id;
+	ITEM_ID id = 	 item[inv[sel].id].id;
+	ITEM_TYPE type = item[inv[sel].id].type;
 	if(!invHover){
+		switch(type){
+		case SWORD:
+
+			break;
+		default:break;
+		}
 		switch(id){
 		case FLASHLIGHT:
 			player->light ^= true;
diff --git a/src/world.cpp b/src/world.cpp
index 1b90a4b..1e37a78 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -666,11 +666,11 @@ void World::singleDetect(Entity *e){
 	*/
 	
 	if(!e->alive||e->health<=0){
-		
 		for(i=0;i<entity.size();i++){
 			if(entity[i]==e){
 				switch(e->type){
 				case STRUCTURET:
+					std::cout<<"Killed a building..."<<std::endl;
 					for(j=0;j<build.size();j++){
 						if(build[j]==e){
 							delete build[j];
@@ -680,6 +680,7 @@ void World::singleDetect(Entity *e){
 					}
 					break;
 				case NPCT:
+					std::cout<<"Killed an NPC..."<<std::endl;
 					for(j=0;j<npc.size();j++){
 						if(npc[j]==e){
 							delete npc[j];
@@ -689,6 +690,7 @@ void World::singleDetect(Entity *e){
 					}
 					break;
 				case MOBT:
+					std::cout<<"Killed a mob..."<<std::endl;
 					for(j=0;j<mob.size();j++){
 						if(mob[j]==e){
 							delete mob[j];
@@ -698,6 +700,7 @@ void World::singleDetect(Entity *e){
 					}
 					break;
 				case OBJECTT:
+					std::cout<<"Killed an object..."<<std::endl;
 					for(j=0;j<object.size();j++){
 						if(object[j]==e){
 							delete object[j];
@@ -711,7 +714,6 @@ void World::singleDetect(Entity *e){
 					exit(0);
 					break;
 				}
-				std::cout<<"Killed an entity..."<<std::endl;
 				entity.erase(entity.begin()+i);
 				return;
 			}