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

Fix player and CGZ marker games

Browse Source
This commit is contained in:
Adam Johnson
2012-01-19 00:59:56 -05:00
parent 3bf8df58d8
commit b4e1dc352e
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp
View File

@ -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);

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

@ -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 <nil key>.",fObjectKey->GetName(),oldNode->GetName());
hsAssert(oldNode == newNode, msg);
#endif // HS_DEBUGGING
// Not Supported
}
/////////////////////////////////////////////////////////////////////