more refactors..

[carveJwlIkooP6JGAAIwe30JlM.git] / world_load.c

diff --git a/world_load.c b/world_load.c
index 0c4e8ebb9989ecfa983224a5a5860142d5c2d974..448624e971247a04d343370c65e1367fbaa74a93 100644 (file)
--- a/world_load.c
+++ b/world_load.c
@@ -111,19 +111,20 @@ static void async_skaterift_world_loaded( void *payload, u32 size )
 /*
  * Does a complete world switch using the remaining free slots
  */
-static void skaterift_world_changer_thread( void *data )
-{
-   if( world_loader.location == k_world_load_type_workshop ){
-      vg_fatal_error( "Unimplemented\n" );
-   }
-
+static void skaterift_world_changer_thread( void *data ){
    char path_buf[4096];
    vg_str path;
    vg_strnull( &path, path_buf, 4096 );
-   vg_strcat( &path, "maps/" );
+
+   if( world_loader.reg ){
+      addon_get_content_folder( world_loader.reg, &path );
+   }
+   else {
+      vg_strcat( &path, "maps/" );
+      vg_strcat( &path, world_loader.override_name );
+   }
 
    vg_str folder = path;
-   vg_strcat( &folder, world_loader.name );
    if( !vg_strgood( &folder ) ) {
       vg_error( "Load target too long\n" );
       vg_async_call( workshop_async_any_complete, NULL, 0 );
@@ -218,9 +219,14 @@ static void skaterift_change_world_preupdate(void)
 }
 
 /* places all loaded worlds into unloading state */
-static void skaterift_change_world( const char *world_name )
-{
-   vg_info( "switching to %s\n", world_name );
+static void skaterift_change_world_start(void){
+   if( world_loader.reg ){
+      vg_info( "switching to %s ("PRINTF_U64"\n", 
+               world_loader.reg->foldername, world_loader.reg->workshop_id );
+   }
+   else{
+      vg_info( "switching to %s(local)\n", world_loader.override_name );
+   }
 
    if( world_static.active_world != 0 ){
       vg_error( "Cannot change worlds while in non-root world\n" );
@@ -228,10 +234,7 @@ static void skaterift_change_world( const char *world_name )
    else{
       skaterift_begin_op( k_async_op_world_preloading );
 
-      vg_linear_clear( vg_mem.scratch );
-      vg_strncpy( world_name, world_loader.name,
-                  vg_list_size(world_loader.name), k_strncpy_overflow_fatal );
-      
+      vg_linear_clear( vg_mem.scratch ); /* ?? */
       vg_info( "unloading old worlds\n" );
       world_unlink_nonlocal( &world_static.worlds[0] );
       
@@ -249,8 +252,13 @@ static void skaterift_change_world( const char *world_name )
 /* console command for the above function */
 static int skaterift_change_world_command( int argc, const char *argv[] )
 {
-   if( argc == 1 )
-      skaterift_change_world( argv[0] );
+   if( argc == 1 ){
+      world_loader.reg = NULL;
+      vg_strncpy( argv[0], world_loader.override_name,
+                  vg_list_size( world_loader.override_name ),
+                  k_strncpy_always_add_null );
+      skaterift_change_world_start();
+   }
 
    return 0;
 }