projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix segfault
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.c
diff --git
a/player.c
b/player.c
index e6b93877f514f3f55b3c6de26462a860a400ca43..5bd43325c4945ac8b47df3fe2080c9518c95ce89 100644
(file)
--- a/
player.c
+++ b/
player.c
@@
-66,10
+66,6
@@
static void player__debugtext( int size, const char *fmt, ... ){
/*
* Appearence
*/
/*
* Appearence
*/
-static void player__use_avatar( struct player_avatar *av ){
- localplayer.playeravatar = av;
- player_setup_ragdoll_from_avatar( &localplayer.ragdoll, av );
-}
static void player__use_model( u16 reg_id ){
addon_cache_unwatch( k_addon_type_player,
static void player__use_model( u16 reg_id ){
addon_cache_unwatch( k_addon_type_player,
@@
-267,9
+263,10
@@
static void player__spawn( ent_spawn *rp ){
static void player__kill(void){
}
static void player__kill(void){
}
-static void player__begin_holdout(
void
){
+static void player__begin_holdout(
v3f offset
){
memcpy( &localplayer.holdout_pose, &localplayer.pose,
sizeof(localplayer.pose) );
memcpy( &localplayer.holdout_pose, &localplayer.pose,
sizeof(localplayer.pose) );
+ v3_copy( offset, localplayer.holdout_pose.root_co );
localplayer.holdout_time = 1.0f;
}
localplayer.holdout_time = 1.0f;
}