From 27b0823d747bcc160c2f7280b0837982b372240a Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Thu, 25 Jan 2018 17:21:33 +0100
Subject: [PATCH] never game over if you can use Freedom

---
 game.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/game.cpp b/game.cpp
index 3e7ab32d..a335da8b 100644
--- a/game.cpp
+++ b/game.cpp
@@ -6082,7 +6082,7 @@ void checkmove() {
 
 #if CAP_INV  
   if(inv::on && !canmove && !inv::incheck) {
-    if(inv::remaining[itOrbSafety])
+    if(inv::remaining[itOrbSafety] || inv::remaining[itOrbFreedom])
       canmove = true;
     else {
       inv::check(1);
@@ -6252,7 +6252,7 @@ void collectMessage(cell *c2, eItem which) {
   else if(which == itGreenStone)
     addMessage(XLAT("Another Dead Orb."));
   else if(itemclass(which) != IC_TREASURE) {
-    if(c2->wall != waBoat)
+    if(c2->wall != waBoat && !inv::activating)
       addMessage(XLAT("You have found %the1!", which));
     }
   else if(which == itBabyTortoise) {