diff options
| -rw-r--r-- | src/entities.cpp | 2 | ||||
| -rw-r--r-- | src/inventory.cpp | 3 | ||||
| -rw-r--r-- | src/ui.cpp | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index f812919..c840b6e 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -205,7 +205,7 @@ void Entity::draw(void){ //draws the entities if(type == PLAYERT){ static int texState = 0; static bool up = true; - if(loops % (int)((float)2 / (float)speed) == 0){ + if(loops % (int)((float)4/(float)speed) == 0){ if(up){ texState+=1; if(texState==2)up=false; diff --git a/src/inventory.cpp b/src/inventory.cpp index 7d3bc6d..f789334 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -171,7 +171,8 @@ void Inventory::draw(void){ glTexCoord2i(1,1);glVertex2i(r.end.x+(itemWide/2), r.end.y-(itemWide/2)*((float)item[inv[a].id].height/(float)item[inv[a].id].width)); glTexCoord2i(1,0);glVertex2i(r.end.x+(itemWide/2), r.end.y+(itemWide/2)*((float)item[inv[a].id].height/(float)item[inv[a].id].width)); glTexCoord2i(0,0);glVertex2i(r.end.x-(itemWide/2), r.end.y+(itemWide/2)*((float)item[inv[a].id].height/(float)item[inv[a].id].width)); - } glEnd(); + } + glEnd(); glDisable(GL_TEXTURE_2D); ui::putText(r.end.x-(itemWide/2),r.end.y-(itemWide*.9),"%s",item[inv[a].id].name); ui::putText(r.end.x-(itemWide/2)+(itemWide*.85),r.end.y-(itemWide/2),"%d",inv[a].count); @@ -631,7 +631,7 @@ DONE: } break; case SDLK_LSHIFT: - player->speed = debug ? 4 : 3; + player->speed = debug ? 4.0f : 3.0f; break; case SDLK_LCTRL: player->speed = .5; @@ -672,6 +672,8 @@ DONE: player->right = false; break; case SDLK_LSHIFT: + player->speed = 1; + break; case SDLK_LCTRL: player->speed = 1; break; |