diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-01-25 23:39:30 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-01-25 23:39:30 -0800 |
| commit | 7406a4d8fad98609db9486e27f35e2347c87e70f (patch) | |
| tree | bf59f93eda0b1200ca0f7630ee4b6832234b1c6d /jc_radio-can-use-ups.patch | |
| parent | Update PKGUILD (diff) | |
| download | cataclysm-bn-7406a4d8fad98609db9486e27f35e2347c87e70f.tar.xz | |
Fix many patch fuzzing warnings.
Fix vampires not ignoring ambient temperature.
Diffstat (limited to 'jc_radio-can-use-ups.patch')
| -rw-r--r-- | jc_radio-can-use-ups.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/jc_radio-can-use-ups.patch b/jc_radio-can-use-ups.patch index ee146e5..a47b1d4 100644 --- a/jc_radio-can-use-ups.patch +++ b/jc_radio-can-use-ups.patch @@ -1,6 +1,6 @@ --- a/src/iuse.cpp +++ b/src/iuse.cpp -@@ -289,6 +289,7 @@ +@@ -350,6 +350,7 @@ static const std::string flag_HEATS_FOOD( "HEATS_FOOD" ); static const std::string flag_PLANT( "PLANT" ); static const std::string flag_PLOWABLE( "PLOWABLE" ); @@ -8,7 +8,7 @@ // how many characters per turn of radio static constexpr int RADIO_PER_TURN = 25; -@@ -2162,7 +2163,8 @@ +@@ -2205,7 +2206,8 @@ } } else { // Activated int ch = 1; @@ -18,7 +18,7 @@ ch = uilist( _( "Radio:" ), { _( "Scan" ), _( "Turn off" ) } ); -@@ -4082,7 +4084,8 @@ +@@ -4074,7 +4076,8 @@ if( t ) { // Effects while simply on } else { @@ -26,9 +26,9 @@ + if( !it->units_sufficient( *p ) || !( it->has_flag( flag_USE_UPS ) && + p->has_enough_charges( *it, false ) ) ) { p->add_msg_if_player( m_info, _( "Your tactical tonfa is out of power." ) ); - it->convert( "shocktonfa_off" ).active = false; + it->convert( itype_shocktonfa_off ).active = false; } else { -@@ -4107,7 +4110,8 @@ +@@ -4099,7 +4102,8 @@ int iuse::mp3( player *p, item *it, bool, const tripoint & ) { // TODO: avoid item id hardcoding to make this function usable for pure json-defined devices. @@ -36,9 +36,9 @@ + if( !it->units_sufficient( *p ) || !( it->has_flag( flag_USE_UPS ) && + p->has_enough_charges( *it, false ) ) ) { p->add_msg_if_player( m_info, _( "The device's batteries are dead." ) ); - } else if( p->has_active_item( "mp3_on" ) || p->has_active_item( "smartphone_music" ) || - p->has_active_item( "afs_atomic_smartphone_music" ) || -@@ -6367,9 +6371,12 @@ + } else if( p->has_active_item( itype_mp3_on ) || p->has_active_item( itype_smartphone_music ) || + p->has_active_item( itype_afs_atomic_smartphone_music ) || +@@ -6366,9 +6370,12 @@ int iuse::einktabletpc( player *p, item *it, bool t, const tripoint &pos ) { if( t ) { |