confirm-embark: Make esc work again

2014-06-04 23:18:19 -04:00 · 2014-06-04 23:18:19 -04:00 · 0a1d87c09f
parent f29d1886ff
commit 0a1d87c09f
1 changed files with 5 additions and 2 deletions
--- a/plugins/tweak.cpp
+++ b/plugins/tweak.cpp
@ -386,8 +386,11 @@ struct confirm_embark_hook : df::viewscreen_setupdwarfgamest

    DEFINE_VMETHOD_INTERPOSE(bool, key_conflict, (df::interface_key key))
    {
-        if (key == df::interface_key::OPTIONS)
-            return true;
+        if (confirm_embark_state == ECS_CONFIRM)
+        {
+            if (key == df::interface_key::OPTIONS)
+                return true;
+        }
        return false;
    }