completed all glider stuff

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index 9d8cd4970dc8c037d98b30eb03ce5f4d48e844ff..6ff3afbc00f295d7a459eec32d0eff75bcc7e719 100644 (file)
--- a/world.h
+++ b/world.h
@@ -56,8 +56,11 @@ 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
 
 struct world_instance {
    /* Fixed items
@@ -155,6 +158,7 @@ struct world_instance {
       mdl_material info;
       mdl_submesh sm_geo,
                   sm_no_collide;
+      u32 flags;
    }
    * surfaces;
    u32 surface_count;
@@ -184,7 +188,8 @@ struct world_instance {
                  ent_cubemap,
                  ent_miniworld,
                  ent_prop,
-                 ent_region;
+                 ent_region,
+                 ent_glider;
 
    enum skybox {
       k_skybox_default,
@@ -214,8 +219,6 @@ struct world_instance {
           mesh_water;
    u32 cubemap_cooldown, cubemap_side;
 
-   rb_object rb_geo;
-
    /* leaderboards */
    struct leaderboard_cache *leaderboard_cache;