Merge pull request #296 from Hoikas/detectors

Some Physics Tweaks

Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp

@@ -70,7 +70,7 @@ plPhysicalControllerCore::plPhysicalControllerCore(plKey OwnerSceneObject, float
     fMovementStrategy(nil),
     fSimLength(0.0f),
     fLocalRotation(0.0f, 0.0f, 0.0f, 1.0f),
-    fLocalPosition(0.0f, 0.0f, 0.0f),
+    fLocalPosition(0.0f, 0.0f, -2000.0f),
     fLastLocalPosition(0.0f, 0.0f, 0.0f),
     fLinearVelocity(0.0f, 0.0f, 0.0f),
     fAchievedLinearVelocity(0.0f, 0.0f, 0.0f),

Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.cpp

@@ -71,7 +71,7 @@ bool plPXPhysicalControllerCore::fDebugDisplay = false;
 int plPXPhysicalControllerCore::fPXControllersMax = 0;
 
 #define kCCTSkinWidth 0.1f
-#define kCCTStepOffset 0.6f
+#define kCCTStepOffset 0.7f
 #define kCCTZOffset ((fRadius + (fHeight / 2)) + kCCTSkinWidth)
 #define kPhysHeightCorrection 0.8f
 #define kPhysZOffset ((kCCTZOffset + (kPhysHeightCorrection / 2)) - 0.05f)

Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp

@@ -669,6 +669,10 @@ bool plPanicLinkRegion::MsgReceive(plMessage* msg)
         if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pCollMsg->fOtherKey)
             return true;
 
+        // If the avatar is disabled (flying around), don't trigger
+        if (IIsDisabledAvatar(pCollMsg->fOtherKey))
+            return false;
+
         if (pCollMsg->fEntering)
         {
             plArmatureMod* avMod = IGetAvatarModifier(pCollMsg->fOtherKey);