challenge effects

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index 63bfa9c4f9fb6d0d6e442e074cf5341be211f599..d35f0646b6ec1e8ed76b4d789e2f57bac4a74793 100644 (file)
--- a/world.h
+++ b/world.h
@@ -194,9 +194,6 @@ struct world_instance {
    u32 cubemap_cooldown, cubemap_side;
 
    rb_object rb_geo;
-
-   ent_objective *challenge_target;
-   f32 challenge_timer;
 };
 
 struct world_static {
@@ -214,12 +211,14 @@ 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;
 
+   /* challenges */
+   ent_objective *challenge_target;
+   f32 challenge_timer;
+
    addon_reg *addon_hub,
              *addon_client;
 
@@ -234,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 */