remove assertion

[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c

diff --git a/skaterift.c b/skaterift.c
index 326e02c65c2d6c75ad85b317cc1cc281b585d909..c23d022fec2911716c2d79bc3cb4b8efb888f5e0 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -153,6 +153,12 @@ static void skaterift_restore_state(void){
    kvsav.cur = orig;
 }
 
+static addon_reg *skaterift_mount_world_unloadable( const char *path ){
+   addon_reg *reg = addon_mount_local_addon( path, k_addon_type_world, ".mdl" );
+   reg->flags |= ADDON_REG_HIDDEN;
+   return reg;
+}
+
 static void vg_load(void){
    if( k_tools_mode ){
       vg_async_call( async_call_ready, NULL, 0 );
@@ -204,37 +210,9 @@ static void vg_load(void){
     */
 
    /* hub world */
-   addon_reg *hub = 
-      addon_mount_local_addon( "maps/dev_hub", k_addon_type_world, ".mdl" );
-   hub->metadata_len = 0;
-
-   /* understate diy. */
-   addon_reg *spawn = addon_mount_local_addon( "maps/mp_spawn", 
-                                                k_addon_type_world, 
-                                                ".mdl" );
-   {
-      vg_msg msg;
-      vg_msg_init( &msg, spawn->metadata, sizeof(spawn->metadata) );
-      vg_msg_frame( &msg, "workshop" );
-      vg_msg_wkvstr( &msg, "title", "Understate DIY" );
-      vg_msg_end_frame( &msg );
-      vg_msg_wkvstr( &msg, "location", "USA" );
-      spawn->metadata_len = msg.cur.co;
-   }
-
-   /* mtzero island */
-   addon_reg *mtzero = addon_mount_local_addon( "maps/mp_mtzero",
-                                                k_addon_type_world,
-                                                ".mdl" );
-   {
-      vg_msg msg;
-      vg_msg_init( &msg, spawn->metadata, sizeof(mtzero->metadata) );
-      vg_msg_frame( &msg, "workshop" );
-      vg_msg_wkvstr( &msg, "title", "Mt.Zero Island" );
-      vg_msg_end_frame( &msg );
-      vg_msg_wkvstr( &msg, "location", "Australia" );
-      mtzero->metadata_len = msg.cur.co;
-   }
+   addon_reg *hub = skaterift_mount_world_unloadable( "maps/dev_hub" );
+   skaterift_mount_world_unloadable( "maps/mp_spawn" );
+   skaterift_mount_world_unloadable( "maps/mp_mtzero" );
 
    /* load home/permanent world manually */
    world_static.load_state = k_world_loader_load;