From 34c1265bceaf1c421cb5f37b660062c898565971 Mon Sep 17 00:00:00 2001 From: Ulukyn Date: Tue, 7 Jan 2020 18:09:33 +0100 Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/ryzom/ark/features' into ryzom/ark/features" This reverts commit a6ee9fec6344ec65e0803539ee1d50f4a4964ded. --- code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp index 80c36520c..547388698 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp +++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp @@ -2339,8 +2339,8 @@ int CLuaIHMRyzom::addShape(CLuaState &ls) NLMISC::CAABBox bbox; instance.getShapeAABBox(bbox); - primitive->setReactionType(UMovePrimitive::DoNothing); - primitive->setTriggerType(UMovePrimitive::OverlapStairsTrigger); + primitive->setReactionType(UMovePrimitive::Slide); + primitive->setTriggerType(UMovePrimitive::NotATrigger); primitive->setAbsorbtion(0); primitive->setPrimitiveType(UMovePrimitive::_2DOrientedBox); @@ -2349,10 +2349,10 @@ int CLuaIHMRyzom::addShape(CLuaState &ls) primitive->setCollisionMask(MaskColPlayer | MaskColNpc | MaskColDoor); primitive->setOcclusionMask(MaskColPlayer | MaskColNpc | MaskColDoor); - primitive->setObstacle(false); + primitive->setObstacle(true); - primitive->setGlobalPosition(instance.getPos()+CVector(0, 0, 0.5f), dynamicWI); + primitive->setGlobalPosition(instance.getPos(), dynamicWI); primitive->insertInWorldImage(dynamicWI); }