X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=d3bc38863c7a1a33d1f49caaaa7697a8750c504b;hb=14b3d5c13faab36bd37ae27aa8c1501ba7146f89;hp=d6f80412bb97f00336614b124198b905d2fcd058;hpb=342fcbf6fda017bdd38d56ce0fa7c9e59e589f3b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index d6f8041..d3bc388 100644
--- a/world.h
+++ b/world.h
@@ -16,8 +16,17 @@ enum world_geo_type{
    k_world_geo_type_water = 2
 };
 
+enum world_purpose{
+   k_world_purpose_hub,
+   k_world_purpose_client
+}
+purpose;
+
 typedef struct world_instance world_instance;
 
+static void skaterift_world_get_save_path( enum world_purpose which, 
+                                           char buf[128] );
+
 /* submodule headers */
 #include "world_entity.h"
 #include "world_gate.h"
@@ -34,8 +43,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 +163,12 @@ struct world_instance {
                  ent_skateshop,
                  ent_marker,
                  ent_camera,
-                 ent_swspreview;
+                 ent_swspreview,
+                 ent_ccmd,
+                 ent_challenge,
+                 ent_unlock,
+                 ent_relay,
+                 ent_cubemap;
 
    ent_gate *rendering_gate;
 
@@ -168,9 +182,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 +193,9 @@ struct world_instance {
           mesh_water;
 
    rb_object rb_geo;
+
+   ent_challenge *challenge_target;
+   f32 challenge_timer;
 };
 
 struct world_static {
@@ -191,10 +208,21 @@ 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;
+   world_instance instances[4];
+   i32            active_instance;
+
+   addon_reg *addon_hub,
+             *addon_client;
+
+   enum world_loader_state{
+      k_world_loader_none,
+      k_world_loader_preload,
+      k_world_loader_load
+   }
+   load_state;
 }
 static world_static;