projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
code is no longer based :(
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.h
diff --git
a/player.h
b/player.h
index 9757030d3fc201c4439edaea39e2b06f11aedbca..cd6bca59e83419045ec930bd668918ceef32c6ee 100644
(file)
--- a/
player.h
+++ b/
player.h
@@
-36,7
+36,6
@@
struct player_cam_controller {
struct player_subsystem_interface{
void(*system_register)(void);
void(*bind)(void);
struct player_subsystem_interface{
void(*system_register)(void);
void(*bind)(void);
- void(*reset)( ent_spawn *rp );
void(*pre_update)(void);
void(*update)(void);
void(*post_update)(void);
void(*pre_update)(void);
void(*update)(void);
void(*post_update)(void);
@@
-74,8
+73,10
@@
struct {
rigidbody rb;
v3f angles;
rigidbody rb;
v3f angles;
+#if 0
v4f qbasis;
m3x3f basis, invbasis, basis_gate;
v4f qbasis;
m3x3f basis, invbasis, basis_gate;
+#endif
world_instance *viewable_world;
/*
world_instance *viewable_world;
/*
@@
-191,6
+192,7
@@
static void player__pass_gate( u32 id );
static void player__im_gui(void);
static void player__setpos( v3f pos );
static void player__spawn( ent_spawn *rp );
static void player__im_gui(void);
static void player__setpos( v3f pos );
static void player__spawn( ent_spawn *rp );
+static void player__reset(void);
static void player__kill(void);
static void player__begin_holdout( v3f offset );
static void player__kill(void);
static void player__begin_holdout( v3f offset );