diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-05-03 15:58:03 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-05-03 15:58:03 -0700 |
| commit | 6b8d5abd7fc1d2f1d6f794640117c649eae3e01a (patch) | |
| tree | 0ad0436287ad1f9bbd3cfb28f7574d5a6710592f /jc_allow-hacker-laptop.patch | |
| parent | Updated to 2023-04-15-1344 (diff) | |
| download | cataclysm-bn-6b8d5abd7fc1d2f1d6f794640117c649eae3e01a.tar.xz | |
Updated to 2023-04-30-2223
Revert more ammo patches.
Revert more books patches.
Clean up old book patch.
Fix removed traits patch.
Fix bathroom fluff patch.
Remove obsolete vacutainer patch.
Rename source patches.
Diffstat (limited to 'jc_allow-hacker-laptop.patch')
| -rw-r--r-- | jc_allow-hacker-laptop.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/jc_allow-hacker-laptop.patch b/jc_allow-hacker-laptop.patch deleted file mode 100644 index 07f44ba..0000000 --- a/jc_allow-hacker-laptop.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/game.cpp -+++ b/src/game.cpp -@@ -224,6 +224,7 @@ - - static const itype_id itype_battery( "battery" ); - 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" ); -@@ -2501,7 +2502,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; -@@ -2521,7 +2523,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; - } |