mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 19:29:09 +00:00
Merge branch 'ticket/53'
This commit is contained in:
@ -1414,7 +1414,7 @@ hsBool plArmatureMod::MsgReceive(plMessage* msg)
|
|||||||
if (fController)
|
if (fController)
|
||||||
{
|
{
|
||||||
fController->SetSubworld(subMsg->fWorldKey);
|
fController->SetSubworld(subMsg->fWorldKey);
|
||||||
DirtySynchState(kSDLAvatar, plSynchedObject::kBCastToClients);
|
DirtyPhysicalSynchState(plSynchedObject::kBCastToClients);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -217,6 +217,8 @@ bool plResponderModifier::IIsLocalOnlyCmd(plMessage* cmd)
|
|||||||
return true;
|
return true;
|
||||||
if (plCameraMsg::ConvertNoRef(cmd)) // don't want to change our camera
|
if (plCameraMsg::ConvertNoRef(cmd)) // don't want to change our camera
|
||||||
return true;
|
return true;
|
||||||
|
if (plSubWorldMsg::ConvertNoRef(cmd)) // don't want to enter a subworld (changes the avatar SDL)
|
||||||
|
return true;
|
||||||
|
|
||||||
plSoundMsg *snd = plSoundMsg::ConvertNoRef( cmd );
|
plSoundMsg *snd = plSoundMsg::ConvertNoRef( cmd );
|
||||||
if( snd != nil && snd->Cmd( plSoundMsg::kIsLocalOnly ) )
|
if( snd != nil && snd->Cmd( plSoundMsg::kIsLocalOnly ) )
|
||||||
@ -362,6 +364,7 @@ bool plResponderModifier::IContinueSending()
|
|||||||
plArmatureMod *avatar = plAvatarMgr::GetInstance()->GetLocalAvatar();
|
plArmatureMod *avatar = plAvatarMgr::GetInstance()->GetLocalAvatar();
|
||||||
if(avatar)
|
if(avatar)
|
||||||
{
|
{
|
||||||
|
swMsg->ClearReceivers();
|
||||||
swMsg->AddReceiver(avatar->GetKey());
|
swMsg->AddReceiver(avatar->GetKey());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user