switch to entity list

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index 58ff1b6bd4b4fb82a0b1f44f7124a22c390aa89c..49c030ea37260f7945311ee69e4a9db447882f9d 100644 (file)
--- a/world.h
+++ b/world.h
@@ -34,8 +34,8 @@ typedef struct world_instance world_instance;
 
 /* console variables */
 
-static float k_day_length            = 30.0f; /* minutes */
-static int   k_debug_light_indices   = 0,
+static f32   k_day_length            = 30.0f; /* minutes */
+static i32   k_debug_light_indices   = 0,
              k_debug_light_complexity= 0,
              k_light_preview         = 0;
 
@@ -155,7 +155,8 @@ struct world_instance {
                  ent_marker,
                  ent_camera,
                  ent_swspreview,
-                 ent_ccmd;
+                 ent_ccmd,
+                 ent_challenge;
 
    ent_gate *rendering_gate;
 
@@ -169,9 +170,9 @@ struct world_instance {
                  scene_lines;
 
    /* spacial mappings */
-   bh_tree *audio_bh,
-           *volume_bh,
-           *geo_bh;
+   bh_tree *geo_bh,
+           *entity_bh;
+   u32 *entity_list;
 
    /* graphics */
    glmesh mesh_route_lines;
@@ -180,6 +181,9 @@ struct world_instance {
           mesh_water;
 
    rb_object rb_geo;
+
+   ent_challenge *challenge_target;
+   f32 challenge_timer;
 };
 
 struct world_static {
@@ -192,10 +196,11 @@ struct world_static {
    u32 current_run_version;
    double time, rewind_from, rewind_to, last_use;
 
-   int in_volume;
+   u32 active_trigger_volumes[8];
+   u32 active_trigger_volume_count;
 
    world_instance worlds[4];
-   u32            active_world;
+   i32            active_world;
 }
 static world_static;