Skip to content

Commit 74e462c

Browse files
committed
Prevent Tux from using item pocket while deactivated
fixes #3189
1 parent 68f4717 commit 74e462c

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/object/player.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ class Player final : public MovingObject
297297
inline bool is_swimboosting() const { return m_swimboosting; }
298298
inline bool is_water_jumping() const { return m_water_jump; }
299299
inline bool is_skidding() const { return m_skidding_timer.started(); }
300+
inline bool is_scripting_activated() const { return !m_deactivated; }
300301
inline float get_swimming_angle() const { return m_swimming_angle; }
301302

302303
/**

src/supertux/game_session.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,9 @@ GameSession::update(float dt_sec, const Controller& controller)
622622

623623
for (Player* player : m_currentsector->get_players())
624624
{
625-
if (player->get_controller().pressed(Control::ITEM) && m_savegame.get_player_status().m_item_pockets.size() > 0)
625+
if (player->is_active() && player->is_scripting_activated() &&
626+
player->get_controller().pressed(Control::ITEM) &&
627+
m_savegame.get_player_status().m_item_pockets.size() > 0)
626628
{
627629
player->get_status().give_item_from_pocket(player);
628630
}

0 commit comments

Comments
 (0)