diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-02 07:28:21 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-02 07:28:21 -0500 |
| commit | cedc826b4a71f7d00d55b7b1234c1019d3f6e96a (patch) | |
| tree | aea0e252837d6aa65ee5b3e7e753db13b85e7ff8 /src/gameplay.cpp | |
| parent | 67ebafca971ecd4dcfde92bc64a838ba64c16e99 (diff) | |
Fixed item textures
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`. |