npcs and tutorial stuff

[carveJwlIkooP6JGAAIwe30JlM.git] / entity.h

diff --git a/entity.h b/entity.h
index 1033807ea552489928e6bf4ff1608dd623d62ff8..d67c5f35d81683fda4bec559a5d7b344eb170357 100644 (file)
--- a/entity.h
+++ b/entity.h
@@ -1,6 +1,7 @@
-#ifndef ENTITY_H
-#define ENTITY_H
+#pragma once
 
+#include "vg/vg_audio.h"
+#include "vg/vg_imgui.h"
 #include "model.h"
 
 typedef struct ent_spawn ent_spawn;
@@ -33,6 +34,9 @@ typedef struct ent_cubemap ent_cubemap;
 typedef struct ent_miniworld ent_miniworld;
 typedef struct ent_prop ent_prop;
 typedef struct ent_region ent_region;
+typedef struct ent_list ent_list;
+typedef struct ent_glider ent_glider;
+typedef struct ent_npc ent_npc;
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -60,22 +64,28 @@ enum entity_alias{
    k_ent_miniworld   = 22,
    k_ent_prop        = 23,
    k_ent_list        = 24,
-   k_ent_region      = 25
+   k_ent_region      = 25,
+   k_ent_glider      = 26,
+   k_ent_npc         = 27
 };
 
-static u32 mdl_entity_id_type( u32 entity_id ){
+static inline u32 mdl_entity_id_type( u32 entity_id )
+{
    return (entity_id & 0x0fff0000) >> 16;
 }
 
-static u32 mdl_entity_id_id( u32 entity_id ){
+static inline u32 mdl_entity_id_id( u32 entity_id )
+{
    return entity_id & 0x0000ffff;
 }
 
-static u32 mdl_entity_id( u32 type, u32 index ){
+static inline u32 mdl_entity_id( u32 type, u32 index )
+{
    return (type & 0xfffff)<<16 | (index & 0xfffff);
 }
 
-enum entity_function{
+enum entity_function
+{
    k_ent_function_trigger,
    k_ent_function_particle_spawn,
    k_ent_function_trigger_leave
@@ -233,7 +243,7 @@ struct volume_particles{
 };
 
 struct volume_trigger{
-   u32 event, event_leave;
+   i32 event, event_leave;
 };
 
 enum ent_volume_flag {
@@ -407,21 +417,11 @@ struct ent_worldinfo{
    u32 pstr_name, pstr_author, pstr_desc;
    f32 timezone;
    u32 pstr_skybox;
+   u32 flags;
 };
 
-static ent_marker *ent_find_marker( mdl_context *mdl,
-                                       mdl_array_ptr *arr, const char *alias )
-{
-   for( u32 i=0; i<mdl_arrcount(arr); i++ ){
-      ent_marker *marker = mdl_arritm( arr, i );
-
-      if( !strcmp( mdl_pstr( mdl, marker->pstr_alias ), alias ) ){
-         return marker;
-      }
-   }
-
-   return NULL;
-}
+ent_marker *ent_find_marker( mdl_context *mdl, mdl_array_ptr *arr, 
+                             const char *alias );
 
 enum channel_behaviour{
    k_channel_behaviour_unlimited = 0,
@@ -494,8 +494,8 @@ struct ent_objective{
        flags,
        id_next,
        filter,filter2,
-       id_win,
-       win_event;
+       id_win;
+   i32 win_event;
    f32 time_limit;
 };
 
@@ -507,18 +507,18 @@ struct ent_challenge{
    mdl_transform transform;
    u32 pstr_alias,
        flags,
-       target,
-       target_event,
-       reset,
-       reset_event,
-       first,
+       target;
+   i32 target_event;
+   u32 reset;
+   i32 reset_event;
+   u32 first,
        camera,
        status;
 };
 
 struct ent_relay {
    u32 targets[4][2];
-   u32 targets_events[4];
+   i32 targets_events[4];
 };
 
 struct ent_cubemap {
@@ -529,7 +529,8 @@ struct ent_cubemap {
 
 typedef struct ent_call ent_call;
 struct ent_call{
-   u32 id, function;
+   u32 id;
+   i32 function;
    void *data;
 };
 
@@ -542,15 +543,28 @@ struct ent_miniworld {
 
 struct ent_prop {
    mdl_transform transform;
-   u32 submesh_start, submesh_count, flags;
+   u32 submesh_start, submesh_count, flags, pstr_alias;
 };
 
 struct ent_region {
    mdl_transform transform;
-   u32 submesh_start, submesh_count, pstr_title, flags, zone_volume;
+   u32 submesh_start, submesh_count, pstr_title, flags, zone_volume,
+
+       /* 105+ */
+       target0[2];
 };
 
-#include "world.h"
-static void entity_call( world_instance *world, ent_call *call );
+struct ent_glider {
+   mdl_transform transform;
+   u32 flags;
+   f32 cooldown;
+};
 
-#endif /* ENTITY_H */
+struct ent_npc 
+{
+   mdl_transform transform;
+   u32 id, context, camera;
+};
+
+#include "world.h"
+void entity_call( world_instance *world, ent_call *call );