From c261db8a08b625522a59e271cb5e39b8e788fd52 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sun, 7 Aug 2022 15:44:49 +0200
Subject: [PATCH] rogueviz:: intra-demos:: popscreen on run

---
 hyper.h                  | 4 ++--
 rogueviz/intra-demos.cpp | 2 ++
 rogueviz/notknot.cpp     | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hyper.h b/hyper.h
index cafb8e85..27495d91 100644
--- a/hyper.h
+++ b/hyper.h
@@ -13,8 +13,8 @@
 #define _HYPER_H_
 
 // version numbers
-#define VER "12.0w"
-#define VERNUM_HEX 0xA918
+#define VER "12.0x"
+#define VERNUM_HEX 0xA919
 
 #include "sysconfig.h"
 
diff --git a/rogueviz/intra-demos.cpp b/rogueviz/intra-demos.cpp
index 1642cd45..3256addc 100644
--- a/rogueviz/intra-demos.cpp
+++ b/rogueviz/intra-demos.cpp
@@ -500,6 +500,8 @@ auto hooks =
         slide_backup(vrhr::eyes, vrhr::eEyes::truesim);
         slide_backup(vrhr::cscr, vrhr::eCompScreen::eyes);
         #endif
+        popScreenAll();
+        resetGL();
         };
       };
 
diff --git a/rogueviz/notknot.cpp b/rogueviz/notknot.cpp
index 025b1bdb..3b737c8c 100644
--- a/rogueviz/notknot.cpp
+++ b/rogueviz/notknot.cpp
@@ -1470,6 +1470,7 @@ void portal_slideshow(tour::ss::slideshow_callback cb) {
               act();
               start_game();
               loop = 2;
+              popScreenAll();
               });
 
             slidecommand = "notknot options";
@@ -1486,7 +1487,8 @@ void portal_slideshow(tour::ss::slideshow_callback cb) {
     add("knotted portal", "This is a knotted portal in Euclidean space.", "https://www.youtube.com/watch?v=eb2DhCcGH7U", launch_euc_with(false));
     add("self-hiding portal", "This knotted portal is 'self-hiding'. It appears that the portal enters itself and disappears!", "https://www.youtube.com/watch?v=vFLZ2NGtuGw", launch_euc_with(true));
     add("non-Euclidean portal in Nil", "A portal in Nil geometry.", "https://www.youtube.com/watch?v=2K-v8tK68AE", launch_nil);
-    add("spherical portal", "A portal in spherical geometry. Such a portal lets us create a space with spherical geometry that has more volume than the sphere.", "https://www.youtube.com/watch?v=PerPeQFu5gw", launch_sphereknot);
+    add("spherical portal", "A portal in spherical geometry. Such a portal lets us create a space with spherical geometry that has more volume than the sphere.", "https://www.youtube.com/watch?v=PerPeQFu5gw", launch_sphere);
+    add("kontted spherical portal", "A knotted portal in spherical geometry.", "https://www.youtube.com/watch?v=PerPeQFu5gw", launch_sphereknot);
     add("Cat Portal in Solv", "A portal in Solv geometry. The honeycomb is based on the mapping torus of Arnold's cat mapping.", "https://www.youtube.com/watch?v=CGiSxC9B6i0", launch_solv);
 
     callhooks(rogueviz::pres::hooks_build_rvtour, "portal", portal_slides);