X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=5400e76b43f1dd7234d80f2bebc523d9a33a78a4;hb=7b1e8a237acc3121c86fab9b5946da6a8d3bf6c4;hp=50939ae270019e8cbfcbd39f68e0478ae635ee96;hpb=92ba950580dd4877935e90682cd4f66fead8fed2;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 50939ae..5400e76 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -14,7 +14,7 @@
 #if 1
 
 #define SR_NETWORKED
-#define VG_DEVWINDOW
+//#define VG_DEVWINDOW
 
 /* 
  *     system headers
@@ -45,6 +45,7 @@
 #include "entity.c"
 #include "workshop.c"
 #include "addon.c"
+#include "highscores.c"
 
 static struct player_avatar localplayer_avatar;
 static struct player_model  localplayer_models[3];
@@ -57,10 +58,12 @@ int main( int argc, char *argv[] )
    return 0;
 }
 
+#if 0
 VG_STATIC void highscores_save_at_exit(void)
 {
    highscores_serialize_all();
 }
+#endif
 
 VG_STATIC void vg_launch_opt(void)
 {
@@ -78,11 +81,13 @@ vg_info("            |   \\/   | |        /     |      |    \\ | /   | \n" );
 vg_info("            '        ' '--' [] '----- '----- '     ' '---'  " 
         "SOFTWARE\n" );
 
+   /* 31.05.23 (hgn): this is only a server feature now */
+#if 0
    highscores_init( 2000, 50 );
    if( !highscores_read() )
       highscores_create_db();
-
    vg_loader_step( NULL, highscores_save_at_exit );
+#endif
 
    steam_init();
    vg_loader_step( NULL, steam_end );
@@ -151,10 +156,10 @@ VG_STATIC void vg_load(void)
    /* 'systems' are completely loaded now */
    
    /* load home/permanent world manually */
-   strcpy( world_loader.name, "mp_spawn" );
+   world_loader.reg = NULL;
+   strcpy( world_loader.override_name, "mp_spawn" );
    world_loader.generate_point_cloud = 1;
    world_loader.world_index = 0;
-   world_loader.location = k_world_load_type_local;
    world_load_mdl( "maps/mp_spawn/main.mdl" );
 
    /* Completing addon registrations
@@ -190,6 +195,7 @@ VG_STATIC void vg_load(void)
    vg_async_call( async_addon_reg_update, NULL, 0 );
    vg_console_load_autos();
    menu_link();
+   temp_update_playermodel();
 
    vg_async_call( async_skaterift_complete, NULL, 0 );
 }
@@ -360,6 +366,7 @@ VG_STATIC void render_scene_gate_subview(void)
 {
    render_fb_bind( gpipeline.fb_main, 1 );
    world_instance *view_world = localplayer.viewable_world;
+   if( !view_world ) return; /* ??? */
 
    int depth = 1;
    if( localplayer.gate_waiting ) depth = 0;