Fix teleporter test stopping prematurely upon seeing an "inside" condition

git-svn-id: https://s.snth.net/svn/neverball/trunk@3338 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/share/solid_all.c b/share/solid_all.c
index 871b4a5..aee0413 100644 (file)
--- a/share/solid_all.c
+++ b/share/solid_all.c
@@ -417,7 +417,7 @@ int sol_jump_test(struct s_file *fp, float *p, int ui)
 {
     const float *ball_p = fp->uv[ui].p;
     const float  ball_r = fp->uv[ui].r;
-    int ji;
+    int ji, in = 0;
 
     for (ji = 0; ji < fp->jc; ji++)
     {
@@ -442,6 +442,8 @@ int sol_jump_test(struct s_file *fp, float *p, int ui)
             ball_p[1] > jp->p[1] &&
             ball_p[1] < jp->p[1] + JUMP_HEIGHT / 2)
         {
+            in = 1;
+
             if (d <= 0.0f)
             {
                 p[0] = jp->q[0] + (ball_p[0] - jp->p[0]);
@@ -450,11 +452,9 @@ int sol_jump_test(struct s_file *fp, float *p, int ui)
 
                 return JUMP_TRIGGER;
             }
-            else
-                return JUMP_INSIDE;
         }
     }
-    return JUMP_OUTSIDE;
+    return in ? JUMP_INSIDE : JUMP_OUTSIDE;
 }
 
 /*