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.
arx · Jun 2, 2017 · 976cf4b · 976cf4b
1 parent 5012166
commit 976cf4b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/scene/ChangeLevel.cpp b/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;