X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=b95961df49060157c39361bde609f4d9b7ff0195;hb=188685bc8454ff40b733d9e9df8da45e3c2e2c39;hp=db1d244f490506165b3e45a9744aae764fdd3bb3;hpb=f014a592925b224f846d8adfc6559539fae1a096;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_entity.c b/world_entity.c
index db1d244..b95961d 100644
--- a/world_entity.c
+++ b/world_entity.c
@@ -5,10 +5,10 @@
 #include "entity.h"
 #include "world.h"
 #include "world_load.h"
+#include "save.h"
+#include "vg/vg_msg.h"
 
-VG_STATIC void world_gen_entities_init(void){
-   world_instance *world = world_loading_instance();
-
+VG_STATIC void world_gen_entities_init( world_instance *world ){
    /* lights */
    for( u32 j=0; j<mdl_arrcount(&world->ent_light); j ++ ){
       ent_light *light = mdl_arritm( &world->ent_light, j );
@@ -26,7 +26,7 @@ VG_STATIC void world_gen_entities_init(void){
    for( u32 j=0; j<mdl_arrcount(&world->ent_gate); j ++ ){
       ent_gate *gate = mdl_arritm( &world->ent_gate, j );
 
-      if( gate->type == k_gate_type_teleport ){
+      if( !(gate->flags & k_ent_gate_nonlocal) ) {
          gate_transform_update( gate );
       }
    }
@@ -200,7 +200,7 @@ VG_STATIC void ent_audio_call( world_instance *world, ent_call *call ){
       return;
    }
 
-   u8 world_id = (world - world_static.worlds) + 1;
+   u8 world_id = (world - world_static.instances) + 1;
    u32 index = mdl_entity_id_id( call->id );
    ent_audio *audio = mdl_arritm( &world->ent_audio, index );
 
@@ -440,4 +440,45 @@ VG_STATIC void entity_bh_closest( void *user, u32 item_index, v3f point,
    }
 }
 
+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;
+   for( u32 i=0; i<mdl_arrcount(&world->ent_audio); i++ ){
+      ent_audio *audio = mdl_arritm(&world->ent_audio,i);
+      if( audio->flags & AUDIO_FLAG_AUTO_START ){
+         ent_call call;
+         call.data = NULL;
+         call.function = k_ent_function_trigger;
+         call.id = mdl_entity_id( k_ent_audio, i );
+         entity_call( world, &call );
+      }
+   }
+
+   /* read savedata 
+    * ----------------------------------------------------------------------- */
+
+   for( u32 i=0; i<mdl_arrcount(&world->ent_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 world_entity_serialize( world_instance *world, vg_msg *sav ){
+   for( u32 i=0; i<mdl_arrcount(&world->ent_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 */