mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 02:27:40 -04:00
More panic link fixes
Now, we check the armature mod to see if we're REALLY linked in (the screen is not black). That way, we can be sure all delayed transforms and false hits (like how we initially spawn into the AhnySphere04 panic region) don't panic link us.
This commit is contained in:
@ -650,6 +650,7 @@ void plArmatureMod::IInitDefaults()
|
|||||||
fStealthLevel = 0;
|
fStealthLevel = 0;
|
||||||
fMouseFrameTurnStrength = 0.f;
|
fMouseFrameTurnStrength = 0.f;
|
||||||
fSuspendInputCount = 0;
|
fSuspendInputCount = 0;
|
||||||
|
fIsLinkedIn = false;
|
||||||
fMidLink = false;
|
fMidLink = false;
|
||||||
fAlreadyPanicLinking = false;
|
fAlreadyPanicLinking = false;
|
||||||
fReverseFBOnIdle = false;
|
fReverseFBOnIdle = false;
|
||||||
@ -1375,16 +1376,21 @@ hsBool plArmatureMod::MsgReceive(plMessage* msg)
|
|||||||
plLinkInDoneMsg *doneMsg = plLinkInDoneMsg::ConvertNoRef(msg);
|
plLinkInDoneMsg *doneMsg = plLinkInDoneMsg::ConvertNoRef(msg);
|
||||||
if (doneMsg)
|
if (doneMsg)
|
||||||
{
|
{
|
||||||
|
fIsLinkedIn = true;
|
||||||
IFireBehaviorNotify(plHBehavior::kBehaviorTypeLinkIn, false);
|
IFireBehaviorNotify(plHBehavior::kBehaviorTypeLinkIn, false);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
plAgeLoadedMsg *ageLoadMsg = plAgeLoadedMsg::ConvertNoRef(msg);
|
plAgeLoadedMsg *ageLoadMsg = plAgeLoadedMsg::ConvertNoRef(msg);
|
||||||
if (ageLoadMsg && ageLoadMsg->fLoaded)
|
if (ageLoadMsg)
|
||||||
{
|
{
|
||||||
// only the local player gets these
|
if (ageLoadMsg->fLoaded)
|
||||||
NetworkSynch(hsTimer::GetSysSeconds(), true);
|
{
|
||||||
EnablePhysics(true);
|
// only the local player gets these
|
||||||
|
NetworkSynch(hsTimer::GetSysSeconds(), true);
|
||||||
|
EnablePhysics(true);
|
||||||
|
} else
|
||||||
|
fIsLinkedIn = false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2518,6 +2524,11 @@ bool plArmatureMod::IsMidLink()
|
|||||||
return fMidLink;
|
return fMidLink;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool plArmatureMod::IsLinkedIn()
|
||||||
|
{
|
||||||
|
return fIsLinkedIn;
|
||||||
|
}
|
||||||
|
|
||||||
hsBool plArmatureMod::ConsumeJump()
|
hsBool plArmatureMod::ConsumeJump()
|
||||||
{
|
{
|
||||||
if (!GetInputFlag(B_CONTROL_CONSUMABLE_JUMP))
|
if (!GetInputFlag(B_CONTROL_CONSUMABLE_JUMP))
|
||||||
|
@ -318,6 +318,7 @@ public:
|
|||||||
int GetStealthLevel() const { return fStealthLevel; }
|
int GetStealthLevel() const { return fStealthLevel; }
|
||||||
|
|
||||||
bool IsOpaque();
|
bool IsOpaque();
|
||||||
|
bool IsLinkedIn();
|
||||||
bool IsMidLink();
|
bool IsMidLink();
|
||||||
hsBool ConsumeJump(); // returns true if the jump keypress was available to consume
|
hsBool ConsumeJump(); // returns true if the jump keypress was available to consume
|
||||||
|
|
||||||
@ -401,6 +402,7 @@ protected:
|
|||||||
plArmatureUpdateMsg *fUpdateMsg;
|
plArmatureUpdateMsg *fUpdateMsg;
|
||||||
|
|
||||||
// Trying to be a good lad here and align all our bools and bytes...
|
// Trying to be a good lad here and align all our bools and bytes...
|
||||||
|
bool fIsLinkedIn; // We have finished playing the LinkEffects and are properly in the age
|
||||||
bool fMidLink; // We're in between a LeaveAge and an EnterAge
|
bool fMidLink; // We're in between a LeaveAge and an EnterAge
|
||||||
bool fAlreadyPanicLinking; // Cleared when you enter an age. Prevents spamming the server with panic link requests.
|
bool fAlreadyPanicLinking; // Cleared when you enter an age. Prevents spamming the server with panic link requests.
|
||||||
bool fUnconsumedJump; // We've pressed the jump key, but haven't jumped yet
|
bool fUnconsumedJump; // We've pressed the jump key, but haven't jumped yet
|
||||||
|
@ -928,9 +928,7 @@ void plSubworldRegionDetector::Write(hsStream* stream, hsResMgr* mgr)
|
|||||||
///////////////////////////////////
|
///////////////////////////////////
|
||||||
hsBool plPanicLinkRegion::MsgReceive(plMessage* msg)
|
hsBool plPanicLinkRegion::MsgReceive(plMessage* msg)
|
||||||
{
|
{
|
||||||
plCollideMsg* pCollMsg = plCollideMsg::ConvertNoRef(msg);
|
if (plCollideMsg* pCollMsg = plCollideMsg::ConvertNoRef(msg))
|
||||||
|
|
||||||
if (pCollMsg)
|
|
||||||
{
|
{
|
||||||
if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pCollMsg->fOtherKey)
|
if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pCollMsg->fOtherKey)
|
||||||
return true;
|
return true;
|
||||||
@ -940,13 +938,17 @@ hsBool plPanicLinkRegion::MsgReceive(plMessage* msg)
|
|||||||
plArmatureMod* avMod = IGetAvatarModifier(pCollMsg->fOtherKey);
|
plArmatureMod* avMod = IGetAvatarModifier(pCollMsg->fOtherKey);
|
||||||
if (avMod)
|
if (avMod)
|
||||||
{
|
{
|
||||||
hsPoint3 kinPos;
|
if (avMod->IsLinkedIn())
|
||||||
if (avMod->GetController())
|
|
||||||
{
|
{
|
||||||
avMod->GetController()->GetKinematicPosition(kinPos);
|
hsPoint3 kinPos;
|
||||||
DetectorLogSpecial("Avatar is panic linking. KinPos at %f,%f,%f and is %s",kinPos.fX,kinPos.fY,kinPos.fZ,avMod->GetController()->IsEnabled() ? "enabled" : "disabled");
|
if (avMod->GetController())
|
||||||
}
|
{
|
||||||
avMod->PanicLink(fPlayLinkOutAnim);
|
avMod->GetController()->GetKinematicPosition(kinPos);
|
||||||
|
DetectorLogSpecial("Avatar is panic linking. KinPos at %f,%f,%f and is %s",kinPos.fX,kinPos.fY,kinPos.fZ,avMod->GetController()->IsEnabled() ? "enabled" : "disabled");
|
||||||
|
}
|
||||||
|
avMod->PanicLink(fPlayLinkOutAnim);
|
||||||
|
} else
|
||||||
|
DetectorLogRed("PANIC LINK %s before we actually linked in!", GetKey()->GetName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -237,8 +237,7 @@ class plPanicLinkRegion : public plCollisionDetector
|
|||||||
public:
|
public:
|
||||||
hsBool fPlayLinkOutAnim;
|
hsBool fPlayLinkOutAnim;
|
||||||
|
|
||||||
plPanicLinkRegion() : fPlayLinkOutAnim(true) {;}
|
plPanicLinkRegion() : fPlayLinkOutAnim(true) { }
|
||||||
~plPanicLinkRegion(){;}
|
|
||||||
|
|
||||||
|
|
||||||
virtual hsBool MsgReceive(plMessage* msg);
|
virtual hsBool MsgReceive(plMessage* msg);
|
||||||
|
Reference in New Issue
Block a user