Fix accidental switch/teleporter behavior changes

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

diff --git a/ball/game_server.c b/ball/game_server.c
index 3632287..18a8f58 100644 (file)
--- a/ball/game_server.c
+++ b/ball/game_server.c
@@ -683,12 +683,13 @@ static int game_update_state(int bt)
 
     /* Test for a switch. */
 
-    if (sol_swch_test(fp, 0))
+    if (sol_swch_test(fp, 0) == SWCH_TRIGGER)
         audio_play(AUD_SWITCH, 1.f);
 
     /* Test for a jump. */
 
-    if (jump_e == 1 && jump_b == 0 && sol_jump_test(fp, jump_p, 0) == 1)
+    if (jump_e == 1 && jump_b == 0 && (sol_jump_test(fp, jump_p, 0) ==
+                                       JUMP_TRIGGER))
     {
         jump_b  = 1;
         jump_e  = 0;
@@ -701,7 +702,8 @@ static int game_update_state(int bt)
 
         game_cmd_jump(1);
     }
-    if (jump_e == 0 && jump_b == 0 && sol_jump_test(fp, jump_p, 0) == 0)
+    if (jump_e == 0 && jump_b == 0 && (sol_jump_test(fp, jump_p, 0) ==
+                                       JUMP_OUTSIDE))
     {
         jump_e = 1;
         game_cmd_jump(0);

diff --git a/putt/game.c b/putt/game.c
index ca65764..cebb5dd 100644 (file)
--- a/putt/game.c
+++ b/putt/game.c
@@ -482,7 +482,8 @@ static int game_update_state(float dt)
 
     /* Test for a jump. */
 
-    if (jump_e == 1 && jump_b == 0 && sol_jump_test(fp, jump_p, ball) == 1)
+    if (jump_e == 1 && jump_b == 0 && (sol_jump_test(fp, jump_p, ball) ==
+                                       JUMP_TRIGGER))
     {
         jump_b  = 1;
         jump_e  = 0;
@@ -490,8 +491,11 @@ static int game_update_state(float dt)
 
         audio_play(AUD_JUMP, 1.f);
     }
-    if (jump_e == 0 && jump_b == 0 &&  sol_jump_test(fp, jump_p, ball) == 0)
+    if (jump_e == 0 && jump_b == 0 && (sol_jump_test(fp, jump_p, ball) ==
+                                       JUMP_OUTSIDE))
+    {
         jump_e = 1;
+    }
 
     /* Test for fall-out. */
 

diff --git a/share/solid_all.c b/share/solid_all.c
index aa34878..871b4a5 100644 (file)
--- a/share/solid_all.c
+++ b/share/solid_all.c
@@ -411,8 +411,7 @@ struct s_goal *sol_goal_test(struct s_file *fp, float *p, int ui)
 }
 
 /*
- * Test for a ball entering a  teleporter. Return 1 if true and fill P
- * with the destination position, return 0 otherwise.
+ * Test for a ball entering a teleporter.
  */
 int sol_jump_test(struct s_file *fp, float *p, int ui)
 {
@@ -423,30 +422,43 @@ int sol_jump_test(struct s_file *fp, float *p, int ui)
     for (ji = 0; ji < fp->jc; ji++)
     {
         struct s_jump *jp = fp->jv + ji;
-        float r[3];
+        float d, r[3];
 
         r[0] = ball_p[0] - jp->p[0];
         r[1] = ball_p[2] - jp->p[2];
         r[2] = 0;
 
-        if (v_len(r) + ball_r < jp->r &&
+        /* Distance of the far side from the edge of the halo. */
+
+        d = v_len(r) + ball_r - jp->r;
+
+        /*
+         * The "inside"  distance, which must be  cleared before being
+         * able to trigger a  teleporter, is the ball's radius.  (This
+         * is different from switches.)
+         */
+
+        if (d <= ball_r &&
             ball_p[1] > jp->p[1] &&
             ball_p[1] < jp->p[1] + JUMP_HEIGHT / 2)
         {
-            p[0] = jp->q[0] + (ball_p[0] - jp->p[0]);
-            p[1] = jp->q[1] + (ball_p[1] - jp->p[1]);
-            p[2] = jp->q[2] + (ball_p[2] - jp->p[2]);
+            if (d <= 0.0f)
+            {
+                p[0] = jp->q[0] + (ball_p[0] - jp->p[0]);
+                p[1] = jp->q[1] + (ball_p[1] - jp->p[1]);
+                p[2] = jp->q[2] + (ball_p[2] - jp->p[2]);
 
-            return 1;
+                return JUMP_TRIGGER;
+            }
+            else
+                return JUMP_INSIDE;
         }
     }
-    return 0;
+    return JUMP_OUTSIDE;
 }
 
 /*
- * Test for a ball entering a  switch. Return 1 if a visible switch is
- * activated,  return 0  otherwise  (no switch  is  activated or  only
- * invisible switches).
+ * Test for a ball entering a switch.
  */
 int sol_swch_test(struct s_file *fp, int ui)
 {
@@ -455,7 +467,7 @@ int sol_swch_test(struct s_file *fp, int ui)
 
     union cmd cmd;
 
-    int xi, rc = 0;
+    int xi, rc = SWCH_OUTSIDE;
 
     for (xi = 0; xi < fp->xc; xi++)
     {
@@ -465,17 +477,27 @@ int sol_swch_test(struct s_file *fp, int ui)
 
         if (xp->t0 == 0 || xp->f == xp->f0)
         {
-            float r[3];
+            float d, r[3];
 
             r[0] = ball_p[0] - xp->p[0];
             r[1] = ball_p[2] - xp->p[2];
             r[2] = 0;
 
-            if (v_len(r) + ball_r < xp->r &&
+            /* Distance of the far side from the edge of the halo. */
+
+            d = v_len(r) + ball_r - xp->r;
+
+            /*
+             * The  "inside" distance,  which must  be  cleared before
+             * being able to trigger a switch, is the ball's diameter.
+             * (This is different from teleporters.)
+             */
+
+            if (d <= ball_r * 2 &&
                 ball_p[1] > xp->p[1] &&
                 ball_p[1] < xp->p[1] + SWCH_HEIGHT / 2)
             {
-                if (!xp->e)
+                if (!xp->e && d <= 0.0f)
                 {
                     int pi = xp->pi;
                     int pj = xp->pi;
@@ -523,7 +545,7 @@ int sol_swch_test(struct s_file *fp, int ui)
                     /* If visible, set the result. */
 
                     if (!xp->i)
-                        rc = 1;
+                        rc = SWCH_TRIGGER;
                 }
             }
 

diff --git a/share/solid_all.h b/share/solid_all.h
index f7011a7..5887750 100644 (file)
--- a/share/solid_all.h
+++ b/share/solid_all.h
@@ -20,6 +20,20 @@ void sol_swch_step(struct s_file *fp, float dt);
 void sol_body_step(struct s_file *fp, float dt);
 void sol_ball_step(struct s_file *fp, float dt);
 
+enum
+{
+    JUMP_OUTSIDE = 0,
+    JUMP_TRIGGER,
+    JUMP_INSIDE
+};
+
+enum
+{
+    SWCH_OUTSIDE = 0,
+    SWCH_TRIGGER,
+    SWCH_INSIDE
+};
+
 int            sol_item_test(struct s_file *fp, float *p, float item_r);
 struct s_goal *sol_goal_test(struct s_file *fp, float *p, int ui);
 int            sol_jump_test(struct s_file *fp, float *p, int ui);