diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-02 07:30:08 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-02 07:30:08 -0500 |
| commit | 49b4150f082efd310d7fc5087802713798abaad4 (patch) | |
| tree | ce7eb447c94be8fb4445143f10a817c0f289cc05 | |
| parent | cedc826b4a71f7d00d55b7b1234c1019d3f6e96a (diff) | |
Fixed conflict :|
| -rw-r--r-- | src/gameplay.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gameplay.cpp b/src/gameplay.cpp index a4fec88..a3f71ff 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -76,11 +76,8 @@ void initEverything(void){ playerSpawnHill=new World(); playerSpawnHill->setBackground(BG_FOREST); -<<<<<<< Updated upstream playerSpawnHill->generateFunc(1280,playerSpawnHillFunc); - //playerSpawnHill->generate(1920); -======= ->>>>>>> Stashed changes + /* * Setup the current world, making the player initially spawn in `test`. |