From 49b4150f082efd310d7fc5087802713798abaad4 Mon Sep 17 00:00:00 2001 From: drumsetmonkey Date: Wed, 2 Dec 2015 07:30:08 -0500 Subject: Fixed conflict :| --- src/gameplay.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src') 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`. -- cgit v1.2.3