diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp index 295a8412..6fde6fff 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp @@ -151,6 +151,7 @@ void pfMarkerInfo::Show(bool show) plEnableMsg* msg = TRACKED_NEW plEnableMsg; msg->SetBCastFlag(plMessage::kPropagateToChildren); msg->SetCmd(plEnableMsg::kDrawable); + msg->SetCmd(plEnableMsg::kPhysical); msg->SetCmd(show ? plEnableMsg::kEnable : plEnableMsg::kDisable); msg->SetSender(pfMarkerMgr::Instance()->GetKey()); msg->Send(fKey); @@ -263,4 +264,4 @@ void pfMarkerInfo::IPlaySound(bool place) msg->SetSender(pfMarkerMgr::Instance()->GetKey()); msg->Send(ai->GetKey()); } -} \ No newline at end of file +} diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp index a5793e53..23b1b13f 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp @@ -825,6 +825,7 @@ void plPXPhysical::ApplyHitForce() void plPXPhysical::ISetTransformGlobal(const hsMatrix44& l2w) { hsAssert(fActor->isDynamic(), "Shouldn't move a static actor"); + fActor->wakeUp(); NxMat34 mat; @@ -996,15 +997,7 @@ plKey plPXPhysical::GetSceneNode() const void plPXPhysical::SetSceneNode(plKey newNode) { -#ifdef HS_DEBUGGING - plKey oldNode = GetSceneNode(); - char msg[1024]; - if (newNode) - sprintf(msg,"Physical object %s cannot change scenes. Already in %s, trying to switch to %s.",fObjectKey->GetName(),oldNode->GetName(),newNode->GetName()); - else - sprintf(msg,"Physical object %s cannot change scenes. Already in %s, trying to switch to .",fObjectKey->GetName(),oldNode->GetName()); - hsAssert(oldNode == newNode, msg); -#endif // HS_DEBUGGING + // Not Supported } /////////////////////////////////////////////////////////////////////