From 809a91199828cd4361ccc0e903a35bdba286522f Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Tue, 4 Dec 2018 02:40:27 +0100 Subject: [PATCH] refactored o_key to use in_full_game --- menus.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/menus.cpp b/menus.cpp index 8aa4860b..228bd730 100644 --- a/menus.cpp +++ b/menus.cpp @@ -840,10 +840,14 @@ named_functionality get_o_key() { if(peace::on) return named_dialog(XLAT("peaceful mode"), peace::showMenu); - if((geometry != gNormal || NONSTDVAR) && !chaosmode && !(geometry == gEuclid && isCrossroads(specialland)) && !(weirdhyperbolic && specialland == laCrossroads4)) + dialog::infix = ""; + + if(in_full_game()) + return named_dialog(XLAT("world overview"), showOverview); + + if(geometry != gNormal || NONSTDVAR) return named_functionality(XLAT("geometry experiments"), runGeometryExperiments); - dialog::infix = ""; return named_dialog(XLAT("world overview"), showOverview); }