X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=b95961df49060157c39361bde609f4d9b7ff0195;hb=8a31c1ffcb632b9b6d1702332f0d75d609c0a87b;hp=7ffa1d643012493f53637131e86446284f935ff5;hpb=2329044d44a5aff035b01926f7901d9e89ad284e;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_entity.c b/world_entity.c index 7ffa1d6..b95961d 100644 --- a/world_entity.c +++ b/world_entity.c @@ -6,6 +6,7 @@ #include "world.h" #include "world_load.h" #include "save.h" +#include "vg/vg_msg.h" VG_STATIC void world_gen_entities_init( world_instance *world ){ /* lights */ @@ -439,8 +440,7 @@ VG_STATIC void entity_bh_closest( void *user, u32 item_index, v3f point, } } -VG_STATIC void world_entity_start( world_instance *world, - struct savedata *sav ){ +VG_STATIC void world_entity_start( world_instance *world, vg_msg *sav ){ vg_info( "Start instance %p\n", world ); world->probabilities[ k_probability_curve_constant ] = 1.0f; @@ -454,10 +454,31 @@ VG_STATIC void world_entity_start( world_instance *world, entity_call( world, &call ); } } + + /* read savedata + * ----------------------------------------------------------------------- */ + + for( u32 i=0; ient_unlock); i++ ){ + ent_unlock *unlock = mdl_arritm( &world->ent_unlock, i ); + const char *alias = mdl_pstr( &world->meta, unlock->pstr_alias ); + + if( vg_msg_seekkvu32( sav, alias, k_vg_msg_first ) ){ + ent_call call; + call.data = NULL; + call.function = 0; + call.id = mdl_entity_id( k_ent_unlock, i ); + entity_call( world, &call ); + } + } } -VG_STATIC void async_world_entity_start( void *payload, u32 size ){ +VG_STATIC void world_entity_serialize( world_instance *world, vg_msg *sav ){ + for( u32 i=0; ient_unlock); i++ ){ + ent_unlock *unlock = mdl_arritm(&world->ent_unlock,i); + const char *alias = mdl_pstr(&world->meta,unlock->pstr_alias); + vg_msg_wkvu32( sav, alias, unlock->status ); + } } #endif /* WORLD_ENTITY_C */