aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--assets/house1.pngbin1483 -> 788 bytes
-rw-r--r--out/entities.obin93560 -> 93600 bytes
-rw-r--r--out/inventory.obin3156 -> 3156 bytes
-rw-r--r--out/ui.obin9844 -> 9844 bytes
-rw-r--r--out/world.obin37540 -> 38716 bytes
-rw-r--r--src/entities.cpp9
6 files changed, 7 insertions, 2 deletions
diff --git a/assets/house1.png b/assets/house1.png
index 2f5034b..2022992 100644
--- a/assets/house1.png
+++ b/assets/house1.png
Binary files differ
diff --git a/out/entities.o b/out/entities.o
index db0a4aa..69472f4 100644
--- a/out/entities.o
+++ b/out/entities.o
Binary files differ
diff --git a/out/inventory.o b/out/inventory.o
index 559aff1..d88bf53 100644
--- a/out/inventory.o
+++ b/out/inventory.o
Binary files differ
diff --git a/out/ui.o b/out/ui.o
index 73dddad..e4cd1fd 100644
--- a/out/ui.o
+++ b/out/ui.o
Binary files differ
diff --git a/out/world.o b/out/world.o
index 6f79983..4997e5b 100644
--- a/out/world.o
+++ b/out/world.o
Binary files differ
diff --git a/src/entities.cpp b/src/entities.cpp
index 13c042b..127adae 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -53,7 +53,10 @@ void Entity::draw(void){ //draws the entities
texState-=1;
if(texState==0)up=true;
}
- }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]);
@@ -65,7 +68,9 @@ void Entity::draw(void){ //draws the entities
glBindTexture(GL_TEXTURE_2D,texture[2]);
break;
}
- }else glBindTexture(GL_TEXTURE_2D,texture[0]);
+ }else{
+ glBindTexture(GL_TEXTURE_2D,texture[0]);
+ }
}else{
glBindTexture(GL_TEXTURE_2D,texture[0]);
}