X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=8a0b17d28552f3992c99874bd746d4987f59da95;hb=4b8aac300ee193cfa12011dfe0238cfe7d7ffce7;hp=8ecce407508b9c4b0adddbce198cb33055c902a5;hpb=9a751c9645f63a4e324ef2ea486efb7b669fddc5;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.h b/player.h index 8ecce40..8a0b17d 100644 --- a/player.h +++ b/player.h @@ -16,6 +16,7 @@ struct player_instance v4f qbasis; m3x3f basis, invbasis, basis_gate; + world_instance *viewable_world; /* * Camera management @@ -50,7 +51,7 @@ struct player_instance cam_land_punch, cam_land_punch_v; - teleport_gate *gate_waiting; + ent_gate *gate_waiting; /* * Input @@ -118,9 +119,9 @@ void (*_player_bind[])( player_instance *player ) = }; VG_STATIC -void (*_player_reset[])( player_instance *player, struct respawn_point *rp ) = +void (*_player_reset[])( player_instance *player, ent_spawn *rp ) = { - NULL, + player__walk_reset, player__skate_reset, NULL }; @@ -413,7 +414,6 @@ VG_STATIC void player_init(void) /* 1 */ VG_VAR_I32( cl_thirdperson ); VG_VAR_F32_PERSISTENT( fc_speed ); - /* TODO: NOT PERSISTENT */ VG_VAR_F32( k_ragdoll_limit_scale ); VG_VAR_I32( k_ragdoll_div ); VG_VAR_I32( k_ragdoll_debug_collider );