diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Texture.cpp | 2 | ||||
| -rw-r--r-- | src/inventory.cpp | 12 | ||||
| -rw-r--r-- | src/world.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/Texture.cpp b/src/Texture.cpp index d723eda..de1af14 100644 --- a/src/Texture.cpp +++ b/src/Texture.cpp @@ -75,7 +75,7 @@ Texturec::Texturec(uint amt, ...){ void Texturec::bind(unsigned int bn){ texState = bn; - glBindTexture(GL_TEXTURE_2D, image[texState]); + glBindTexture(GL_TEXTURE_2D, (unsigned int)image[(int)texState]); } void Texturec::bindNext(){ diff --git a/src/inventory.cpp b/src/inventory.cpp index ff180b0..28612ae 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -98,23 +98,23 @@ void Inventory::draw(void){ //dfp[a] = 0; a++; }a=0; - if(invOpening && lop % 1 == 0){ + if(invOpening){ end = 0; for(auto &d : dfp){ if(a != 0){ - if(dfp[a-1]>25)d+=25; + if(dfp[a-1]>50)d+=1.65*deltaTime; }else{ - d += 25; + d += 1.65*deltaTime; } if(d >= range) d = range; a++; }a=0; if(end < numSlot)invOpen=true; - }else if(!invOpening && lop % 1 == 0){ - for(auto &d : boost::adaptors::reverse(dfp)){ + }else if(!invOpening){ + for(auto &d : dfp){ if(d > 0){ - d-=25; + d-=1.65*deltaTime; }else end++; } if(end >= numSlot)invOpen=false; diff --git a/src/world.cpp b/src/world.cpp index 36f0f69..281cbad 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -662,7 +662,7 @@ void World::singleDetect(Entity *e){ }else{ - if(e->vel.y > -2)e->vel.y-=.001 * deltaTime; + if(e->vel.y > -2)e->vel.y-=.003 * deltaTime; } |