diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-21 09:25:47 -0500 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-21 09:25:47 -0500 |
commit | 44804d69ea1af2490fedf54ea2cb273e3f5ab219 (patch) | |
tree | a0c11e20f9cfd4c2185ef889ad9868b4046a718a /src/ui.cpp | |
parent | 77f6086bedaa0cbd945fb727a9e82a4c93e6255c (diff) |
changelog
Diffstat (limited to 'src/ui.cpp')
-rw-r--r-- | src/ui.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -722,19 +722,17 @@ DONE: case SDLK_s: break; case SDLK_w: - /*if(inBattle){ + if(inBattle){ tmp = currentWorld; currentWorld = ((Arena *)currentWorld)->exitArena(player); if(tmp != currentWorld){ //delete &tmp; toggleBlackFast(); } - }else{*/ - if((tmp = currentWorld->goInsideStructure(player)) != currentWorld){ - delete currentWorld; + }else{ + if((tmp = currentWorld->goInsideStructure(player)) != currentWorld) currentWorld = tmp; - } - //}*/ + } break; case SDLK_i: /*currentWorld=currentWorld->goWorldBack(player); // Go back a layer if possible |