projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some niceer ui stuff
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.c
diff --git
a/player.c
b/player.c
index d248aec116445aa558842503ecb521c4cc950680..0e45e996ca62efedbef1fc97d30e999b7ffe71ec 100644
(file)
--- a/
player.c
+++ b/
player.c
@@
-7,6
+7,7
@@
#include "input.h"
#include "world.h"
#include "audio.h"
#include "input.h"
#include "world.h"
#include "audio.h"
+#include "player_replay.h"
VG_STATIC int localplayer_cmd_respawn( int argc, const char *argv[] )
{
VG_STATIC int localplayer_cmd_respawn( int argc, const char *argv[] )
{
@@
-163,14
+164,14
@@
void player__pass_gate( player_instance *player, ent_gate *gate )
m4x3_mulv( gate->transport, player->cam.pos, player->cam.pos );
m4x3_mulv( gate->transport, player->cam.pos, player->cam.pos );
- if( gate->
type == k_gate_type_nonloce
l )
+ if( gate->
flags & k_ent_gate_nonloca
l )
world_static.active_world = gate->target;
world_static.active_world = gate->target;
- world_volumes.inside = 0;
-
audio_lock();
audio_oneshot( &audio_gate_pass, 1.0f, 0.0f );
audio_unlock();
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 )
}
VG_STATIC void player_apply_transport_to_cam( m4x3f transport )
@@
-224,6
+225,10
@@
PLAYER_API void player__im_gui( player_instance *player ){
g_player_debugger[2] = 300;
g_player_debugger[3] = 32;
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",
player__debugtext( 2, "director" );
player__debugtext( 1, "activity: %s",
(const char *[]){ [k_skaterift_menu] = "menu",
@@
-252,6
+257,7
@@
PLAYER_API void player__setpos( player_instance *player, v3f pos ){
}
PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp ){
}
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 );
player__setpos( player, rp->transform.co );
v3_zero( player->rb.w );
q_identity( player->rb.q );
@@
-277,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"
/* implementation */
#include "player_common.c"
#include "player_walk.c"