From 8faa789de7f662b697a07f3bb68f69586d290ef0 Mon Sep 17 00:00:00 2001
From: bacchelordoh <159671087+ohlordhebacc@users.noreply.github.com>
Date: Fri, 10 Oct 2025 23:01:04 -0500
Subject: [PATCH 1/2] fixed "lastexplore" not getting set to "shmup::curtime"
 when enabling the map editor in shmup

---
 debug.cpp | 2 +-
 menus.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debug.cpp b/debug.cpp
index 1821474c5..6ee2850d0 100644
--- a/debug.cpp
+++ b/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", [] {
diff --git a/menus.cpp b/menus.cpp
index 0f93d4809..218835bc4 100644
--- a/menus.cpp
+++ b/menus.cpp
@@ -329,7 +329,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!"));
       });
     });

From c384169cba473aa4f50e9b4a4683afce342d5cfe Mon Sep 17 00:00:00 2001
From: bacchelordoh <159671087+ohlordhebacc@users.noreply.github.com>
Date: Fri, 10 Oct 2025 23:04:38 -0500
Subject: [PATCH 2/2] fixed "lastexplore" not getting set to "shmup::curtime"
 in the fifteen puzzle in shmup

---
 rogueviz/fifteen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rogueviz/fifteen.cpp b/rogueviz/fifteen.cpp
index 7db455975..e76218a23 100644
--- a/rogueviz/fifteen.cpp
+++ b/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();