From 5ec390b0d6600b566ca5cf4f4964201650d54e00 Mon Sep 17 00:00:00 2001
From: kaetemi <none@none>
Date: Sun, 16 Feb 2014 23:09:19 +0100
Subject: [PATCH] Fix #132 You can no longer walk through rezzed players

---
 code/ryzom/client/src/character_cl.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp
index 932819817..f8ee31eaa 100644
--- a/code/ryzom/client/src/character_cl.cpp
+++ b/code/ryzom/client/src/character_cl.cpp
@@ -2291,6 +2291,21 @@ void CCharacterCL::endAnimTransition()
 	// If the next mode in the automaton != Current Mode
 	if(_CurrentState->NextMode != _Mode)
 	{
+		// Undo previous behaviour
+		switch(_Mode)
+		{
+		case MBEHAV::DEATH:
+			// Restore collisions.
+			if(_Primitive)
+			{
+				// TODO: Without this dynamic cast
+				if(dynamic_cast<CPlayerCL *>(this))
+					_Primitive->setOcclusionMask(MaskColPlayer);
+				else
+					_Primitive->setOcclusionMask(MaskColNpc);
+			}
+			break;
+		}
 		if(ClientCfg.UsePACSForAll && _Primitive)
 			_Primitive->setCollisionMask(MaskColNone);
 		//// AJOUT ////