Browse Source

Correct plAvatar fixes.

Darryl Pogue 12 years ago
parent
commit
c7e2b7a90f
  1. 6
      Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp
  2. 2
      Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp
  3. 6
      Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp

6
Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp

@ -157,8 +157,7 @@ void plAvTask::IUndoLimitPlayersInput(plArmatureMod *avatar)
// CTOR default // CTOR default
plAvSeekTask::plAvSeekTask() plAvSeekTask::plAvSeekTask()
: fAnimName(nil), : fAlign(kAlignHandle),
fAlign(kAlignHandle),
fDuration(0.25), fDuration(0.25),
fTarget(nil), fTarget(nil),
fAnimInstance(nil), fAnimInstance(nil),
@ -170,7 +169,8 @@ plAvSeekTask::plAvSeekTask()
// CTOR target, align, animName // CTOR target, align, animName
plAvSeekTask::plAvSeekTask(plKey target, plAvAlignment align, const plString& animName) plAvSeekTask::plAvSeekTask(plKey target, plAvAlignment align, const plString& animName)
: fAlign(align), : fAnimName(animName),
fAlign(align),
fDuration(0.25), fDuration(0.25),
fTarget(target), fTarget(target),
fAnimInstance(nil), fAnimInstance(nil),

2
Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp

@ -327,7 +327,7 @@ void plCoopCoordinator::IStartGuest()
const plSceneObject *targetBone = hostAv->FindBone(fSynchBone); const plSceneObject *targetBone = hostAv->FindBone(fSynchBone);
if(targetBone) if(targetBone)
{ {
plAvSeekMsg *seekMsg = new plAvSeekMsg( nil, nil,targetBone->GetKey(), 0, true, kAlignHandle, nil, false, plAvSeekMsg::kSeekFlagNoWarpOnTimeout, GetKey()); plAvSeekMsg *seekMsg = new plAvSeekMsg( nil, nil,targetBone->GetKey(), 0, true, kAlignHandle, "", false, plAvSeekMsg::kSeekFlagNoWarpOnTimeout, GetKey());
plAvTaskSeek *seekT = new plAvTaskSeek(seekMsg); plAvTaskSeek *seekT = new plAvTaskSeek(seekMsg);
plAvTaskMsg *seekM = new plAvTaskMsg(GetKey(), fGuestKey, seekT); plAvTaskMsg *seekM = new plAvTaskMsg(GetKey(), fGuestKey, seekT);
seekM->SetBCastFlag(plMessage::kPropagateToModifiers); seekM->SetBCastFlag(plMessage::kPropagateToModifiers);

6
Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp

@ -353,11 +353,7 @@ plAvBrainGeneric *plSittingModifier::IBuildSitBrain(plKey avModKey, plKey seekKe
brain->AddStage(sitStage); brain->AddStage(sitStage);
brain->AddStage(idleStage); brain->AddStage(idleStage);
brain->AddStage(standStage); brain->AddStage(standStage);
#if HS_BUILD_FOR_WIN32 *pAnimName = sitAnimName;
*pAnimName = _strdup(sitAnimName);
#else
*pAnimName = strdup(sitAnimName);
#endif
brain->SetType(plAvBrainGeneric::kSit); brain->SetType(plAvBrainGeneric::kSit);
brain->SetRecipient(GetKey()); brain->SetRecipient(GetKey());

Loading…
Cancel
Save