Fix major overstep with last commit

[carveJwlIkooP6JGAAIwe30JlM.git] / main.c

diff --git a/main.c b/main.c
index fb53847515fe81382283495ec14ec71944506ad7..81584dd5b0b97800e2ca20f9f6459428e776620f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -40,7 +40,7 @@ static void highscores_save_at_exit(void*_)
    highscores_free();
 }
 
-int vg_preload(void)
+void vg_preload(void)
 {
    vg_convar_push( (struct vg_convar){
       .name = "cl_ui",
@@ -59,42 +59,30 @@ vg_info("            '        ' '--' [] '----- '----- '     ' '---'  "
         "SOFTWARE" );
 
    highscores_init( 2000, 50 );
-   if( !vg_loader_highwater( highscores_save_at_exit, NULL ) )         return 0;
+   vg_loader_highwater( NULL, highscores_save_at_exit, NULL );
 
    vg_sleep_ms(200);
 
-   if( !steam_init() )                                                 return 0;
-   if( !vg_loader_highwater( steam_end, NULL ) )                       return 0;
+   steam_init();
+   vg_loader_highwater( NULL, steam_end, NULL );
 
-   if( !network_init() )                                               return 0;
-   if( !vg_loader_highwater( network_end, NULL ) )                     return 0;
-
-   return 1;
+   vg_loader_highwater( network_init, network_end, NULL );
 }
 
-int vg_load(void)
+void vg_load(void)
 {
-   if( !render_init() )                                                return 0;
-   if( !vg_loader_highwater( render_free, NULL ) )                     return 0;
-
-   if( !world_init() )                                                 return 0;
-
-   if( !player_init() )                                                return 0;
-   if( !vg_loader_highwater( player_model_free, NULL ) )               return 0;
-
-
+   vg_loader_highwater( render_init, render_free, NULL );
+   vg_loader_highwater( world_init, world_free, NULL );
+   vg_loader_highwater( player_init, NULL, NULL );
 
-   if( !vg_bake_shaders() )                                            return 0;
+   if( !vg_bake_shaders() )
+      vg_fatal_exit_loop( "Did not load all shaders" );
 
-
-   if( !audio_init() )                                                 return 0;
-   if( !vg_loader_highwater( audio_free, NULL ) )                      return 0;
+   vg_loader_highwater( audio_init, audio_free, NULL );
 
    /* FInal step */
    world_load();
    vg_console_load_autos();
-
-   return 1;
 }
 
 static void vg_start(void)
@@ -279,10 +267,6 @@ void vg_ui(void)
    audio_debug_soundscapes();
 }
 
-void vg_free(void)
-{
-}
-
 #if 0
 static void run_light_widget( struct light_widget *lw )
 {