summaryrefslogtreecommitdiff
path: root/src/list.cpp
diff options
context:
space:
mode:
authortom <tom@ground-control>2016-05-02 15:39:22 -0500
committertom <tom@ground-control>2016-05-02 15:39:22 -0500
commit3a2f69b3f1082b2fbdf39bd2a4f7ad0020971eac (patch)
treec5961dcb6e1ccbdf5a478d97f7383028492140d4 /src/list.cpp
parent1ddb996ac4a4fc78e5484acdadac2df95006b632 (diff)
spring cleaning, added framerate cap & started iterator replacement
Diffstat (limited to 'src/list.cpp')
-rw-r--r--src/list.cpp21
1 files changed, 6 insertions, 15 deletions
diff --git a/src/list.cpp b/src/list.cpp
index 379a113..464ac48 100644
--- a/src/list.cpp
+++ b/src/list.cpp
@@ -4,7 +4,7 @@ List::List(Window m) //Constructor
{
int i;
- for(i=0;i<3;i++)
+ for(i=0;i<10;i++)
{
Creature X(m,"img/Cbasic.png");
C.push_back(X);
@@ -25,22 +25,13 @@ void List::Place()
for(vector<Creature>::iterator it = C.begin(); it!=C.end(); it++)
it->Place();
- /*
- if(R.size()<15)
- {
- Resource Y(m,"img/Rbasic.png");
- R.push_back(Y);
- }
- */
- //places all resources
- for(int j = 0; j<R.size(); j++)
- {
- if(R[j].getAmount()<=0)
- R.erase(R.begin()+j);
+ for(vector<Resource>::iterator it = R.begin(); it!=R.end(); it++){
+ if(it->getAmount()<=0)
+ R.erase(it--);
else
- R[j].Place();
- }
+ it->Place();
+ }
}
void List::Behavior()