Skip to content

Commit

Permalink
hopes again.
Browse files Browse the repository at this point in the history
  • Loading branch information
yuganxia committed Jun 4, 2024
1 parent ac842d7 commit 878cfe2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
9 changes: 9 additions & 0 deletions src/activity_actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7691,18 +7691,27 @@ void heat_activity_actor::start( player_activity &act, Character & )
void heat_activity_actor::do_turn( player_activity &act, Character &p )
{
if( !h.loc ) {
if( h.loc.get_item()->has_flag( flag_PSEUDO ) ) {
h.loc.get_item()->countdown_point = calendar::turn_zero;
};
p.add_msg_if_player( _( "You can't find the heater any more." ) );
act.set_to_null();
return;
}
for( drop_location &ait : to_heat ) {
if( !ait.first ) {
if( h.loc.get_item()->has_flag( flag_PSEUDO ) ) {
h.loc.get_item()->countdown_point = calendar::turn_zero;
};
p.add_msg_if_player( _( "Some of the food you selected is gone." ) );
act.set_to_null();
return;
}
}
if( get_available_heater( p, h.loc ) < requirements.ammo * h.heating_effect ) {
if( h.loc.get_item()->has_flag( flag_PSEUDO ) ) {
h.loc.get_item()->countdown_point = calendar::turn_zero;
};
p.add_msg_if_player( _( "You need more energy to heat these items." ) );
act.set_to_null();
return;
Expand Down
2 changes: 1 addition & 1 deletion src/iuse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8144,7 +8144,7 @@ heater find_heater( Character *p, item *it )
}
return false;
};
loc = g->inv_map_splice( filter, _( "Select a tool to heat:" ), 1,
loc = g->inv_map_splice_with_pseudo( filter, _( "Select a tool to heat:" ), 1,
_( "You don't have proper heating source." ) );
if( !loc ) {
return {loc, true, -1, 0};
Expand Down

0 comments on commit 878cfe2

Please sign in to comment.