OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix Player and CGZ marker games (Cherry picked from b4e1dc352e)

Browse Source 
Date:   Thu Jan 19 00:59:56 2012 -0500

    Fix player and CGZ marker games
This commit is contained in:
Adam Johnson
2020-04-12 14:55:14 -06:00
committed by rarified
parent 906cebbd25
commit 340a538c96
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp
View File

@ -151,6 +151,7 @@ void pfMarkerInfo::Show(bool show)
plEnableMsg* msg = TRACKED_NEW plEnableMsg; plEnableMsg* msg = TRACKED_NEW plEnableMsg;
msg->SetBCastFlag(plMessage::kPropagateToChildren); msg->SetBCastFlag(plMessage::kPropagateToChildren);
msg->SetCmd(plEnableMsg::kDrawable); msg->SetCmd(plEnableMsg::kDrawable);
msg->SetCmd(plEnableMsg::kPhysical);
msg->SetCmd(show ? plEnableMsg::kEnable : plEnableMsg::kDisable); msg->SetCmd(show ? plEnableMsg::kEnable : plEnableMsg::kDisable);
msg->SetSender(pfMarkerMgr::Instance()->GetKey()); msg->SetSender(pfMarkerMgr::Instance()->GetKey());
msg->Send(fKey); msg->Send(fKey);
@ -263,4 +264,4 @@ void pfMarkerInfo::IPlaySound(bool place)
msg->SetSender(pfMarkerMgr::Instance()->GetKey()); msg->SetSender(pfMarkerMgr::Instance()->GetKey());
msg->Send(ai->GetKey()); msg->Send(ai->GetKey());
} }
} }

11
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp
View File

@ -825,6 +825,7 @@ void plPXPhysical::ApplyHitForce()
void plPXPhysical::ISetTransformGlobal(const hsMatrix44& l2w) void plPXPhysical::ISetTransformGlobal(const hsMatrix44& l2w)
{ {
hsAssert(fActor->isDynamic(), "Shouldn't move a static actor"); hsAssert(fActor->isDynamic(), "Shouldn't move a static actor");
fActor->wakeUp();
NxMat34 mat; NxMat34 mat;
@ -996,15 +997,7 @@ plKey plPXPhysical::GetSceneNode() const
void plPXPhysical::SetSceneNode(plKey newNode) void plPXPhysical::SetSceneNode(plKey newNode)
{ {
#ifdef HS_DEBUGGING // Not Supported
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 <nil key>.",fObjectKey->GetName(),oldNode->GetName());
hsAssert(oldNode == newNode, msg);
#endif // HS_DEBUGGING
} }
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////