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

Merge branch 'ticket/33'

Browse Source 
closes #33
This commit is contained in:
rarified
2022-03-01 14:42:05 -07:00
parent 1a930cb47f 62089be53f
commit 4c76549fb3
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp
View File

@ -313,7 +313,7 @@ hsBool plAnimStage::ISendNotify(UInt32 notifyMask, UInt32 notifyType, plArmature
int stageNum = genBrain ? genBrain->GetStageNum(this) : -1;
msg->AddMultiStageEvent(stageNum, notifyType, armature->GetTarget(0)->GetKey());
if (! genBrain->RelayNotifyMsg(msg) )
if (stageNum < 0 || !genBrain || !genBrain->RelayNotifyMsg(msg) )
{
msg->UnRef(); // couldn't send; destroy...
}

4
Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.cpp
View File

@ -703,8 +703,8 @@ void plAvBrainClimb::ICalcProbeLengths()
{
// we assume that the up and down climbs go the same distance;
// same for the left and right climbs
plAGAnim *up = fAvMod->FindCustomAnim("ClimbUp");
plAGAnim *left = fAvMod->FindCustomAnim("ClimbLeft");
plAGAnim *up = fAvMod->FindCustomAnim("WallClimbUp");
plAGAnim *left = fAvMod->FindCustomAnim("WallClimbLeft");
hsMatrix44 upMove, leftMove;

24
Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp
View File

@ -75,6 +75,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "../plInputCore/plInputDevice.h"
#include "../plMath/plRandom.h"
#include "../plPipeline/plDebugText.h"
#include "../plNetClient/plNetClientMgr.h"
#include "../plNetClient/plNetLinkingMgr.h"
#include "../plMessage/plAvatarMsg.h"
@ -494,12 +495,20 @@ hsBool plAvBrainHuman::IHandleClimbMsg(plClimbMsg *msg)
bool isStartClimb = msg->fCommand == plClimbMsg::kStartClimbing;
if(isStartClimb)
{
// let's build a seek task to get us to the attach point
plKey seekTarget = msg->fTarget;
plAvTaskSeek *seekTask = TRACKED_NEW plAvTaskSeek(seekTarget);
QueueTask(seekTask);
// Warp the player to the Seekpoint
plSceneObject *avatarObj = plSceneObject::ConvertNoRef(plNetClientMgr::GetInstance()->GetLocalPlayer());
plSceneObject *obj = plSceneObject::ConvertNoRef(msg->fTarget->ObjectIsLoaded());
plArmatureMod *localAvatar = plAvatarMgr::GetInstance()->GetLocalAvatar();
plArmatureMod *climbAvatar = plArmatureMod::ConvertNoRef(fArmature);
if (climbAvatar == localAvatar) // is it our avatar who has to seek?
{
hsMatrix44 target = obj->GetLocalToWorld();
plWarpMsg *warp = TRACKED_NEW plWarpMsg(NULL, avatarObj->GetKey(), plWarpMsg::kFlushTransform, target);
warp->SetBCastFlag(plMessage::kNetPropagate);
plgDispatch::MsgSend(warp);
}
// now a brain task to start the actual climb.
// build the Climb brain
plAvBrainClimb::Mode startMode;
switch(msg->fDirection)
{
@ -515,10 +524,11 @@ hsBool plAvBrainHuman::IHandleClimbMsg(plClimbMsg *msg)
case plClimbMsg::kRight:
startMode = plAvBrainClimb::kMountingRight;
break;
default:
break;
}
plAvBrainClimb *brain = TRACKED_NEW plAvBrainClimb(startMode);
plAvTaskBrain *brainTask = TRACKED_NEW plAvTaskBrain(brain);
QueueTask(brainTask);
climbAvatar->PushBrain(brain);
}
// ** potentially controversial:
// It's fairly easy for a human brain to hit a climb trigger - like when falling off a wall.