X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;fp=player.h;h=ef78e31645475117a4573609d16ed7a33dd1757b;hb=15c0b8cb57ed5d10814103eaa0b5c06e8ae117e4;hp=939033a5296cca74b86692ac701279453f7b7a07;hpb=bdd98e4458be4a143cd415e5077b373129b1b0d9;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.h b/player.h index 939033a..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 }; /*