Skip to content

fix grabbing dig you down #82700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix grabbing dig you down #82700

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions src/mattack_actors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,17 +566,6 @@ int melee_actor::do_grab( monster &z, Creature *target, bodypart_id bp_id ) cons
if( foe->in_vehicle ) {
here.unboard_vehicle( target_pos );
}

if( foe->is_avatar() && ( pt.x() < HALF_MAPSIZE_X || pt.y() < HALF_MAPSIZE_Y ||
pt.x() >= HALF_MAPSIZE_X + SEEX || pt.y() >= HALF_MAPSIZE_Y + SEEY ) ) {
const tripoint_abs_ms pt_abs = here.get_abs(
pt ); // Could have used the result from update_map to shift the value instead.
g->update_map( pt.x(), pt.y() );
// update_map invalidates bubble positions on a shift. Refetch invalidated positions.
pt = here.get_bub( pt_abs );
monster_pos = z.pos_bub( here );
target_pos = target->pos_bub( here );
}
}

// Don't try to fall mid pull
Expand Down
Loading