diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2015-12-02 07:38:27 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-12-02 07:38:27 -0500 |
| commit | e03619c9dd92cf044cc06090af4061bbebd2cb76 (patch) | |
| tree | bbe736e20fcfbe09b603c0b2529c92fdb103d5e4 /src/gameplay.cpp | |
| parent | cedc826b4a71f7d00d55b7b1234c1019d3f6e96a (diff) | |
fixed item dialog
Diffstat (limited to 'src/gameplay.cpp')
| -rw-r--r-- | src/gameplay.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gameplay.cpp b/src/gameplay.cpp index a4fec88..cc9ae6a 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`. |