X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=main.c;h=119be9e0f5f62219e4f347a075ef3dd8a5d95e53;hb=bdac014448b6ec968fe645f1581f321144f07dba;hp=c900e5e2b0de1ea71176b80bd7401375faa211b2;hpb=a64c18c5996fd5ac9601239f91b12275f04f9cd9;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/main.c b/main.c index c900e5e..119be9e 100644 --- a/main.c +++ b/main.c @@ -19,8 +19,8 @@ */ #define VG_3D -#define VG_STATIC static -//#define VG_STATIC +//#define VG_STATIC static +#define VG_STATIC //#define VG_MINIMAL_TEST #ifndef VG_MINIMAL_TEST @@ -40,6 +40,25 @@ static int cl_ui = 1; int main( int argc, char *argv[] ) { + vg_mem.use_libc_malloc = 1; +#if 0 + vg_prealloc_quota( 128*1024*1024 ); + void *test_allocator = vg_create_linear_allocator( NULL, 2048 ); + + for( int i=0; i<8; i++ ) + { + u64 *items = vg_linear_alloc( test_allocator, sizeof(u64) ); + items = vg_linear_extend( test_allocator, items, sizeof(u64)); + items[0] = 43; + items[1] = 12445; + + vg_info( "%lu %lu\n", items[0], items[1] ); + } + + vg_linear_clear( test_allocator ); + return 0; +#endif + vg_prealloc_quota( 128*1024*1024 ); vg_enter( argc, argv, "Voyager Game Engine" ); } @@ -51,6 +70,7 @@ VG_STATIC void highscores_save_at_exit(void*_) VG_STATIC void vg_preload(void) { + vg_convar_push( (struct vg_convar){ .name = "cl_ui", .data = &cl_ui, @@ -91,7 +111,7 @@ VG_STATIC void vg_load(void) vg_loader_highwater( audio_init, audio_free, NULL ); /* 'systems' are completely loaded now */ - strcpy( world.world_name, "models/mp_dev.mdl" ); + strcpy( world.world_name, "models/mp_test.mdl" ); world_load(); vg_console_load_autos(); }