X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=ef78e31645475117a4573609d16ed7a33dd1757b;hb=9723ed75d4da703c91603d251816ce476a1e9098;hp=63cd302d673f6f518db6e0130a1b88899ef14b01;hpb=d171c9ad5de05c9ac8563fcf9f23760b93fb50f8;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player.h b/player.h
index 63cd302..ef78e31 100644
--- a/player.h
+++ b/player.h
@@ -10,6 +10,7 @@ enum player_subsystem{
    k_player_subsystem_skate = 1,
    k_player_subsystem_dead = 2,
    k_player_subsystem_drive = 3,
+   k_player_subsystem_basic_info = 4,
    k_player_subsystem_max,
    k_player_subsystem_invalid = 255
 };
@@ -55,10 +56,14 @@ struct player_subsystem_interface{
 #include "player_ragdoll.h"
 #include "player_render.h"
 #include "player_model.h"
+
+/* subsystem headers */
 #include "player_walk.h"
 #include "player_skate.h"
 #include "player_dead.h"
 #include "player_drive.h"
+#include "player_basic_info.h"
+
 #include "player_replay.h"
 
 #define PLAYER_REWIND_FRAMES 60*4
@@ -73,12 +78,6 @@ struct {
    rigidbody rb;
    v3f angles;
 
-#if 0
-   v4f   qbasis;
-   m3x3f basis, invbasis, basis_gate;
-   world_instance *viewable_world;
-#endif
-
    /*
     * Camera management
     * ---------------------------
@@ -170,7 +169,8 @@ struct player_subsystem_interface static *player_subsystems[] = {
    [k_player_subsystem_walk]  = &player_subsystem_walk,
    [k_player_subsystem_dead]  = &player_subsystem_dead,
    [k_player_subsystem_drive] = &player_subsystem_drive,
-   [k_player_subsystem_skate] = &player_subsystem_skate
+   [k_player_subsystem_skate] = &player_subsystem_skate,
+   [k_player_subsystem_basic_info]=&player_subsystem_basic_info
 };
 
 /*
@@ -192,6 +192,7 @@ static void player__pass_gate( u32 id );
 static void player__im_gui(void);
 static void player__setpos( v3f pos );
 static void player__spawn( ent_spawn *rp );
+static void player__clean_refs(void);
 static void player__reset(void);
 static void player__kill(void);
 static void player__begin_holdout( v3f offset );