diff options
| -rw-r--r-- | src/list.cpp | 4 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/list.cpp b/src/list.cpp index 0101d8c..c21dd52 100644 --- a/src/list.cpp +++ b/src/list.cpp @@ -3,8 +3,12 @@ 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); diff --git a/src/main.cpp b/src/main.cpp index 1e8424a..4290386 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,7 +22,7 @@ int main() L.Behavior();
main.Render();
- SDL_Delay(15);
+ SDL_Delay(10);
}
main.Destroy();
|