quest fixes

diff --cc include/entities.h
index 1f2b2498cb4c2fbbed95b02fefd6ec939aedf8d7,5b6bcf197c3c704a9402b52738da16da25e69ab5..431407b98801d91028aea8d15e4ab72f6e40648b
--- 1/include/entities.h
--- 2/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 main.cpp
Simple merge

diff --cc src/entities.cpp
index 080da3eecb22a33f1614dd62404e8d9dc174aef7,f9bd015ac0cc9e254e72d45ffa627714e282ba55..32b74fe7c11f4a738d599c54ed1ce52b111adeea
--- 1/src/entities.cpp
--- 2/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;
                        }
                }
-               else if(vel.x != 0){
 +              if(ground == 0){
 +                      glBindTexture(GL_TEXTURE_2D, texture[1]);
 +              }
+               if(ground == 0){
+                       glBindTexture(GL_TEXTURE_2D, texture[1]);
+               }else if(vel.x != 0){
                        switch(texState){
                                case 0:
                                        glBindTexture(GL_TEXTURE_2D,texture[1]);

diff --cc src/ui.cpp
Simple merge