projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
chaos pt 2
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.c
diff --git
a/player.c
b/player.c
index 23cb5fcaf4ceeaae7f8d09c020be987e08d5fba0..3084828d38cb7a804cc205c15446d7a1525b3c9e 100644
(file)
--- a/
player.c
+++ b/
player.c
@@
-15,7
+15,7
@@
static int localplayer_cmd_respawn( int argc, const char *argv[] ){
ent_spawn *rp = NULL, *r;
static int localplayer_cmd_respawn( int argc, const char *argv[] ){
ent_spawn *rp = NULL, *r;
- world_instance *world =
localplayer.viewable_world
;
+ world_instance *world =
world_current_instance()
;
if( argc == 1 ){
rp = world_find_spawn_by_name( world, argv[0] );
if( argc == 1 ){
rp = world_find_spawn_by_name( world, argv[0] );
@@
-236,7
+236,6
@@
static void player__reset(void){
localplayer.immobile = 0;
localplayer.gate_waiting = NULL;
localplayer.immobile = 0;
localplayer.gate_waiting = NULL;
- localplayer.viewable_world = world_current_instance();
world_static.challenge_target = NULL;
world_static.challenge_timer = 0.0f;
world_static.challenge_target = NULL;
world_static.challenge_timer = 0.0f;
@@
-253,6
+252,8
@@
static void player__reset(void){
world_routes_clear( instance );
}
}
world_routes_clear( instance );
}
}
+
+ v3_copy( localplayer.rb.co, localplayer.cam_control.tpv_lpf );
}
static void player__spawn( ent_spawn *rp ){
}
static void player__spawn( ent_spawn *rp ){