diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-01-31 20:26:08 -0800 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-01-31 20:26:08 -0800 |
commit | 5df800d05b7ca9e8d7d79ef33fcdcead0785b75a (patch) | |
tree | 4f49044af83273900da7a277a3e368762d0533cd /jc_allow-hacker-laptop.patch | |
parent | Fix more inconsistent ammo names (diff) | |
download | cataclysm-dda-5df800d05b7ca9e8d7d79ef33fcdcead0785b75a.tar.xz |
Update to 0.F.3
Port various patches from BN
Diffstat (limited to 'jc_allow-hacker-laptop.patch')
-rw-r--r-- | jc_allow-hacker-laptop.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/jc_allow-hacker-laptop.patch b/jc_allow-hacker-laptop.patch new file mode 100644 index 0000000..75bcc07 --- /dev/null +++ b/jc_allow-hacker-laptop.patch @@ -0,0 +1,29 @@ +--- a/src/game.cpp ++++ b/src/game.cpp +@@ -239,6 +239,7 @@ + static const itype_id itype_battery( "battery" ); + static const itype_id itype_disassembly( "disassembly" ); + static const itype_id itype_grapnel( "grapnel" ); ++static const itype_id itype_hackerlaptop( "hacker_laptop" ); + static const itype_id itype_holybook_bible1( "holybook_bible1" ); + static const itype_id itype_holybook_bible2( "holybook_bible2" ); + static const itype_id itype_holybook_bible3( "holybook_bible3" ); +@@ -2695,7 +2696,8 @@ + remoteveh_cache_time = calendar::turn; + std::stringstream remote_veh_string( u.get_value( "remote_controlling_vehicle" ) ); + if( remote_veh_string.str().empty() || +- ( !u.has_active_bionic( bio_remote ) && !u.has_active_item( itype_remotevehcontrol ) ) ) { ++ ( !u.has_active_bionic( bio_remote ) && !u.has_active_item( itype_remotevehcontrol ) ++ && !u.has_active_item( itype_hackerlaptop ) ) ) { + remoteveh_cache = nullptr; + } else { + tripoint vp; +@@ -2715,7 +2717,7 @@ + remoteveh_cache_time = calendar::turn; + remoteveh_cache = veh; + if( veh != nullptr && !u.has_active_bionic( bio_remote ) && +- !u.has_active_item( itype_remotevehcontrol ) ) { ++ !u.has_active_item( itype_remotevehcontrol ) && !u.has_active_item( itype_hackerlaptop ) ) { + debugmsg( "Tried to set remote vehicle without bio_remote or remotevehcontrol" ); + veh = nullptr; + } |