diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2015-10-29 08:13:09 -0400 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-10-29 08:13:09 -0400 |
commit | 9542d9a8a022fe1d3390510e8a135a4917df7aa7 (patch) | |
tree | 19386c919e375a8185939fcda73b841901d20602 /src | |
parent | 2ae6503dd2aa1be80ed2b679cdcce1286fa85d60 (diff) |
fixed world
Diffstat (limited to 'src')
-rw-r--r-- | src/ui.cpp | 6 | ||||
-rw-r--r-- | src/world.cpp | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -237,7 +237,11 @@ namespace ui { player->ground=false; } } - if(SDL_KEY==SDLK_i)currentWorld=currentWorld->goWorldBack(player); // Go back a layer if possible + if(SDL_KEY==SDLK_i){ + player->vel.y=.5; + player->ground=false; + currentWorld=currentWorld->goWorldBack(player); // Go back a layer if possible + } if(SDL_KEY==SDLK_k)currentWorld=currentWorld->goWorldFront(player); // Go forward a layer if possible if(SDL_KEY==SDLK_LSHIFT)player->speed = 3; // Sprint if(SDL_KEY==SDLK_LCTRL)player->speed = .5; diff --git a/src/world.cpp b/src/world.cpp index 9fe76b0..ec91c02 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -42,7 +42,6 @@ World::World(void){ } void World::generate(unsigned int width){ // Generates the world and sets all variables contained in the World class. - worldWidth = width; unsigned int i; float inc; @@ -582,6 +581,10 @@ void World::addHole(unsigned int start,unsigned int end){ } } +int World::getWidth(void){ + return -x_start; +} + IndoorWorld::IndoorWorld(void){ } |