(50c0271)

[carveJwlIkooP6JGAAIwe30JlM.git] / entity.c

diff --git a/entity.c b/entity.c
index 261dbbcd2c1ba89c89b58d4ff45997eae0f2871a..ae506bd68fdc04fc39807abafc9cd1d5afaadb76 100644 (file)
--- a/entity.c
+++ b/entity.c
@@ -10,12 +10,12 @@
 #include "ent_miniworld.h"
 #include "ent_region.h"
 #include "ent_glider.h"
-
-typedef void (*fn_entity_call_handler)( world_instance *, ent_call *);
+#include "ent_npc.h"
 
 void entity_call( world_instance *world, ent_call *call )
 {
-   u32 type = mdl_entity_id_type( call->id );
+   u32 type = mdl_entity_id_type( call->id ),
+       index = mdl_entity_id_id( call->id );
 
    fn_entity_call_handler table[] = {
       [k_ent_volume]    = ent_volume_call,
@@ -29,7 +29,8 @@ void entity_call( world_instance *world, ent_call *call )
       [k_ent_route]     = ent_route_call,
       [k_ent_miniworld] = ent_miniworld_call,
       [k_ent_region]    = ent_region_call,
-      [k_ent_glider]    = ent_glider_call
+      [k_ent_glider]    = ent_glider_call,
+      [k_ent_npc]       = ent_npc_call
    };
 
    if( type >= vg_list_size(table) ){
@@ -39,12 +40,19 @@ void entity_call( world_instance *world, ent_call *call )
 
    fn_entity_call_handler fn = table[ type ];
 
-   if( !fn ){
-      vg_error( "call to entity type: %u is undefined\n", type );
+   if( !fn )
+   {
+      vg_error( "Entity type %u does not have a call handler, "
+                "but was called anyway\n", type );
       return;
    }
 
-   fn( world, call );
+   enum entity_call_result res = fn( world, call );
+
+   if( res == k_entity_call_result_unhandled )
+   {
+      vg_warn( "Call to entity %u#%u was unhandled.\n", type, index );
+   }
 }
 
 ent_marker *ent_find_marker( mdl_context *mdl, mdl_array_ptr *arr,