projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
network items, interp boundaries
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.h
diff --git
a/player.h
b/player.h
index 36b37a9f4a78160e0e4e79f4e4c521be36a68724..63e30287bef6cf4e8b15917088070e21c725ad91 100644
(file)
--- a/
player.h
+++ b/
player.h
@@
-5,12
+5,12
@@
#include "player_common.h"
enum player_subsystem{
#include "player_common.h"
enum player_subsystem{
- k_player_subsystem_invalid = -1,
k_player_subsystem_walk = 0,
k_player_subsystem_skate = 1,
k_player_subsystem_dead = 2,
k_player_subsystem_drive = 3,
k_player_subsystem_walk = 0,
k_player_subsystem_skate = 1,
k_player_subsystem_dead = 2,
k_player_subsystem_drive = 3,
- k_player_subsystem_max
+ k_player_subsystem_max,
+ k_player_subsystem_invalid = 255
};
struct player_cam_controller {
};
struct player_cam_controller {
@@
-92,6
+92,7
@@
struct {
v3f cam_land_punch, cam_land_punch_v;
ent_gate *gate_waiting;
v3f cam_land_punch, cam_land_punch_v;
ent_gate *gate_waiting;
+ u16 boundary_hash;
int immobile;
int immobile;
@@
-110,6
+111,8
@@
struct {
player_pose holdout_pose;
float holdout_time;
player_pose holdout_pose;
float holdout_time;
+ m4x3f *final_mtx;
+
/*
* Subsystems
* -------------------------------------------------
/*
* Subsystems
* -------------------------------------------------
@@
-151,7
+154,7
@@
static void player__pre_update(void);
static void player__update(void);
static void player__post_update(void);
static void player__update(void);
static void player__post_update(void);
-static void player__pass_gate(
ent_gate *gate
);
+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 );