From 48e631b4e695814ed5c4b2767c8b619a6315332e Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 17 Apr 2026 14:35:02 +0200
Subject: [PATCH] pressing yendor/tactic mode in the menu now, when active,
 automatically disables the mode

---
 menus.cpp  | 1 +
 yendor.cpp | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/menus.cpp b/menus.cpp
index 8469b6f5..8088de6f 100644
--- a/menus.cpp
+++ b/menus.cpp
@@ -835,6 +835,7 @@ EX void showChangeMode() {
     clearMessages();
     if(yendor::everwon || autocheat || unlock_all)
       pushScreen(yendor::showMenu);
+    else if(yendor::on) restart_game(rg::yendor);
     else gotoHelp(yendor::chelp);
     });
 #if CAP_RACING
diff --git a/yendor.cpp b/yendor.cpp
index f3e0988e..625f303d 100644
--- a/yendor.cpp
+++ b/yendor.cpp
@@ -944,11 +944,7 @@ EX namespace tactic {
           });
         }
       else if(uni == '0') {
-        if(tactic::on) {
-          stop_game();          
-          firstland = laIce;
-          restart_game(rg::tactic);
-          }
+        if(tactic::on) restart_game(rg::tactic);
         else popScreen();
         }
 
@@ -984,7 +980,8 @@ EX namespace tactic {
   EX void start() {
     dialog::infix = "";
     popScreenAll();
-    pushScreen(tactic::showMenu);
+    if(tactic::on) restart_game(rg::tactic);
+    else pushScreen(tactic::showMenu);
     }
 EX }