Skip to content

Commit

Permalink
Merge pull request CleverRaven#33145 from pjf/fix_monster_store_segfault
Browse files Browse the repository at this point in the history 
Apply extra care with monster dragging code to avoid segfaults
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Aug 12, 2019
2 parents 6c8f543 + 4a878ff commit c3cf67e
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 55 deletions.
2 changes: 1 addition & 1 deletion src/monattack.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2951,7 +2951,7 @@ bool mattack::nurse_operate( monster *z )
} else {
grab( z );
if( target->has_effect( effect_grabbed ) ) { // check if we succesfully grabbed the target
z->dragged_foe = target;
z->dragged_foe_id = target->getID();
z->add_effect( effect_dragging, 1_turns, num_bp, true );
return true;
}
Expand Down
126 changes: 79 additions & 47 deletions src/monmove.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,54 +601,11 @@ void monster::move()
}
}

// dragged_foe: restore pointer by saved id if required
if( dragged_foe_id >= 0 ) {
dragged_foe = g->critter_by_id<player>( dragged_foe_id );
dragged_foe_id = 0;
}
// defective nursebot surgery code
if( type->has_special_attack( "OPERATE" ) && has_effect( effect_dragging ) &&
dragged_foe != nullptr ) {

if( rl_dist( pos(), goal ) == 1 && g->m.furn( goal ) == furn_id( "f_autodoc_couch" ) &&
!has_effect( effect_operating ) ) {
if( dragged_foe->has_effect( effect_grabbed ) && !has_effect( effect_countdown ) &&
( g->critter_at( goal ) == nullptr || g->critter_at( goal ) == dragged_foe ) ) {
add_msg( m_bad, _( "The %1$s slowly but firmly puts %2$s down onto the autodoc couch." ), name(),
dragged_foe->disp_name() );

dragged_foe->setpos( goal );

add_effect( effect_countdown, 2_turns );// there's still time to get away
add_msg( m_bad, _( "The %s produces a syringe full of some translucent liquid." ), name() );
} else if( g->critter_at( goal ) != nullptr && has_effect( effect_dragging ) ) {
sounds::sound( pos(), 8, sounds::sound_t::speech,
string_format(
_( "a soft robotic voice say, \"Please step away from the autodoc, this patient needs immediate care.\"" ) ) );
// TODO: Make it able to push NPC/player
push_to( goal, 4, 0 );
}
}
if( get_effect_dur( effect_countdown ) == 1_turns && !has_effect( effect_operating ) ) {
if( dragged_foe->has_effect( effect_grabbed ) ) {

bionic_collection collec = *dragged_foe->my_bionics;
int index = rng( 0, collec.size() - 1 );
bionic target_cbm = collec[index];

//8 intelligence*4 + 8 first aid*4 + 3 computer *3 + 4 electronic*1 = 77
float adjusted_skill = static_cast<float>( 77 ) - std::min( static_cast<float>( 40 ),
static_cast<float>( 77 ) - static_cast<float>( 77 ) / static_cast<float>( 10.0 ) );

g->u.uninstall_bionic( target_cbm, *this, *dragged_foe, adjusted_skill );
// Check if they're dragging a foe and find their hapless victim
player *dragged_foe = find_dragged_foe();

dragged_foe->remove_effect( effect_grabbed );
remove_effect( effect_dragging );
dragged_foe = nullptr;

}
}
}
// Give nursebots a chance to do surgery.
nursebot_operate( dragged_foe );

// The monster can sometimes hang in air due to last fall being blocked
const bool can_fly = has_flag( MF_FLIES );
Expand Down Expand Up @@ -929,6 +886,81 @@ void monster::move()
}
}

player *monster::find_dragged_foe()
{
// Make sure they're actually dragging someone.
if( dragged_foe_id < 0 || !has_effect( effect_dragging ) ) {
dragged_foe_id = -1;
return nullptr;
}

// Dragged critters may die or otherwise become invalid, which is why we look
// them up each time. Luckily, monsters dragging critters is relatively rare,
// so this check should happen infrequently.
player *dragged_foe = g->critter_by_id<player>( dragged_foe_id );

if( dragged_foe == nullptr ) {
// Target no longer valid.
dragged_foe_id = -1;
remove_effect( effect_dragging );
}

return dragged_foe;
}

