preview for challenges and new system

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index d3bc38863c7a1a33d1f49caaaa7697a8750c504b..63bfa9c4f9fb6d0d6e442e074cf5341be211f599 100644 (file)
--- a/world.h
+++ b/world.h
@@ -165,8 +165,8 @@ struct world_instance {
                  ent_camera,
                  ent_swspreview,
                  ent_ccmd,
+                 ent_objective,
                  ent_challenge,
-                 ent_unlock,
                  ent_relay,
                  ent_cubemap;
 
@@ -191,10 +191,11 @@ struct world_instance {
    glmesh mesh_geo, 
           mesh_no_collide,
           mesh_water;
+   u32 cubemap_cooldown, cubemap_side;
 
    rb_object rb_geo;
 
-   ent_challenge *challenge_target;
+   ent_objective *challenge_target;
    f32 challenge_timer;
 };
 
@@ -214,6 +215,11 @@ struct world_static {
    world_instance instances[4];
    i32            active_instance;
 
+   /* TODO: FOCUSED_INSTANCE */
+   u32            focused_entity; /* like skateshop, challenge.. */
+   f32            focus_strength;
+   camera         focus_cam;
+
    addon_reg *addon_hub,
              *addon_client;