diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp index 9d809231..f92b0ccd 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp @@ -157,8 +157,7 @@ void plAvTask::IUndoLimitPlayersInput(plArmatureMod *avatar) // CTOR default plAvSeekTask::plAvSeekTask() -: fAnimName(nil), - fAlign(kAlignHandle), +: fAlign(kAlignHandle), fDuration(0.25), fTarget(nil), fAnimInstance(nil), @@ -170,7 +169,8 @@ plAvSeekTask::plAvSeekTask() // CTOR target, align, animName plAvSeekTask::plAvSeekTask(plKey target, plAvAlignment align, const plString& animName) -: fAlign(align), +: fAnimName(animName), + fAlign(align), fDuration(0.25), fTarget(target), fAnimInstance(nil), diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp index 73c46b7c..a1671e36 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp @@ -327,7 +327,7 @@ void plCoopCoordinator::IStartGuest() const plSceneObject *targetBone = hostAv->FindBone(fSynchBone); 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); plAvTaskMsg *seekM = new plAvTaskMsg(GetKey(), fGuestKey, seekT); seekM->SetBCastFlag(plMessage::kPropagateToModifiers); diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp index 870cf867..c644f815 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp @@ -353,11 +353,7 @@ plAvBrainGeneric *plSittingModifier::IBuildSitBrain(plKey avModKey, plKey seekKe brain->AddStage(sitStage); brain->AddStage(idleStage); brain->AddStage(standStage); -#if HS_BUILD_FOR_WIN32 - *pAnimName = _strdup(sitAnimName); -#else - *pAnimName = strdup(sitAnimName); -#endif + *pAnimName = sitAnimName; brain->SetType(plAvBrainGeneric::kSit); brain->SetRecipient(GetKey());