some niceer ui stuff

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index 7d513f9d0a768043cc7d3a63531614ab83cbb5b3..e95f005b5bffb8042108ab82deed8e567b3d6a6b 100644 (file)
--- a/world.h
+++ b/world.h
@@ -156,7 +156,9 @@ struct world_instance {
                  ent_camera,
                  ent_swspreview,
                  ent_ccmd,
-                 ent_challenge;
+                 ent_challenge,
+                 ent_unlock,
+                 ent_relay;
 
    ent_gate *rendering_gate;
 
@@ -170,9 +172,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;
@@ -181,6 +183,9 @@ struct world_instance {
           mesh_water;
 
    rb_object rb_geo;
+
+   ent_challenge *challenge_target;
+   f32 challenge_timer;
 };
 
 struct world_static {