OOBState: Additional matches with idiot_level_data fix

Author: JoshSanch

src/SB/Game/zEntPlayerOOBState.cpp

@@ -5,6 +5,7 @@
 #include "xMathInlines.h"
 #include "zSurface.h"
 #include "zRenderState.h"
+#include "zEntPlayerBungeeState.h"
 
 #include <types.h>
 #include <rwplcore.h>
@@ -637,10 +638,6 @@ namespace oob_state
             this->updatess[9] = &supdate_fade_out;
         }
 
-        grab_state_type::tutorial_callback::tutorial_callback(grab_state_type& owner) : owner(owner)
-        {
-        }
-
         grab_state_type::substate_enum grab_state_type::supdate_fade_out(grab_state_type& gst,
                                                                          xScene& scene, F32& dt)
         {
@@ -858,10 +855,35 @@ namespace oob_state
         {
             return SS_BEGIN_WAIT;
         };
+
+        grab_state_type::tutorial_callback::tutorial_callback(grab_state_type& owner) : owner(owner)
+        {
+        }
+        
+        out_state_type::out_state_type() : state_type(STATE_OUT)
+        {
+        }
+
+        in_state_type::in_state_type() : state_type(STATE_IN)
+        {
+        }
+
+        void state_type::start()
+        {
+        };
+
+        void state_type::stop()
+        {
+        };
     } // namespace
 } // namespace oob_state
 
-float oob_state::oob_timer()
+bool oob_state::IsPlayerInControl()
+{
+    return oob_state::shared.control == 0;
+}
+
+F32 oob_state::oob_timer()
 {
     if (shared.reset_time == fixed.reset_time)
     {
@@ -871,6 +893,82 @@ float oob_state::oob_timer()
     return -1.0f;
 }
 
+bool oob_state::render()
+{
+    if ((shared.flags & 0x3) != 3)
+    {
+        return false;
+    }
+
+    if (!shared.control)
+    {
+        return false;
+    }
+
+    xLightKit_Enable(globals.player.ent.lightKit, globals.currWorld);
+    xEntRender(&globals.player.ent);
+    xLightKit_Enable(NULL, globals.currWorld);
+
+    return true;
+}
+
+void oob_state::fx_render()
+{
+    if ((shared.flags & 0x3) != 3)
+    {
+        return;
+    }
+
+    if (shared.control && shared.fade_alpha < 1.0f)
+    {
+        render_fade();
+        render_ghost();
+    }
+    
+    if (shared.render_hand && shared.model != NULL)
+    {
+        render_hand();
+    }
+}
+
+void oob_state::force_start()
+{
+    if ((shared.flags & 0x7) == 0x3 && !bungee_state::active())
+    {
+        if (globals.player.ControlOff & 0x8000)
+        {
+            shared.flags |= 0x8;
+            oob_player_teleported = false;
+        }
+        else
+        {
+            shared.flags &= ~0x8;
+            shared.state->stop();
+            shared.state = shared.states[2];
+            shared.state->start();
+        }
+    }
+}
+
+void oob_state::read_persistent(xSerial& s)
+{
+    for (U32 i = 0; i < 6; i++)
+    {
+        S32 val;
+        s.Read_b1(&val);
+
+        idiot_levels[i].triggered = (bool)val;
+    }
+}
+
+void oob_state::write_persistent(xSerial& s)
+{
+    for (U32 i = 0; i < 6; i++)
+    {
+        s.Write_b1((bool)idiot_levels[i].triggered);
+    }
+}
+
 void oob_state::in_state_type::start()
 {
     shared.reset_time = FLOAT_MAX;
@@ -892,19 +990,6 @@ void oob_state::out_state_type::stop() {
 
 };
 
-void oob_state::state_type::start() {
-
-};
-
-void oob_state::state_type::stop() {
-
-};
-
-bool oob_state::IsPlayerInControl()
-{
-    return oob_state::shared.control == 0;
-}
-
 namespace oob_state
 {
     namespace

src/SB/Game/zEntPlayerOOBState.h

@@ -13,6 +13,7 @@ namespace oob_state
 {
     bool render();
     void fx_render();
+    void force_start();
     void read_persistent(xSerial& s);
     void write_persistent(xSerial& s);
     void load_settings(xIniFile& ini);
@@ -43,19 +44,23 @@ namespace oob_state
             state_type(state_enum state);
             virtual void start();
             virtual void stop();
-            virtual state_enum update(xScene& scene, F32& dt);
+            virtual state_enum update(xScene& scene, F32& dt) = 0;
         };
 
         struct in_state_type : state_type
         {
-            void start();
-            void stop();
+            in_state_type();
+            virtual void start();
+            virtual void stop();
+            virtual state_enum update(xScene& scene, F32& dt);
         };
 
         struct out_state_type : state_type
         {
-            void start();
-            void stop();
+            out_state_type();
+            virtual void start();
+            virtual void stop();
+            virtual state_enum update(xScene& scene, F32& dt);
         };
 
         struct grab_state_type : state_type
@@ -251,7 +256,7 @@ namespace oob_state
 
     struct idiot_level_data
     {
-        bool triggered; // offset 0x0, size 0x1
+        U8 triggered; // offset 0x0, size 0x1
         U32 scene; // offset 0x4, size 0x4
     };