projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
entities zones
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.h
diff --git
a/player.h
b/player.h
index 8ecce407508b9c4b0adddbce198cb33055c902a5..8a0b17d28552f3992c99874bd746d4987f59da95 100644
(file)
--- a/
player.h
+++ b/
player.h
@@
-16,6
+16,7
@@
struct player_instance
v4f qbasis;
m3x3f basis, invbasis, basis_gate;
v4f qbasis;
m3x3f basis, invbasis, basis_gate;
+ world_instance *viewable_world;
/*
* Camera management
/*
* Camera management
@@
-50,7
+51,7
@@
struct player_instance
cam_land_punch,
cam_land_punch_v;
cam_land_punch,
cam_land_punch_v;
-
telepor
t_gate *gate_waiting;
+
en
t_gate *gate_waiting;
/*
* Input
/*
* Input
@@
-118,9
+119,9
@@
void (*_player_bind[])( player_instance *player ) =
};
VG_STATIC
};
VG_STATIC
-void (*_player_reset[])( player_instance *player,
struct respawn_point
*rp ) =
+void (*_player_reset[])( player_instance *player,
ent_spawn
*rp ) =
{
{
-
NULL
,
+
player__walk_reset
,
player__skate_reset,
NULL
};
player__skate_reset,
NULL
};
@@
-413,7
+414,6
@@
VG_STATIC void player_init(void) /* 1 */
VG_VAR_I32( cl_thirdperson );
VG_VAR_F32_PERSISTENT( fc_speed );
VG_VAR_I32( cl_thirdperson );
VG_VAR_F32_PERSISTENT( fc_speed );
- /* TODO: NOT PERSISTENT */
VG_VAR_F32( k_ragdoll_limit_scale );
VG_VAR_I32( k_ragdoll_div );
VG_VAR_I32( k_ragdoll_debug_collider );
VG_VAR_F32( k_ragdoll_limit_scale );
VG_VAR_I32( k_ragdoll_div );
VG_VAR_I32( k_ragdoll_debug_collider );