day/night cycling

4 files changed, 33 insertions, 14 deletions

diff --git a/src/common.cpp b/src/common.cpp
index cd568ad..a8a964e 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -10,3 +10,25 @@ void DEBUG_prints(const char* file, int line, const char *s,...){
 	vprintf(s,args);
 	va_end(args);
 }
+
+void safeSetColor(int r,int g,int b){	// safeSetColor() is an alternative to directly using glColor3ub() to set
+	if(r>255)r=255;						// the color for OpenGL drawing. safeSetColor() checks for values that are
+	if(g>255)g=255;						// outside the range of an unsigned character and sets them to a safer value.
+	if(b>255)b=255;
+	if(r<0)r=0;
+	if(g<0)g=0;
+	if(b<0)b=0;
+	glColor3ub(r,g,b);
+}
+
+void safeSetColorA(int r,int g,int b,int a){
+	if(r>255)r=255;
+	if(g>255)g=255;
+	if(b>255)b=255;
+	if(a>255)a=255;
+	if(r<0)r=0;
+	if(g<0)g=0;
+	if(b<0)b=0;
+	if(a<0)a=0;
+	glColor4ub(r,g,b,a);
+}
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 3043e80..33af0a8 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -131,7 +131,6 @@ void itemDraw(Player *p,ITEM_ID id){
 			  p->loc.y+HLINE*3};
 	}
 	if(p->inv->tossd) yes=true;
-	std::cout<<item_coord.x<<" "<<item_coord.y<<std::endl;
 	glBegin(GL_QUADS);
 		glTexCoord2i(0,1);glVertex2f(item_coord.x+p1.x,item_coord.y+p2.y);
 		glTexCoord2i(1,1);glVertex2f(item_coord.x+p2.x,item_coord.y+p2.y);
@@ -141,12 +140,14 @@ void itemDraw(Player *p,ITEM_ID id){
 	glDisable(GL_TEXTURE_2D);
 }
 
-void itemUse(Player *p,ITEM_ID id){
+int Inventory::useItem(void){
+	ITEM_ID id = item[sel].id;
 	switch(id){
 	default:
 		ui::dialogBox(itemName[id],"You cannot use this item.");
 		break;
 	}
+	return 0;
 }
 
 int Inventory::itemToss(void){
diff --git a/src/ui.cpp b/src/ui.cpp
index 05b540e..fa8cf9c 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -265,6 +265,9 @@ namespace ui {
 				if(SDL_KEY==SDLK_q){
 					player->inv->itemToss();
 				}
+				if(SDL_KEY==SDLK_e){
+					player->inv->useItem();
+				}
 				if(SDL_KEY==SDLK_c){
 					dialogBox("","You pressed `c`, but nothing happened.");
 				}
diff --git a/src/world.cpp b/src/world.cpp
index 5ff1f0f..dccca21 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -18,16 +18,6 @@
 extern std::vector<Entity 	  *> entity;
 extern std::vector<Structures *> build;
 
-void safeSetColor(int r,int g,int b){	// safeSetColor() is an alternative to directly using glColor3ub() to set
-	if(r>255)r=255;						// the color for OpenGL drawing. safeSetColor() checks for values that are
-	if(g>255)g=255;						// outside the range of an unsigned character and sets them to a safer value.
-	if(b>255)b=255;
-	if(r<0)r=0;
-	if(g<0)g=0;
-	if(b<0)b=0;
-	glColor3ub(r,g,b);
-}
-
 float worldGetYBase(World *w){
 	float base = 0;
 	World *ptr = w;
@@ -150,9 +140,11 @@ World::~World(void){
 	free(line);
 }
 
+int worldShade = 0;
+
 void World::draw(Player *p){
 	static float yoff=DRAW_Y_OFFSET;	// Initialize stuff
-	static int shade=0;
+	static int shade;
 	static World *current;
 	int i,is,ie,v_offset,cx_start;
 	struct line_t *cline;
@@ -168,6 +160,7 @@ void World::draw(Player *p){
 	*/
 	
 	current=this;
+	shade=worldShade;
 	
 LOOP1:
 
@@ -281,7 +274,7 @@ LOOP2:
 		 *	by setting line.gs to false.
 		*/
 		
-		if(p->ground){
+		if(p->ground==1){
 			for(i=0;i<lineCount-GEN_INC;i++){
 				if(i < ph + 6 && 
 				   i > ph - 6 )