Revert "Fix webtiles popups obscuring direction chooser (stoneychips,…

… #11525)" This broke xv. This reverts commit f1e831c.
crawl · Jul 20, 2018 · a501810 · a501810
1 parent b0d9f32
commit a501810
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
@@ -2010,10 +2010,6 @@ void direction_chooser::finalize_moves()
 
 bool direction_chooser::choose_direction()
 {
-#ifdef USE_TILE_WEB
-    tiles_ui_control ui(UI_HIDE_POPUPS);
-#endif
-
     if (restricts == DIR_DIR)
         return choose_compass();
 

diff --git a/crawl-ref/source/tileweb.h b/crawl-ref/source/tileweb.h
@@ -30,7 +30,6 @@ enum WebtilesUIState
     UI_NORMAL,
     UI_CRT,
     UI_VIEW_MAP,
-    UI_HIDE_POPUPS,
 };
 
 struct player_info

diff --git a/crawl-ref/source/webserver/game_data/static/enums.js b/crawl-ref/source/webserver/game_data/static/enums.js
@@ -13,7 +13,6 @@ define(function () {
     exports.ui.NORMAL   = 0;
     exports.ui.CRT      = 1;
     exports.ui.VIEW_MAP = 2;
-    exports.ui.HIDE_POPUPS = 3;
 
     // Mouse modes
     val = 0;

diff --git a/crawl-ref/source/webserver/game_data/static/game.js b/crawl-ref/source/webserver/game_data/static/game.js
@@ -163,7 +163,7 @@ function ($, comm, client, dungeon_renderer, display, minimap, enums, messages,
             break;
         }
         document.querySelector("#ui-stack").classList.toggle("hidden",
-            ui_state == enums.ui.VIEW_MAP || ui_state == enums.ui.HIDE_POPUPS);
+            ui_state == enums.ui.VIEW_MAP);
     }
 
     function handle_set_layout(data)