Skip to content
Permalink
Browse files

ChangeLevel: Unequip the weapon after loading saves or changing level

We already exit combat mode - leaving the weapon equipped puts the
player character into an inconsistent state.
  • Loading branch information
dscharrer committed Jun 2, 2017
1 parent 5012166 commit 976cf4b1e4653c983a56bbc396787f3edc4e01db
Showing with 2 additions and 0 deletions.
  1. +2 −0 src/scene/ChangeLevel.cpp
@@ -2719,6 +2719,7 @@ static bool ARX_CHANGELEVEL_PopLevel(long instance, bool reloadflag) {
TRUE_PLAYER_MOUSELOOK_ON = true;
// disable combat mode
player.Interface &= ~INTER_COMBATMODE;
ARX_EQUIPMENT_AttachPlayerWeaponToBack();

progressBarAdvance();
LoadLevelScreen();
@@ -2872,6 +2873,7 @@ long ARX_CHANGELEVEL_Load(const fs::path & savefile) {

BLOCK_PLAYER_CONTROLS = false;
player.Interface &= ~INTER_COMBATMODE;
ARX_EQUIPMENT_AttachPlayerWeaponToBack();

entities.player()->animlayer[1].cur_anim = NULL;

0 comments on commit 976cf4b

Please sign in to comment.
You can’t perform that action at this time.