refactor model things

[carveJwlIkooP6JGAAIwe30JlM.git] / main.c

diff --git a/main.c b/main.c
index 9bfa794c51a1e0b1ad55668aa8ca29b1877fc366..0e5a2fc66f850c513afb3feed100633e06b647c1 100644 (file)
--- a/main.c
+++ b/main.c
@@ -19,7 +19,8 @@
  */
 
 #define VG_3D
-#define VG_STATIC static
+//#define VG_STATIC static
+#define VG_STATIC 
 
 //#define VG_MINIMAL_TEST
 #ifndef VG_MINIMAL_TEST
@@ -39,7 +40,8 @@ static int cl_ui     = 1;
 
 int main( int argc, char *argv[] )
 {
-   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" ); 
 }
 
@@ -50,6 +52,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,
@@ -72,7 +75,7 @@ vg_info("            '        ' '--' [] '----- '----- '     ' '---'  "
 
    vg_loader_highwater( NULL, highscores_save_at_exit, NULL );
 
-   vg_sleep_ms(200);
+   //vg_sleep_ms(200);
 
    steam_init();
    vg_loader_highwater( NULL, steam_end, NULL );
@@ -88,9 +91,11 @@ 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 */
-   world_load( "models/mp_dev.mdl" );
+   strcpy( world.world_name, "models/mp_test.mdl" );
+   world_load();
    vg_console_load_autos();
 }