X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=0efe185087d5b5087098117ad86397a5a2eeb6e3;hb=7f4c71033c06954f3094c9d51219628438b80ac8;hp=98b9df90bc7e120bfea347fcad2e088037b444cc;hpb=1d8d9366022c064ef56d80d463c90a79721c6243;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index 98b9df9..0efe185 100644
--- a/world.h
+++ b/world.h
@@ -18,6 +18,7 @@ enum world_geo_type{
 };
 
 enum world_purpose{
+   k_world_purpose_invalid = -1,
    k_world_purpose_hub = 0,
    k_world_purpose_client = 1,
    k_world_max
@@ -62,6 +63,9 @@ struct world_instance {
     * -------------------------------------------------------
     */
 
+   v4f player_co, player_angles;
+   v3f cam_co;
+
    void *heap;
    enum world_status{
       k_world_status_unloaded = 0,
@@ -176,7 +180,14 @@ struct world_instance {
                  ent_objective,
                  ent_challenge,
                  ent_relay,
-                 ent_cubemap;
+                 ent_cubemap,
+                 ent_miniworld,
+                 ent_prop;
+
+   enum skybox {
+      k_skybox_default,
+      k_skybox_space
+   } skybox;
 
    ent_gate *rendering_gate;
 
@@ -243,6 +254,6 @@ static world_static;
 
 static void world_init(void);
 static world_instance *world_current_instance(void);
-static void world_set_active_instance( u32 index );
+static void world_switch_instance( u32 index );
 
 #endif /* WORLD_H */