refactor (reduction)

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index 9c1a1cf800c107e11764fdc538654a16a690630e..d35f0646b6ec1e8ed76b4d789e2f57bac4a74793 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;
 
@@ -194,9 +194,6 @@ struct world_instance {
    u32 cubemap_cooldown, cubemap_side;
 
    rb_object rb_geo;
-
-   ent_challenge *challenge_target;
-   f32 challenge_timer;
 };
 
 struct world_static {
@@ -214,6 +211,13 @@ struct world_static {
 
    world_instance instances[4];
    i32            active_instance;
+   u32            focused_entity; /* like skateshop, challenge.. */
+   f32            focus_strength;
+   camera         focus_cam;
+
+   /* challenges */
+   ent_objective *challenge_target;
+   f32 challenge_timer;
 
    addon_reg *addon_hub,
              *addon_client;
@@ -229,5 +233,6 @@ static world_static;
 
 static void world_init(void);
 static world_instance *world_current_instance(void);
+static void world_set_active_instance( u32 index );
 
 #endif /* WORLD_H */