projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge all features from glider feature branch
[carveJwlIkooP6JGAAIwe30JlM.git]
/
entity.c
diff --git
a/entity.c
b/entity.c
index 33bed055a2b8d0df0eafa1b84ea6f6a32ff4c3ee..ce6d98eb76ecd959f572160c8f6c08f14b66d928 100644
(file)
--- a/
entity.c
+++ b/
entity.c
@@
-6,24
+6,33
@@
#include "world_entity.h"
#include "ent_skateshop.c"
#include "world_entity.h"
#include "ent_skateshop.c"
+#include "ent_objective.c"
#include "ent_challenge.c"
#include "ent_challenge.c"
-#include "ent_unlock.c"
#include "ent_relay.c"
#include "ent_relay.c"
+#include "ent_route.c"
+#include "ent_miniworld.c"
+#include "ent_region.c"
+#include "ent_traffic.c"
+#include "ent_glider.c"
typedef void (*fn_entity_call_handler)( world_instance *, ent_call *);
typedef void (*fn_entity_call_handler)( world_instance *, ent_call *);
-
VG_STATIC
void entity_call( world_instance *world, ent_call *call ){
+
static
void entity_call( world_instance *world, ent_call *call ){
u32 type = mdl_entity_id_type( call->id );
fn_entity_call_handler table[] = {
[k_ent_volume] = ent_volume_call,
[k_ent_audio] = ent_audio_call,
[k_ent_skateshop] = ent_skateshop_call,
u32 type = mdl_entity_id_type( call->id );
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_
challenge] = ent_challeng
e_call,
+ [k_ent_
objective] = ent_objectiv
e_call,
[k_ent_ccmd] = ent_ccmd_call,
[k_ent_gate] = ent_gate_call,
[k_ent_relay] = ent_relay_call,
[k_ent_ccmd] = ent_ccmd_call,
[k_ent_gate] = ent_gate_call,
[k_ent_relay] = ent_relay_call,
- [k_ent_unlock] = ent_unlock_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,
+ [k_ent_glider] = ent_glider_call
};
if( type >= vg_list_size(table) ){
};
if( type >= vg_list_size(table) ){