switch to entity list

[carveJwlIkooP6JGAAIwe30JlM.git] / player.c

diff --git a/player.c b/player.c
index 4746e4fb4c774e0777cc46cc7911dd98f20d2fee..b67e050abd8807c832b1cc4fa0cd86f5025acc7a 100644 (file)
--- a/player.c
+++ b/player.c
@@ -7,6 +7,7 @@
 #include "input.h"
 #include "world.h"
 #include "audio.h"
+#include "player_replay.h"
 
 VG_STATIC int localplayer_cmd_respawn( int argc, const char *argv[] )
 {
@@ -166,11 +167,11 @@ void player__pass_gate( player_instance *player, ent_gate *gate )
    if( gate->type == k_gate_type_nonlocel )
       world_static.active_world = gate->target;
 
-   world_volumes.inside = 0;
-
    audio_lock();
    audio_oneshot( &audio_gate_pass, 1.0f, 0.0f );
    audio_unlock();
+
+   replay_clear( &skaterift.replay );
 }
 
 VG_STATIC void player_apply_transport_to_cam( m4x3f transport )
@@ -222,7 +223,7 @@ PLAYER_API void player__im_gui( player_instance *player ){
    g_player_debugger[0] = box[0];
    g_player_debugger[1] = 0;
    g_player_debugger[2] = 300;
-   g_player_debugger[3] = 16;
+   g_player_debugger[3] = 32;
 
    player__debugtext( 2, "director" );
    player__debugtext( 1, "activity: %s", 
@@ -240,7 +241,7 @@ PLAYER_API void player__im_gui( player_instance *player ){
    if( _player_im_gui[ player->subsystem ] )
       _player_im_gui[ player->subsystem ]( player );
 
-   replay_debug_info( player );
+   skaterift_replay_debug_info();
 }
 
 VG_STATIC void global_skateshop_exit(void);
@@ -252,6 +253,7 @@ PLAYER_API void player__setpos( player_instance *player, v3f pos ){
 }
 
 PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp ){
+   replay_clear( &skaterift.replay );
    player__setpos( player, rp->transform.co );
    v3_zero( player->rb.w );
    q_identity( player->rb.q );
@@ -277,6 +279,11 @@ PLAYER_API void player__kill( player_instance *player ){
    
 }
 
+PLAYER_API void player__begin_holdout( player_instance *player ){
+   memcpy( &player->holdout_pose, &player->pose, sizeof(player->pose) );
+   player->holdout_time = 1.0f;
+}
+
 /* implementation */
 #include "player_common.c"
 #include "player_walk.c"