diff options
Diffstat (limited to 'src/gameplay.cpp')
| -rw-r--r-- | src/gameplay.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gameplay.cpp b/src/gameplay.cpp index cc9ae6a..a4fec88 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -76,8 +76,11 @@ 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`. |