Merge pull request #472 from ohlordhebacc/mapeditor-lastexplore-shmup-fix

Fix the "lastexplore" value getting set to the turn/knives thrown count instead of "shmup::curtime" when enabling the map editor in shmup, and when playing the fifteen+4 puzzle in shmup

debug.cpp

@@ -168,7 +168,7 @@ vector<cheatkey> cheats = {
   cheatkey{'R'-64, "advance the rose wave", buildRosemap},
   #if CAP_EDIT
   cheatkey{'A', "start the Map Editor", [] {
-    lastexplore = turncount;
+    lastexplore = shmup::on ? shmup::curtime : turncount;
     pushScreen(mapeditor::showMapEditor);
     }},
   cheatkey{'A'-64, "start the Vector Graphics Editor", [] {

menus.cpp

@@ -331,7 +331,7 @@ EX void showCreative() {
     dialog::cheat_if_confirmed([] {
       cheater++;
       pushScreen(mapeditor::showMapEditor);
-      lastexplore = turncount;
+      lastexplore = shmup::on ? shmup::curtime : turncount;
       addMessage(XLAT("You activate your terraforming powers!"));
       });
     });

rogueviz/fifteen.cpp

@@ -167,7 +167,7 @@ bool fifteen3 = true;
 
 bool draw_fifteen(cell *c, const shiftmatrix& V) {
   hr::addaura(tC0(V), darkened(0x0000FF), 0);
-  lastexplore = turncount;
+  lastexplore = shmup::on ? shmup::curtime : turncount;
   if(!fif.count(c)) { c->land = laNone; c->wall = waChasm; c->item = itNone; c->monst = moNone; return false; }
   check_move();