X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.c;h=0e45e996ca62efedbef1fc97d30e999b7ffe71ec;hb=b270d9efa9bedb7ca0813acffc1632f84900c0de;hp=b0888ea6e00249b4040aec7b64ea900605254c96;hpb=bf8478e3656ae729248a594a57d111f08bed41e0;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.c b/player.c index b0888ea..0e45e99 100644 --- a/player.c +++ b/player.c @@ -164,11 +164,9 @@ void player__pass_gate( player_instance *player, ent_gate *gate ) m4x3_mulv( gate->transport, player->cam.pos, player->cam.pos ); - if( gate->type == k_gate_type_nonlocel ) + if( gate->flags & k_ent_gate_nonlocal ) world_static.active_world = gate->target; - world_volumes.inside = 0; - audio_lock(); audio_oneshot( &audio_gate_pass, 1.0f, 0.0f ); audio_unlock(); @@ -227,6 +225,10 @@ PLAYER_API void player__im_gui( player_instance *player ){ g_player_debugger[2] = 300; g_player_debugger[3] = 32; + player__debugtext( 2, "world (%u)", world_static.active_world ); + player__debugtext( 1, "model version: %u", + world_current_instance()->meta.info.version ); + player__debugtext( 2, "director" ); player__debugtext( 1, "activity: %s", (const char *[]){ [k_skaterift_menu] = "menu", @@ -281,6 +283,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"