OOBState: In & Out callback matches

Author: JoshSanch

src/SB/Game/zEntPlayerOOBState.cpp

@@ -969,31 +969,99 @@ void oob_state::write_persistent(xSerial& s)
     }
 }
 
-void oob_state::in_state_type::start()
+namespace oob_state
+{
+    namespace
+    {
+        void in_state_type::start()
 {
-    shared.reset_time = FLOAT_MAX;
-    shared.out_time = FLOAT_MAX;
+            shared.reset_time = 0.0f;
+            shared.out_time = 0.0f;
     shared.control = 0;
 };
 
-void oob_state::in_state_type::stop() {
+        void in_state_type::stop()
+        {
 
-};
+        };
+
+        state_enum in_state_type::update(xScene& scene, F32& dt)
+        {
+            xSurface* floor_surf = globals.player.floor_surf;
+            U8 oob = FALSE;
+
+            if (floor_surf != NULL && !(globals.player.ControlOff & 0x8000))
+            {
+                oob = zSurfaceOutOfBounds(*floor_surf);
+                if (oob)
+                {
+                    update_max_out_time(*floor_surf);
+                }
+            }
+
+            if (!oob)
+            {
+                shared.reset_time = 0.0f;
+                shared.out_time = 0.0f;
+                shared.control = FALSE;
+
+                return STATE_IN;
+            }
 
-void oob_state::out_state_type::start()
+            return STATE_OUT;
+        };
+
+        void out_state_type::start()
 {
     shared.out_time = shared.max_out_time;
     shared.reset_time = fixed.reset_time;
 };
 
-void oob_state::out_state_type::stop() {
+        void out_state_type::stop() {
 
-};
+        };
+
+        state_enum out_state_type::update(xScene& scene, F32& dt)
+        {
+            xSurface* floor_surf = globals.player.floor_surf;
+            U8 oob = FALSE;
+
+            if (floor_surf != NULL && !(globals.player.ControlOff & 0x8000))
+            {
+                oob = zSurfaceOutOfBounds(*floor_surf);
+                if (oob)
+                {
+                    update_max_out_time(*floor_surf);
+                }
+            }
+
+            shared.out_time -= dt;
+
+            if (oob)
+            {
+                shared.reset_time = fixed.reset_time;
+                if (shared.reset_time <= 0.0f)
+                {
+                    return STATE_GRAB;
+                }
+            }
+            else 
+            {
+                if (!globals.player.JumpState)
+                {
+                    shared.reset_time = 0.0f;
+                }
+                
+                shared.reset_time -= dt;
+                if (shared.reset_time <= 0.0f)
+                {
+                    return STATE_IN;
+                }
+            }
+
+            return STATE_OUT;
+        };
 
-namespace oob_state
-{
-    namespace
-    {
         void grab_state_type::start()
         {
         }

src/SB/Game/zEntPlayerOOBState.h

@@ -28,13 +28,13 @@ namespace oob_state
         enum state_enum
         {
             STATE_INVALID = -1,
-            BEGIN_STATE,
+            BEGIN_STATE = 0,
             STATE_IN = 0,
-            STATE_OUT,
-            STATE_GRAB,
-            STATE_DROP,
-            END_STATE,
-            MAX_STATE = 0x4
+            STATE_OUT = 1,
+            STATE_GRAB = 2,
+            STATE_DROP = 3,
+            END_STATE = 4,
+            MAX_STATE = 4,
         };
 
         struct state_type