diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-09-29 19:55:24 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-09-29 19:55:24 -0700 |
| commit | 4717bc0e562d1328b24b780bb5ab327e82b28fa6 (patch) | |
| tree | edc37436e700a188d62a889969bfbebce5835a87 /jc_allow-hacker-laptop.patch | |
| parent | Updated to 2021-09-20-1811 (diff) | |
| download | cataclysm-bn-4717bc0e562d1328b24b780bb5ab327e82b28fa6.tar.xz | |
Updated to 2021-09-29-2237
Diffstat (limited to 'jc_allow-hacker-laptop.patch')
| -rw-r--r-- | jc_allow-hacker-laptop.patch | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/jc_allow-hacker-laptop.patch b/jc_allow-hacker-laptop.patch index 69ca8b2..07f44ba 100644 --- a/jc_allow-hacker-laptop.patch +++ b/jc_allow-hacker-laptop.patch @@ -1,21 +1,29 @@ --- a/src/game.cpp +++ b/src/game.cpp -@@ -2432,7 +2432,8 @@ +@@ -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( "remotevehcontrol" ) ) ) { -+ ( !u.has_active_bionic( bio_remote ) && !u.has_active_item( "remotevehcontrol" ) -+ && !u.has_active_item( "hacker_laptop" ) ) ) { +- ( !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; -@@ -2452,7 +2453,7 @@ +@@ -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( "remotevehcontrol" ) ) { -+ !u.has_active_item( "remotevehcontrol" ) && !u.has_active_item( "hacker_laptop" ) ) { +- !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; } |