From 5423eebc2d0b3c7301498758f4d954986eefb12e Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sat, 15 Oct 2022 14:24:56 +0200
Subject: [PATCH] ads-game:: cleanup nomap

---
 rogueviz/ads/ads-game.cpp | 1 -
 rogueviz/ads/views.cpp    | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/rogueviz/ads/ads-game.cpp b/rogueviz/ads/ads-game.cpp
index 62997ad6..a497f6c4 100644
--- a/rogueviz/ads/ads-game.cpp
+++ b/rogueviz/ads/ads-game.cpp
@@ -130,7 +130,6 @@ void set_config() {
 
   nohelp = true;
   nomenukey = true;
-  nomap = true;
   no_find_player = true;
   showstartmenu = false;
   }
diff --git a/rogueviz/ads/views.cpp b/rogueviz/ads/views.cpp
index aa5306ca..3d308c39 100644
--- a/rogueviz/ads/views.cpp
+++ b/rogueviz/ads/views.cpp
@@ -45,18 +45,15 @@ void switch_underlying() {
 
       initcells();
       initgame();
-      nomap = false;
       models::desitter_projections = true;
       }
 
     else if(hyperbolic) {
-      nomap = true;
       geometry = gSphere;
       variation = eVariation::bitruncated;
       swap(currentmap, map_hyp);
       pmodel = mdDisk;
       check_cgi();
-      nomap = true;
       }
 
     }
@@ -68,7 +65,6 @@ void switch_underlying() {
       hybrid::switch_to_actual();
       pmodel = mdRelPerspective;
       hyperpoint res;
-      nomap = false;
       nonisotropic_weird_transforms = true;
       NLP = Id;
       Duality = Id;
@@ -78,7 +74,6 @@ void switch_underlying() {
     else if(hybri) {
       hybrid::switch_to_underlying();
       pmodel = mdDisk;
-      nomap = true;
       }
     cgi.use_count++;
     }
@@ -104,6 +99,8 @@ bool ads_draw_cell(cell *c, const shiftmatrix& V) {
   }
 
 void replay_animation() {
+  nomap = main_rock ? (!hyperbolic || among(pmodel, mdRelPerspective, mdRelOrthogonal)) : !sl2;
+
   if(in_replay) {
     view_pt = (ticks / 1000.) * DS_(simspeed);
     ld maxt = history.back().start + 0.001;