projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.c
diff --git
a/player.c
b/player.c
index 12f8cbdc1bf11e7dcba48e2dd263c3fd4b9738cd..c79132f7e53fa6c2ed5db5809ee180108326999b 100644
(file)
--- a/
player.c
+++ b/
player.c
@@
-165,7
+165,7
@@
void player__pass_gate( player_instance *player, ent_gate *gate )
m4x3_mulv( gate->transport, player->cam.pos, player->cam.pos );
if( gate->flags & k_ent_gate_nonlocal )
m4x3_mulv( gate->transport, player->cam.pos, player->cam.pos );
if( gate->flags & k_ent_gate_nonlocal )
- world_s
tatic.active_instance = gate->target
;
+ world_s
et_active_instance( gate->target )
;
audio_lock();
audio_oneshot( &audio_gate_pass, 1.0f, 0.0f );
audio_lock();
audio_oneshot( &audio_gate_pass, 1.0f, 0.0f );
@@
-246,7
+246,8
@@
PLAYER_API void player__im_gui( player_instance *player ){
(const char *[]){ [k_skaterift_menu] = "menu",
[k_skaterift_replay] = "replay",
[k_skaterift_ent_focus] = "ent_focus",
(const char *[]){ [k_skaterift_menu] = "menu",
[k_skaterift_replay] = "replay",
[k_skaterift_ent_focus] = "ent_focus",
- [k_skaterift_default] = "default"
+ [k_skaterift_default] = "default",
+ [k_skaterift_respawning]= "respawning",
} [skaterift.activity] );
player__debugtext( 1, "time_rate: %.4f", skaterift.time_rate );
} [skaterift.activity] );
player__debugtext( 1, "time_rate: %.4f", skaterift.time_rate );
@@
-282,6
+283,9
@@
PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp ){
player->immobile = 0;
player->gate_waiting = NULL;
world_static.last_use = 0.0;
player->immobile = 0;
player->gate_waiting = NULL;
world_static.last_use = 0.0;
+ world_static.focused_entity = 0;
+ world_static.challenge_target = NULL;
+ world_static.challenge_timer = 0.0f;
world_entity_unfocus();
if( _player_reset[ player->subsystem ] )
world_entity_unfocus();
if( _player_reset[ player->subsystem ] )