diff --git a/debug.cpp b/debug.cpp index 4aa72729..50853835 100644 --- a/debug.cpp +++ b/debug.cpp @@ -649,12 +649,18 @@ int read_cheat_args() { PHASEFROM(2); cheat(); reptilecheat = true; } // cheats - else if(argis("-WT")) { + else if(argis("-WS")) { PHASE(3); shift(); activateSafety(readland(args())); cheat(); } + else if(argis("-WT")) { + PHASE(3); + shift(); + teleportToLand(readland(args()), false); + cheat(); + } else if(argis("-W2")) { shift(); cheatdest = readland(args()); cheat(); showstartmenu = false; diff --git a/game.cpp b/game.cpp index 332ab6b2..128108d2 100644 --- a/game.cpp +++ b/game.cpp @@ -218,7 +218,7 @@ EX void saveRecall(cellwalker cw2) { } } -EX void activateSafety(eLand l) { +EX void teleportToLand(eLand l, bool make_it_safe) { if(recallCell.at && activateRecall()) return; savePrincesses(); @@ -242,7 +242,7 @@ EX void activateSafety(eLand l) { safetyland = l; safetyseed = hrandpos(); clear_euland(firstland); - safety = true; avengers = 0; + safety = make_it_safe; avengers = 0; clearMemory(); initcells(); initgame(); @@ -255,6 +255,11 @@ EX void activateSafety(eLand l) { restartGraph(); } + +EX void activateSafety(eLand l) { + teleportToLand(l, true); + } + EX void placeGolem(cell *on, cell *moveto, eMonster m) { if(on->monst == moFriendlyIvy) killMonster(on, moPlayer);