X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=49c030ea37260f7945311ee69e4a9db447882f9d;hb=7eba38b8178c82040618a518634d8ff4813e2ff2;hp=d6f80412bb97f00336614b124198b905d2fcd058;hpb=342fcbf6fda017bdd38d56ce0fa7c9e59e589f3b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index d6f8041..49c030e 100644
--- 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;
 
@@ -154,7 +154,9 @@ struct world_instance {
                  ent_skateshop,
                  ent_marker,
                  ent_camera,
-                 ent_swspreview;
+                 ent_swspreview,
+                 ent_ccmd,
+                 ent_challenge;
 
    ent_gate *rendering_gate;
 
@@ -168,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;
@@ -179,6 +181,9 @@ struct world_instance {
           mesh_water;
 
    rb_object rb_geo;
+
+   ent_challenge *challenge_target;
+   f32 challenge_timer;
 };
 
 struct world_static {
@@ -191,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;