diff options
author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-04-13 07:41:31 -0400 |
---|---|---|
committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-04-13 07:41:31 -0400 |
commit | 51f57a9eb06cd0a4a967915ee60a323fc85fafba (patch) | |
tree | 3ac6459043382584ad4b35c78be4cb0717c8ddda /src/inventory.cpp | |
parent | a3f1f1bff9b58d90a2b60405ca40728cdd836fa6 (diff) | |
parent | 03130c5bcec3c885a1be005c24e192dfb57f3fe5 (diff) |
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'src/inventory.cpp')
-rw-r--r-- | src/inventory.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index 521b695..64254e9 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -257,7 +257,7 @@ void Inventory::draw(void){ a++; } a = 0; - for ( unsigned int i = 0; i < massOrder.size() ; i++, a++ ) { + while ( ++a < massOrder.size() ) { if ( !a || massDfp[ massOrder[a - 1] ] > massRange * 0.75f ) massDfp[ massOrder[a] ] += 5.0f * deltaTime; if ( massDfp[ massOrder[a] ] > massRange ) @@ -276,7 +276,8 @@ void Inventory::draw(void){ cd -= 1.0f * deltaTime; } - for ( unsigned int i = 0; i < massRay.size(); i++, a++ ) { + a = 0; + while ( ++a < massRay.size() ) { if ( !a || massDfp[ massOrderClosing[a - 1] ] <= 0 ) massDfp[ massOrderClosing[a] ] -= 10.0f * deltaTime; if ( massDfp[ massOrderClosing[a - 1] ] < 0 ) |