X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=63bfa9c4f9fb6d0d6e442e074cf5341be211f599;hb=6190deb68aa1c9e92ede62ea05c2a755bf5516de;hp=9c1a1cf800c107e11764fdc538654a16a690630e;hpb=c52dacb7bc07e300312e45d605d206222dcbb181;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index 9c1a1cf..63bfa9c 100644 --- 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; @@ -195,7 +195,7 @@ struct world_instance { rb_object rb_geo; - ent_challenge *challenge_target; + ent_objective *challenge_target; f32 challenge_timer; }; @@ -215,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;