diff options
| author | tom <tom@ground-control> | 2015-05-08 08:09:32 -0500 |
|---|---|---|
| committer | tom <tom@ground-control> | 2015-05-08 08:09:32 -0500 |
| commit | 04069434be15c06666a7493b1b6329a78c00d1d1 (patch) | |
| tree | a5b435af8aac1ab8f00eebd6ed14591c14578137 | |
| parent | dddcaa7e5fa044972e25e456315c5cba361fc0f5 (diff) | |
merging
| -rw-r--r-- | src/list.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/list.cpp b/src/list.cpp index c21dd52..b86f077 100644 --- a/src/list.cpp +++ b/src/list.cpp @@ -3,12 +3,8 @@ List::List(Window m) //Constructor { int i; -<<<<<<< HEAD + for(i=0;i<10;i++) -======= - //Creates 5 creatures, inserts them into vector C - for(i=0;i<5;i++) ->>>>>>> c63d77ddddb69ef0f641d90a8c3922fdc356224c { Creature X(m,"img/Cbasic.png"); C.push_back(X); |