Merge pull request #165 from xr-lucy/lucy_stuff

Some fixes

(cherry picked from commit a54028c)

Author: themrdemonized

src/xrEngine/FDemoRecord.cpp

@@ -505,6 +505,11 @@ void CDemoRecord::IR_OnMouseRelease(int btn)
 	IR_OnKeyboardRelease(mouse_button_2_key[btn]);
 }
 
+void CDemoRecord::IR_OnMouseWheel(int direction)
+{
+	if (m_b_redirect_input_to_level) g_pGameLevel->IR_OnMouseWheel(direction);
+}
+
 void CDemoRecord::IR_OnKeyboardPress(int dik)
 {
 	if (isInputBlocked) {

src/xrEngine/FDemoRecord.h

@@ -78,6 +78,7 @@ class ENGINE_API CDemoRecord :
 	virtual void IR_OnMouseHold(int btn);
 	virtual void IR_OnMousePress(int btn);
 	virtual void IR_OnMouseRelease(int btn);
+	virtual void IR_OnMouseWheel(int direction);
 	void StopDemo();
 	void EnableReturnCtrlInputs();
 	void SetCameraBoundary(float boundary);

src/xrGame/CharacterPhysicsSupport.cpp

@@ -1294,9 +1294,15 @@ void CCharacterPhysicsSupport::in_ChangeVisual()
 
 	if (m_pPhysicsShell)
 	{
+		if (!m_EntityAlife.renderable.visual)
+			m_pPhysicsShell->set_Kinematics(nullptr);
+
 		VERIFY(m_eType!=etStalker);
 		if (m_physics_skeleton)
 		{
+			if (!m_EntityAlife.renderable.visual)
+				m_physics_skeleton->set_Kinematics(nullptr);
+
 			m_EntityAlife.processing_deactivate();
 			m_physics_skeleton->Deactivate();
 			xr_delete(m_physics_skeleton);

src/xrGame/PhysicsShellHolder.cpp

@@ -82,7 +82,7 @@ void CPhysicsShellHolder::net_Destroy()
 		char_support->destroy_imotion();
 	inherited::net_Destroy();
 	b_sheduled = false;
-
+	if (!renderable.visual && m_pPhysicsShell) m_pPhysicsShell->set_Kinematics(nullptr);
 	deactivate_physics_shell();
 	xr_delete(m_pPhysicsShell);
 }