From 1d0c9898266d71760d7258f566fc4ca3363298d9 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Thu, 19 Dec 2024 18:29:01 +0000 Subject: [PATCH] Fix peeking out of windows causing you to fall --- src/avatar_action.cpp | 4 ++-- src/game.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp index 71c928d0a83bc..1edb7a29662ce 100644 --- a/src/avatar_action.cpp +++ b/src/avatar_action.cpp @@ -1060,7 +1060,7 @@ void avatar_action::plthrow( avatar &you, item_location loc, // otherwise see. const tripoint_bub_ms original_player_position = you.pos_bub(); if( blind_throw_from_pos ) { - you.setpos( *blind_throw_from_pos ); + you.setpos( *blind_throw_from_pos, false ); } g->temp_exit_fullscreen(); @@ -1071,7 +1071,7 @@ void avatar_action::plthrow( avatar &you, item_location loc, // If we previously shifted our position, put ourselves back now that we've picked our target. if( blind_throw_from_pos ) { - you.setpos( original_player_position ); + you.setpos( original_player_position, false ); } if( trajectory.empty() ) { diff --git a/src/game.cpp b/src/game.cpp index 89b45d876ccd7..babfd49446c8e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -6308,7 +6308,7 @@ void game::peek( const tripoint_bub_ms &p ) { u.mod_moves( -u.get_speed() * 2 ); tripoint_bub_ms prev = u.pos_bub(); - u.setpos( p ); + u.setpos( p, false ); const bool is_same_pos = u.pos_bub() == prev; const bool is_standup_peek = is_same_pos && u.is_crouching(); tripoint_bub_ms center = p; @@ -6323,7 +6323,7 @@ void game::peek( const tripoint_bub_ms &p ) u.activate_crouch_mode(); } else { // Else is normal peek result = look_around( looka_params ); - u.setpos( prev ); + u.setpos( prev, false ); } if( result.peek_action ) {