X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=22052fa40b58a2c3def75e8ccd7c683ceeb8fb39;hb=23a1be081ab9e378cba49a23b8ed4d4082b580c1;hp=119be9e0f5f62219e4f347a075ef3dd8a5d95e53;hpb=bdac014448b6ec968fe645f1581f321144f07dba;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/main.c b/main.c index 119be9e..22052fa 100644 --- a/main.c +++ b/main.c @@ -40,26 +40,8 @@ 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_mem.use_libc_malloc = 0; + vg_set_mem_quota( 128*1024*1024 ); vg_enter( argc, argv, "Voyager Game Engine" ); } @@ -109,9 +91,10 @@ VG_STATIC void vg_load(void) vg_bake_shaders(); vg_loader_highwater( audio_init, audio_free, NULL ); + world_audio_init(); /* 'systems' are completely loaded now */ - strcpy( world.world_name, "models/mp_test.mdl" ); + strcpy( world.world_name, "models/mp_dev.mdl" ); world_load(); vg_console_load_autos(); }