Fixed bug where flying creatures would rise/fall, tracking the player…

… when a camera.
skyjake · Feb 4, 2007 · d72ee5f · d72ee5f
1 parent 29583e4
commit d72ee5f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/doomsday/plugins/doom64tc/src/p_mobj.c b/doomsday/plugins/doom64tc/src/p_mobj.c
@@ -442,7 +442,7 @@ void P_ZMovement(mobj_t *mo)
        mo->onmobj && mo->pos[VZ] > mo->onmobj->pos[VZ] + mo->onmobj->height)
         mo->onmobj = NULL; // We were on a mobj, we are NOT now.
 
-    if(mo->flags & MF_FLOAT && mo->target)
+    if(mo->flags & MF_FLOAT && mo->target && !P_IsCamera(mo->target))
     {
         // float down towards target if too close
         if(!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))

diff --git a/doomsday/plugins/jdoom/src/p_mobj.c b/doomsday/plugins/jdoom/src/p_mobj.c
@@ -423,7 +423,7 @@ void P_ZMovement(mobj_t *mo)
        mo->onmobj && mo->pos[VZ] > mo->onmobj->pos[VZ] + mo->onmobj->height)
         mo->onmobj = NULL; // We were on a mobj, we are NOT now.
 
-    if(mo->flags & MF_FLOAT && mo->target)
+    if(mo->flags & MF_FLOAT && mo->target && !P_IsCamera(mo->target))
     {
         // float down towards target if too close
         if(!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))

diff --git a/doomsday/plugins/jheretic/src/p_mobj.c b/doomsday/plugins/jheretic/src/p_mobj.c
@@ -563,7 +563,7 @@ void P_ZMovement(mobj_t *mo)
        mo->onmobj && mo->pos[VZ] > mo->onmobj->pos[VZ] + mo->onmobj->height)
         mo->onmobj = NULL; // We were on a mobj, we are NOT now.
 
-    if(mo->flags & MF_FLOAT && mo->target)
+    if(mo->flags & MF_FLOAT && mo->target && !P_IsCamera(mo->target))
     {
         // float down towards target if too close
         if(!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))

diff --git a/doomsday/plugins/jhexen/src/p_mobj.c b/doomsday/plugins/jhexen/src/p_mobj.c
@@ -799,7 +799,7 @@ void P_ZMovement(mobj_t *mo)
     // adjust height
     //
     mo->pos[VZ] += mo->momz;
-    if(mo->flags & MF_FLOAT && mo->target)
+    if(mo->flags & MF_FLOAT && mo->target && !P_IsCamera(mo->target))
     {                           // float down towards target if too close
         if(!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))
         {

diff --git a/doomsday/plugins/wolftc/src/p_mobj.c b/doomsday/plugins/wolftc/src/p_mobj.c
@@ -421,7 +421,7 @@ void P_ZMovement(mobj_t *mo)
        mo->onmobj && mo->pos[VZ] > mo->onmobj->pos[VZ] + mo->onmobj->height)
         mo->onmobj = NULL; // We were on a mobj, we are NOT now.
 
-    if(mo->flags & MF_FLOAT && mo->target)
+    if(mo->flags & MF_FLOAT && mo->target && !P_IsCamera(mo->target))
     {
         // float down towards target if too close
         if(!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))