Work on merging the two split-up bits too

chaosvolt · Oct 14, 2021 · d7d96c8 · d7d96c8
1 parent 22a4324
commit d7d96c8
Showing 1 changed file with 16 additions and 18 deletions.
diff --git a/src/iuse.cpp b/src/iuse.cpp
@@ -2343,28 +2343,26 @@ int iuse::crowbar( player *p, item *it, bool, const tripoint &pos )
         if( pnt == p->pos() ) {
             p->add_msg_if_player( m_info, _( "You attempt to pry open your wallet "
                                              "but alas.  You are just too miserly." ) );
+        } if (ter->pry.new_ter_type || furn->pry.new_furn_type) {
+            if (pos == g->u.pos()) {
+                return false;
+            }
+
+            const bool is_allowed = false;
+            if (furn.obj().pry.pry_quality != -1) {
+                pry = &ter.obj().pry;
+                pry_furn = true;
+                return 0;
+            }
+            else if (ter.obj().pry.pry_quality != -1) {
+                pry = &ter.obj().pry;
+                return 0;
+            }
         } else {
-            p->add_msg_if_player( m_info, _( "You can't pry that." ) );
+            p->add_msg_if_player(m_info, _("You can't pry that."));
         }
-        return 0;
     }
 
-    if( ter->pry.new_ter_type || furn->pry.new_furn_type ) {
-        if( pos == g->u.pos() ) {
-            return false;
-        }
-
-        const bool is_allowed = false;
-        if( furn.obj().pry.pry_quality != -1 ) {
-            pry = &ter.obj().pry;
-            pry_furn = true;
-            return 0;
-        } else if( ter.obj().pry.pry_quality != -1 ) {
-            pry = &ter.obj().pry;
-            return 0;
-        }
-    };
-
     // Doors need PRY 2 which is on a crowbar, crates need PRY 1 which is on a crowbar
     // & a claw hammer.
     // The iexamine function for crate supplies a hammer object.