Merge all features from glider feature branch

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index 7b1074354901f8abb99718e9c09a1f5f8ab8de93..6ff3afbc00f295d7a459eec32d0eff75bcc7e719 100644 (file)
--- a/world.h
+++ b/world.h
@@ -56,7 +56,8 @@ static void skaterift_world_get_save_path( enum world_purpose which,
 static f32   k_day_length            = 30.0f; /* minutes */
 static i32   k_debug_light_indices   = 0,
              k_debug_light_complexity= 0,
-             k_light_preview         = 0;
+             k_light_preview         = 0,
+             k_light_editor          = 0;
 
 #define WORLD_SURFACE_HAS_TRAFFIC 0x1
 #define WORLD_SURFACE_HAS_PROPS   0x2
@@ -187,7 +188,8 @@ struct world_instance {
                  ent_cubemap,
                  ent_miniworld,
                  ent_prop,
-                 ent_region;
+                 ent_region,
+                 ent_glider;
 
    enum skybox {
       k_skybox_default,