X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;fp=world_load.c;h=ee7df7da6409fd8948041b7c681f9130e637ccdf;hb=56af37b4982b027cac13133eadadfc71ce8947bb;hp=2ca957a1cca75b13b04761da3e59122b43dc6166;hpb=53597f45307d8a2120e3a0bbe71797b216e8750b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_load.c b/world_load.c
index 2ca957a..ee7df7d 100644
--- a/world_load.c
+++ b/world_load.c
@@ -265,6 +265,11 @@ static void skaterift_change_world_start( addon_reg *reg ){
    if( world_static.active_instance != 0 )
       vg_error( "Cannot change worlds while in non-root world\n" );
    else{
+      if( world_static.addon_client == reg ){
+         vg_warn( "World is already loaded\n" );
+         return;
+      }
+
       char buf[76];
       addon_alias_uid( &reg->alias, buf );
       vg_info( "switching to: %s\n", buf );
@@ -291,6 +296,8 @@ static void skaterift_change_world_start( addon_reg *reg ){
 
 /* console command for the above function */
 static int skaterift_change_world_command( int argc, const char *argv[] ){
+   if( !vg_loader_availible() ) return 0;
+
    if( argc == 1 ){
       addon_alias q;
       q.type = k_addon_type_world;