npcs and tutorial stuff

[carveJwlIkooP6JGAAIwe30JlM.git] / entity.h

diff --git a/entity.h b/entity.h
index 105f4496c78b2469d95e2b10c5959f52e6fe5e18..d67c5f35d81683fda4bec559a5d7b344eb170357 100644 (file)
--- a/entity.h
+++ b/entity.h
@@ -243,7 +243,7 @@ struct volume_particles{
 };
 
 struct volume_trigger{
-   u32 event, event_leave;
+   i32 event, event_leave;
 };
 
 enum ent_volume_flag {
@@ -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;
 };
 
@@ -562,7 +563,7 @@ struct ent_glider {
 struct ent_npc 
 {
    mdl_transform transform;
-   u32 id, context;
+   u32 id, context, camera;
 };
 
 #include "world.h"