OOBState: Match progress for init func

Author: JoshSanch

src/SB/Game/zEntPlayerOOBState.cpp

@@ -315,88 +315,6 @@ namespace oob_state
     } // namespace
 } // namespace oob_state
 
-/*
-static class 
-{
-    // total size: 0x70
-public:
-    signed int flags; // offset 0x0, size 0x4
-    class state_type* state; // offset 0x4, size 0x4
-    unsigned char control; // offset 0x8, size 0x1
-    class state_type* states[4]; // offset 0xC, size 0x10
-    float out_time; // offset 0x1C, size 0x4
-    float max_out_time; // offset 0x20, size 0x4
-    float reset_time; // offset 0x24, size 0x4
-    class xModelInstance* model; // offset 0x28, size 0x4
-    class xVec2 loc; // offset 0x2C, size 0x8
-    class xVec2 dir; // offset 0x34, size 0x8
-    float fade_alpha; // offset 0x3C, size 0x4
-    unsigned char render_hand; // offset 0x40, size 0x1
-    unsigned char vertical; // offset 0x41, size 0x1
-    float vel; // offset 0x44, size 0x4
-    float accel; // offset 0x48, size 0x4
-    class ztalkbox* tutorial; // offset 0x4C, size 0x4
-    class
-    {
-        // total size: 0x20
-    public:
-        float near_d; // offset 0x0, size 0x4
-        float near_h; // offset 0x4, size 0x4
-        float near_pitch; // offset 0x8, size 0x4
-        float far_d; // offset 0xC, size 0x4
-        float far_h; // offset 0x10, size 0x4
-        float far_pitch; // offset 0x14, size 0x4
-        class xMat4x3* tgt_mat; // offset 0x18, size 0x4
-        class xMat4x3* tgt_omat; // offset 0x1C, size 0x4
-    } cam_data; // offset 0x50, size 0x20
-}
-shared; // size: 0x70, address: 0x4DFA90
-*/
-
-/*
-static class {
-    // total size: 0x58
-public:
-    float bottom_anim_frac; // offset 0x0, size 0x4
-    float top_anim_frac; // offset 0x4, size 0x4
-    float bottom_anim_time; // offset 0x8, size 0x4
-    float top_anim_time; // offset 0xC, size 0x4
-    float hit_anim_time; // offset 0x10, size 0x4
-    float damage_rot; // offset 0x14, size 0x4
-    float death_time; // offset 0x18, size 0x4
-    float vel_blur; // offset 0x1C, size 0x4
-    float fade_dist; // offset 0x20, size 0x4
-    float player_radius; // offset 0x24, size 0x4
-    float hook_fade_alpha; // offset 0x28, size 0x4
-    float hook_fade_time; // offset 0x2C, size 0x4
-    class {
-        // total size: 0xC
-    public:
-        float edge_zone; // offset 0x0, size 0x4
-        float sway; // offset 0x4, size 0x4
-        float decay; // offset 0x8, size 0x4
-    } horizontal; // offset 0x30, size 0xC
-    class {
-        // total size: 0x10
-    public:
-        float time; // offset 0x0, size 0x4
-        float anim_out_time; // offset 0x4, size 0x4
-        float min_dist; // offset 0x8, size 0x4
-        float max_dist; // offset 0xC, size 0x4
-    } dive; // offset 0x3C, size 0x10
-    class {
-        // total size: 0x4
-    public:
-        float speed; // offset 0x0, size 0x4
-    } camera; // offset 0x4C, size 0x4
-    class {
-        // total size: 0x8
-    public:
-        float spring; // offset 0x0, size 0x4
-        float decay; // offset 0x4, size 0x4
-    } turn; // offset 0x50, size 0x8
-} fixed; // size: 0x58, address: 0x5CDE00 */
-
 void oob_state::load_settings(xIniFile& ini)
 {
     fixed.hand_model = xIniGetString(&ini, "player.state.out_of_bounds.hand_model", "hand");
@@ -447,6 +365,44 @@ void oob_state::load_settings(xIniFile& ini)
 
 void oob_state::init()
 {
+    if ((shared.flags & 0x1) != 0x1)
+    {
+        return;
+    }
+
+    shared.flags |= 0x2;
+
+    static in_state_type in_state;
+    shared.states[0] = &in_state;
+    
+    static out_state_type out_state;
+    shared.states[1] = &out_state;
+    
+    static grab_state_type grab_state;
+    shared.states[2] = &grab_state;
+    
+    static drop_state_type drop_state;
+    shared.states[3] = &drop_state;
+
+    shared.max_out_time = fixed.out_time;
+    shared.fade_alpha = 1.0f;
+    shared.render_hand = FALSE;
+    shared.control = FALSE;
+
+    U32 bufsize;
+    void* info = xSTFindAsset(xStrHash(fixed.hand_model), &bufsize);
+
+    xModelInstance* model;
+    if (info == NULL)
+    {
+        model = NULL;
+    }
+    else
+    {
+        model = xEntLoadModel(NULL, (RpAtomic*)info);
+    }
+
+    shared.model = model;
 }
 
 namespace oob_state