projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
physics adjustments
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.h
diff --git
a/player.h
b/player.h
index f426b7daad07462dc915b518c36da249b0ff5fbc..d3038915c0b09b6393c66c0f0dbcdf39bc18f2de 100644
(file)
--- a/
player.h
+++ b/
player.h
@@
-14,7
+14,9
@@
#include "bvh.h"
VG_STATIC float
#include "bvh.h"
VG_STATIC float
- k_walkspeed = 12.0f, /* no longer used */
+ k_walkspeed = 12.0f,
+ k_air_accelerate = 20.0f,
+
k_runspeed = 20.0f,
k_board_radius = 0.3f,
k_board_length = 0.45f,
k_runspeed = 20.0f,
k_board_radius = 0.3f,
k_board_length = 0.45f,
@@
-294,13
+296,21
@@
VG_STATIC void player_init(void) /* 1
});
vg_convar_push( (struct vg_convar){
});
vg_convar_push( (struct vg_convar){
- .name = "walk_speed",
+ .name = "
g
walk_speed",
.data = &k_walkspeed,
.data_type = k_convar_dtype_f32,
.opt_f32 = { .clamp = 0 },
.persistent = 0
});
.data = &k_walkspeed,
.data_type = k_convar_dtype_f32,
.opt_f32 = { .clamp = 0 },
.persistent = 0
});
+ vg_convar_push( (struct vg_convar){
+ .name = "air_accelerate",
+ .data = &k_air_accelerate,
+ .data_type = k_convar_dtype_f32,
+ .opt_f32 = { .clamp = 0 },
+ .persistent = 0
+ });
+
vg_convar_push( (struct vg_convar){
.name = "run_speed",
.data = &k_runspeed,
vg_convar_push( (struct vg_convar){
.name = "run_speed",
.data = &k_runspeed,
@@
-370,12
+380,17
@@
VG_STATIC void player_save_rewind_frame(void)
}
}
}
}
+
+/* disaster */
+VG_STATIC int menu_enabled(void);
+#include "menu.h"
+
/*
* Free camera movement
*/
VG_STATIC void player_mouseview(void)
{
/*
* Free camera movement
*/
VG_STATIC void player_mouseview(void)
{
- if(
ui_want_mouse
() )
+ if(
menu_enabled
() )
return;
v2_muladds( player.angles, vg.mouse_delta, 0.0025f, player.angles );
return;
v2_muladds( player.angles, vg.mouse_delta, 0.0025f, player.angles );
@@
-413,10
+428,6
@@
VG_STATIC void player_mouseview(void)
player.angles[1] = vg_clampf( player.angles[1], -VG_PIf*0.5f, VG_PIf*0.5f );
}
player.angles[1] = vg_clampf( player.angles[1], -VG_PIf*0.5f, VG_PIf*0.5f );
}
-/* disaster */
-VG_STATIC int menu_enabled(void);
-#include "menu.h"
-
/* Deal with input etc */
VG_STATIC void player_update_pre(void)
{
/* Deal with input etc */
VG_STATIC void player_update_pre(void)
{