X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=b741a3178e48e0f93df0e01acf4b64e70d6795e2;hb=14851c4c820eb07a0db0ec0366a70bdd6518c331;hp=f124e244a83d6553e85f262482aecf1e4bb8c262;hpb=5f6a4f9df6c8accc89f1920bfe9ace3cbac4c4b6;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_load.c b/world_load.c index f124e24..b741a31 100644 --- a/world_load.c +++ b/world_load.c @@ -71,6 +71,7 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){ MDL_LOAD_ARRAY( meta, &world->ent_prop, ent_prop, heap ); MDL_LOAD_ARRAY( meta, &world->ent_region, ent_region, heap ); MDL_LOAD_ARRAY( meta, &world->ent_glider, ent_glider, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_npc, ent_npc, heap ); mdl_array_ptr infos; MDL_LOAD_ARRAY( meta, &infos, ent_worldinfo, vg_mem.scratch ); @@ -459,7 +460,8 @@ 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 */ -static void world_init_blank( world_instance *world ){ +void world_init_blank( world_instance *world ) +{ memset( &world->meta, 0, sizeof(mdl_context) ); world->textures = NULL;