X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=e17483f5658ae994df5b5c457b34e01e323d2ca3;hb=074fa69f479724f9800849430bad5caf730b01ef;hp=b91246f261e2f0e7df5aca2adebfde75ec96388b;hpb=c52dacb7bc07e300312e45d605d206222dcbb181;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_load.c b/world_load.c
index b91246f..e17483f 100644
--- a/world_load.c
+++ b/world_load.c
@@ -8,11 +8,12 @@
 #include "addon.h"
 #include "save.h"
 #include "vg/vg_msg.h"
+#include "network.h"
 
 /* 
  * load the .mdl file located in path as a world instance
  */
-VG_STATIC void world_instance_load_mdl( u32 instance_id, const char *path ){
+static void world_instance_load_mdl( u32 instance_id, const char *path ){
    vg_rand_seed( 9001 );
 
    world_instance *world = &world_static.instances[ instance_id ];
@@ -60,8 +61,8 @@ VG_STATIC void world_instance_load_mdl( u32 instance_id, const char *path ){
    mdl_load_array( meta, &world->ent_skateshop, "ent_skateshop",  heap );
    mdl_load_array( meta, &world->ent_swspreview,"ent_swspreview", heap );
    mdl_load_array( meta, &world->ent_ccmd,      "ent_ccmd",       heap );
+   mdl_load_array( meta, &world->ent_objective, "ent_objective",  heap );
    mdl_load_array( meta, &world->ent_challenge, "ent_challenge",  heap );
-   mdl_load_array( meta, &world->ent_unlock,    "ent_unlock",     heap );
    mdl_load_array( meta, &world->ent_relay,     "ent_relay",      heap );
    mdl_load_array( meta, &world->ent_cubemap,   "ent_cubemap",    heap );
 
@@ -265,6 +266,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 );
@@ -286,11 +292,14 @@ static void skaterift_change_world_start( addon_reg *reg ){
       }
 
       world_static.addon_client = reg;
+      network_send_item( k_netmsg_playeritem_world1 );
    }
 }
 
 /* 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;
@@ -386,7 +395,7 @@ static void world_free( world_instance *world )
  * reset the world structure without deallocating persistent buffers 
  * TODO: Make this a memset(0), and have persistent items live in a static loc
  */
-VG_STATIC void world_init_blank( world_instance *world )
+static void world_init_blank( world_instance *world )
 {
    memset( &world->meta, 0, sizeof(mdl_context) );