diff options
Diffstat (limited to 'src/game/player.cpp')
| -rw-r--r-- | src/game/player.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/game/player.cpp b/src/game/player.cpp index 74ecea2..e4c0390 100644 --- a/src/game/player.cpp +++ b/src/game/player.cpp @@ -1,13 +1,9 @@ #include "../game.h" -#include "SDL_scancode.h" #include "objlist.h" #include "physics/movement.h" -#include "world/trace.h" -#include <cmath> #include "player.h" -// todo : temporary -F32 PLAYER_HULL_HEIGHT = 1.f; +F32 PLAYER_HULL_HEIGHT = 48.f; F32 PLAYER_HULL_WIDTH = 32.f; PLAYER* player_create( VEC3 origin, F32 yaw ) { @@ -17,6 +13,7 @@ PLAYER* player_create( VEC3 origin, F32 yaw ) { p->health = 100; p->keeponlevel = 1; p->velocity = {}; + p->flags = {}; p->mins = { -PLAYER_HULL_WIDTH * .5f, @@ -58,6 +55,7 @@ void capture_mouse( PLAYER* p ) { void capture_move_keys( PLAYER* p ) { VEC2* move = &p->input.move; + p->input.jump = input.keys[input.binds.jump]; if( input.keys[input.binds.fwd] ) { if( !p->input.fwd_held ) move->x = 1.f; p->input.fwd_held = 1; |