handplants

[carveJwlIkooP6JGAAIwe30JlM.git] / entity.c

diff --git a/entity.c b/entity.c
index 1d91c2491a9032181a53189503bf5e30f158d515..44b00df235f0f1d9e8ddc4d60f17390abd109c32 100644 (file)
--- a/entity.c
+++ b/entity.c
@@ -1,22 +1,52 @@
 #ifndef ENTITY_C
 #define ENTITY_C
 
-#include "entity.h"
 #include "world.h"
+#include "entity.h"
+#include "world_entity.h"
 
 #include "ent_skateshop.c"
+#include "ent_objective.c"
+#include "ent_challenge.c"
+#include "ent_relay.c"
+#include "ent_route.c"
+#include "ent_portal.c"
+#include "ent_miniworld.c"
+#include "ent_region.c"
+#include "ent_traffic.c"
 
-VG_STATIC void entity_call( world_instance *world, ent_call *call )
-{
+typedef void (*fn_entity_call_handler)( world_instance *, ent_call *);
+
+static void entity_call( world_instance *world, ent_call *call ){
    u32 type = mdl_entity_id_type( call->id );
 
-   if( type == k_ent_volume ){
-      ent_volume_call( world, call );
-   } else if( type == k_ent_audio ){
-      ent_audio_call( world, call );
-   } else if( type == k_ent_skateshop ){
-      ent_skateshop_call( world, call );
+   fn_entity_call_handler table[] = {
+      [k_ent_volume]    = ent_volume_call,
+      [k_ent_audio]     = ent_audio_call,
+      [k_ent_skateshop] = ent_skateshop_call,
+      [k_ent_objective] = ent_objective_call,
+      [k_ent_ccmd]      = ent_ccmd_call,
+      [k_ent_gate]      = ent_gate_call,
+      [k_ent_relay]     = ent_relay_call,
+      [k_ent_challenge] = ent_challenge_call,
+      [k_ent_route]     = ent_route_call,
+      [k_ent_miniworld] = ent_miniworld_call,
+      [k_ent_region]    = ent_region_call
+   };
+
+   if( type >= vg_list_size(table) ){
+      vg_error( "call to entity type: %u is out of range\n", type );
+      return;
    }
+
+   fn_entity_call_handler fn = table[ type ];
+
+   if( !fn ){
+      vg_error( "call to entity type: %u is undefined\n", type );
+      return;
+   }
+
+   fn( world, call );
 }
 
 #endif /* ENTITY_C */