Update to 0.GHEADmaster

Port patches back to DDA.

1 files changed, 0 insertions, 43 deletions

diff --git a/jc_allow-bio-firestarter-on-smoker.patch b/jc_allow-bio-firestarter-on-smoker.patch
deleted file mode 100644
index 4c5c548..0000000
--- a/jc_allow-bio-firestarter-on-smoker.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/src/iexamine.cpp
-+++ b/src/iexamine.cpp
-@@ -2638,7 +2638,10 @@
-         return;
-     }
- 
--    if( !p.has_charges( itype_fire, 1 ) ) {
-+    const bool has_bionic_firestarter = p.has_bionic( bio_lighter ) &&
-+                                        p.enough_power_for( bio_lighter );
-+
-+    if( !has_bionic_firestarter && !p.has_charges( itype_fire, 1 ) ) {
-         add_msg( _( "This kiln is ready to be fired, but you have no fire source." ) );
-         return;
-     } else {
-@@ -5396,11 +5399,23 @@
-         return;
-     }
- 
--    p.use_charges( itype_fire, 1 );
--    for( item &it : here.i_at( examp ) ) {
--        if( it.has_flag( flag_SMOKABLE ) ) {
--            it.process_temperature_rot( 1, examp, nullptr );
--            it.set_flag( flag_PROCESSING );
-+    const bool has_bionic_firestarter = p.has_bionic( bio_lighter ) &&
-+                                        p.enough_power_for( bio_lighter );
-+
-+    if( has_bionic_firestarter ) {
-+        for( item &it : here.i_at( examp ) ) {
-+            if( it.has_flag( flag_SMOKABLE ) ) {
-+                it.process_temperature_rot( 1, examp, nullptr );
-+                it.set_flag( flag_PROCESSING );
-+            }
-+        }
-+    } else {
-+        p.use_charges( itype_fire, 1 );
-+        for( item &it : here.i_at( examp ) ) {
-+            if( it.has_flag( flag_SMOKABLE ) ) {
-+                it.process_temperature_rot( 1, examp, nullptr );
-+                it.set_flag( flag_PROCESSING );
-+            }
-         }
-     }
-     here.furn_set( examp, next_smoker_type );