From b4e1dc352e33a6f866021ee8547c1572e7efdb66 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Thu, 19 Jan 2012 00:59:56 -0500 Subject: [PATCH] Fix player and CGZ marker games --- .../Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp | 1 + Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp index b4895463..270c96b0 100644 --- a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp +++ b/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); diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp index 343d757c..99a210df 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp @@ -827,6 +827,7 @@ void plPXPhysical::ApplyHitForce() void plPXPhysical::ISetTransformGlobal(const hsMatrix44& l2w) { hsAssert(fActor->isDynamic(), "Shouldn't move a static actor"); + fActor->wakeUp(); NxMat34 mat; @@ -1000,15 +1001,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 } /////////////////////////////////////////////////////////////////////