diff options
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp index 285f288..6202145 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1,6 +1,8 @@ #include <unistd.h> #include "game.h" +#include "game/physics/movement.h" +#include "game/world/bsp.h" #include "game/world/draw.h" #include "render/gl_2d.h" #include "render/gl_3d.h" @@ -35,6 +37,8 @@ GAME_DATA* game_init( GL_DATA* gl ) { varl = vars_init(); objl = objl_init(); + gmove_init( game ); + #if IS_EDITOR game->editor = editor_create( game ); #else @@ -88,6 +92,7 @@ WORLD_MAP* game_load_map( GAME_DATA* game, const char* mapname ) { return 0; } + bsp_build_map( m ); objl_load_world( game, m ); game->state.map = m; return m; @@ -102,7 +107,8 @@ void game_unload_map( GAME_DATA* game ) { void game_draw( GAME_DATA* game ) { if( !objl->pl || !objl->world ) { - game_load_map( game, "../assets/maps/test.hmap" ); + dlog( "game_draw() : no world" ); + return; } VEC2 window = { 270.f, 25.f }; |