From: Clyne Sullivan <tullivan99@gmail.com>
Date: Thu, 15 Oct 2015 13:08:13 +0000 (-0400)
Subject: quest fixes
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=42da2e6dd95c29c723ee5377241d97e29e251903;p=clyne%2Fgamedev.git

quest fixes
---

42da2e6dd95c29c723ee5377241d97e29e251903
diff --cc include/entities.h
index 1f2b249,5b6bcf1..431407b
--- a/include/entities.h
+++ b/include/entities.h
@@@ -100,5 -97,6 +100,5 @@@ ENTITY TYPE
  |->1 Merchant
  |
  2 MOBS
- |->1 Skirl
 -<<<<<<< HEAD
+ |->1 Rabbit
  **/
diff --cc src/entities.cpp
index 080da3e,f9bd015..32b74fe
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@@ -110,10 -110,9 +110,12 @@@ void Entity::draw(void){		//draws the e
  				if(texState==0)up=true;
  			}
  		}
 +		if(ground == 0){
 +			glBindTexture(GL_TEXTURE_2D, texture[1]);
 +		}
- 		else if(vel.x != 0){
+ 		if(ground == 0){
+ 			glBindTexture(GL_TEXTURE_2D, texture[1]);
+ 		}else if(vel.x != 0){
  			switch(texState){
  				case 0:
  					glBindTexture(GL_TEXTURE_2D,texture[1]);