npcs and tutorial stuff

[carveJwlIkooP6JGAAIwe30JlM.git] / world_entity.c

diff --git a/world_entity.c b/world_entity.c
index 725c8989dda8b57f919849d31af3a0d9d9dd8da0..40d6d78a58acc7684fca56ee8495e35df4673320 100644 (file)
--- a/world_entity.c
+++ b/world_entity.c
@@ -13,6 +13,7 @@
 #include "ent_traffic.h"
 #include "ent_glider.h"
 #include "ent_region.h"
+#include "ent_npc.h"
 #include "input.h"
 #include "player_walk.h"
 
@@ -26,24 +27,60 @@ bh_system bh_system_entity_list =
    .cast_ray = NULL
 };
 
-void world_entity_focus( u32 entity_id )
+void world_entity_set_focus( u32 entity_id )
+{
+   if( world_static.focused_entity )
+   {
+      vg_warn( "Entity %u#%u tried to take focus from %u#%u\n",
+                  mdl_entity_id_type( entity_id ),
+                  mdl_entity_id_id( entity_id ),
+                  mdl_entity_id_type( world_static.focused_entity ),
+                  mdl_entity_id_id( world_static.focused_entity ) );
+      return;
+   }
+
+   world_static.focused_entity = entity_id;
+}
+
+void world_entity_focus_modal(void)
 {
    localplayer.immobile = 1;
    menu.disable_open = 1;
+   srinput.state = k_input_state_resume;
 
    v3_zero( localplayer.rb.v );
    v3_zero( localplayer.rb.w );
    player_walk.move_speed = 0.0f;
-   world_static.focused_entity = entity_id;
    skaterift.activity = k_skaterift_ent_focus;
 }
 
-void world_entity_unfocus(void)
+void world_entity_exit_modal(void)
 {
+   if( skaterift.activity != k_skaterift_ent_focus )
+   {
+      vg_warn( "Entity %u#%u tried to exit modal when we weren't in one\n",
+                  mdl_entity_id_type( world_static.focused_entity ),
+                  mdl_entity_id_id( world_static.focused_entity ) );
+      return;
+   }
+
    localplayer.immobile = 0;
-   skaterift.activity = k_skaterift_default;
    menu.disable_open = 0;
    srinput.state = k_input_state_resume;
+   skaterift.activity = k_skaterift_default;
+}
+
+void world_entity_clear_focus(void)
+{
+   if( skaterift.activity == k_skaterift_ent_focus )
+   {
+      vg_warn( "Entity %u#%u tried to clear focus before exiting modal\n",
+                  mdl_entity_id_type( world_static.focused_entity ),
+                  mdl_entity_id_id( world_static.focused_entity ) );
+      return;
+   }
+
+   world_static.focused_entity = 0;
 }
 
 void world_entity_focus_camera( world_instance *world, u32 uid )
@@ -83,18 +120,26 @@ void world_entity_focus_preupdate(void)
    world_instance *world = world_current_instance();
 
    /* TODO: Table. */
-   if( type == k_ent_skateshop ){
+   if( type == k_ent_skateshop )
+   {
       ent_skateshop *skateshop = mdl_arritm( &world->ent_skateshop, index );
       ent_skateshop_preupdate( skateshop, active );
    }
-   else if( type == k_ent_challenge ){
+   else if( type == k_ent_challenge )
+   {
       ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index );
       ent_challenge_preupdate( challenge, active );
    }
-   else if( type == k_ent_route ){
+   else if( type == k_ent_route )
+   {
       ent_route *route = mdl_arritm( &world->ent_route, index );
       ent_route_preupdate( route, active );
    }
+   else if( type == k_ent_npc )
+   {
+      ent_npc *npc = mdl_arritm( &world->ent_npc, index );
+      ent_npc_preupdate( npc, active );
+   }
 }
 
 /* additional renderings like text etc.. */
@@ -116,6 +161,7 @@ void world_entity_focus_render(void)
    else if( type == k_ent_challenge ){}
    else if( type == k_ent_route ){}
    else if( type == k_ent_miniworld ){}
+   else if( type == k_ent_npc ){}
    else {
       vg_fatal_error( "Programming error\n" );
    }
@@ -380,20 +426,24 @@ void ent_audio_call( world_instance *world, ent_call *call )
             p   = clip->probability * mod;
 
       bar += p;
-      if( chance < bar ){
+      if( chance < bar )
+      {
          audio_lock();
 
-         if( audio->behaviour == k_channel_behaviour_unlimited ){
+         if( audio->behaviour == k_channel_behaviour_unlimited )
+         {
             audio_oneshot_3d( &clip->_.clip, sound_co,
                               audio->transform.s[0],
                               audio->volume );
          }
-         else if( audio->behaviour == k_channel_behaviour_discard_if_full ){
+         else if( audio->behaviour == k_channel_behaviour_discard_if_full )
+         {
             audio_channel *ch = 
                audio_get_group_idle_channel( audio->group, 
                                              audio->max_channels );
 
-            if( ch ){
+            if( ch )
+            {
                audio_channel_init( ch, &clip->_.clip, audio->flags );
                audio_channel_group( ch, audio->group );
                audio_channel_world( ch, world_id );
@@ -402,7 +452,8 @@ void ent_audio_call( world_instance *world, ent_call *call )
                ch = audio_relinquish_channel( ch );
             }
          }
-         else if( audio->behaviour == k_channel_behaviour_crossfade_if_full){
+         else if( audio->behaviour == k_channel_behaviour_crossfade_if_full)
+         {
             audio_channel *ch =
                audio_get_group_idle_channel( audio->group,
                                              audio->max_channels );
@@ -425,7 +476,8 @@ void ent_audio_call( world_instance *world, ent_call *call )
                ch = audio_get_first_idle_channel();
             }
 
-            if( ch ){
+            if( ch )
+            {
                audio_channel_init( ch, &clip->_.clip, audio->flags );
                audio_channel_group( ch, audio->group );
                audio_channel_world( ch, world_id );
@@ -680,9 +732,11 @@ 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++ ){
+   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 ){
+      if( audio->flags & AUDIO_FLAG_AUTO_START )
+      {
          ent_call call;
          call.data = NULL;
          call.function = k_ent_function_trigger;