diff options
Diffstat (limited to 'src')
| -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`. |