add player guide

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index d6f80412bb97f00336614b124198b905d2fcd058..7d513f9d0a768043cc7d3a63531614ab83cbb5b3 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;
 
@@ -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;
 
@@ -191,10 +193,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;