// Nursebot surgery code
void monster::nursebot_operate( player *dragged_foe )
{
// No dragged foe, nothing to do.
if( dragged_foe == nullptr ) {
return;
}

// Nothing to do if they can't operate, or they don't think they're dragging.
if( !( type->has_special_attack( "OPERATE" ) && has_effect( effect_dragging ) ) ) {
return;
}

if( rl_dist( pos(), goal ) == 1 && g->m.furn( goal ) == furn_id( "f_autodoc_couch" ) &&
!has_effect( effect_operating ) ) {
if( dragged_foe->has_effect( effect_grabbed ) && !has_effect( effect_countdown ) &&
( g->critter_at( goal ) == nullptr || g->critter_at( goal ) == dragged_foe ) ) {
add_msg( m_bad, _( "The %1$s slowly but firmly puts %2$s down onto the autodoc couch." ), name(),
dragged_foe->disp_name() );

dragged_foe->setpos( goal );

add_effect( effect_countdown, 2_turns );// there's still time to get away
add_msg( m_bad, _( "The %s produces a syringe full of some translucent liquid." ), name() );
} else if( g->critter_at( goal ) != nullptr && has_effect( effect_dragging ) ) {
sounds::sound( pos(), 8, sounds::sound_t::speech,
string_format(
_( "a soft robotic voice say, \"Please step away from the autodoc, this patient needs immediate care.\"" ) ) );
// TODO: Make it able to push NPC/player
push_to( goal, 4, 0 );
}
}
if( get_effect_dur( effect_countdown ) == 1_turns && !has_effect( effect_operating ) ) {
if( dragged_foe->has_effect( effect_grabbed ) ) {

bionic_collection collec = *dragged_foe->my_bionics;
int index = rng( 0, collec.size() - 1 );
bionic target_cbm = collec[index];

//8 intelligence*4 + 8 first aid*4 + 3 computer *3 + 4 electronic*1 = 77
float adjusted_skill = static_cast<float>( 77 ) - std::min( static_cast<float>( 40 ),
static_cast<float>( 77 ) - static_cast<float>( 77 ) / static_cast<float>( 10.0 ) );

g->u.uninstall_bionic( target_cbm, *this, *dragged_foe, adjusted_skill );

dragged_foe->remove_effect( effect_grabbed );
remove_effect( effect_dragging );
dragged_foe_id = -1;

}
}
}

// footsteps will determine how loud a monster's normal movement is
// and create a sound in the monsters location when they move
void monster::footsteps( const tripoint &p )
Expand Down
6 changes: 4 additions & 2 deletions src/monster.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,7 @@ class monster : public Creature
tripoint wander_pos; // Wander destination - Just try to move in that direction
int wandf; // Urge to wander - Increased by sound, decrements each move
std::vector<item> inv; // Inventory
player *dragged_foe; // player being dragged by the monster
int dragged_foe_id; // id of player being dragged by the monster (for save/load)
int dragged_foe_id = -1; // id of player being dragged by the monster
cata::optional<item> tied_item; // item used to tie the monster
cata::optional<item> battery_item; // item to power mechs
// DEFINING VALUES
Expand Down Expand Up @@ -525,6 +524,9 @@ class monster : public Creature
std::bitset<NUM_MEFF> effect_cache;
cata::optional<time_duration> summon_time_limit = cata::nullopt;

player *find_dragged_foe();
void nursebot_operate( player *dragged_foe );

protected:
void store( JsonOut &jsout ) const;
void load( JsonObject &jsin );
Expand Down
6 changes: 1 addition & 5 deletions src/savegame_json.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1811,7 +1811,6 @@ void monster::load( JsonObject &data )

data.read( "inv", inv );
data.read( "dragged_foe_id", dragged_foe_id );
dragged_foe = nullptr;

if( data.has_int( "ammo" ) && !type->starting_ammo.empty() ) {
// Legacy loading for ammo.
Expand Down Expand Up @@ -1889,10 +1888,7 @@ void monster::store( JsonOut &json ) const
}
json.member( "inv", inv );

if( dragged_foe ) {
json.member( "dragged_foe_id", dragged_foe->getID() );
}

json.member( "dragged_foe_id", dragged_foe_id );
json.member( "path", path );
}

Expand Down

0 comments on commit c3cf67e

Please sign in to comment.