projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
preview for challenges and new system
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index 9c1a1cf800c107e11764fdc538654a16a690630e..63bfa9c4f9fb6d0d6e442e074cf5341be211f599 100644
(file)
--- a/
world.h
+++ b/
world.h
@@
-165,8
+165,8
@@
struct world_instance {
ent_camera,
ent_swspreview,
ent_ccmd,
ent_camera,
ent_swspreview,
ent_ccmd,
+ ent_objective,
ent_challenge,
ent_challenge,
- ent_unlock,
ent_relay,
ent_cubemap;
ent_relay,
ent_cubemap;
@@
-195,7
+195,7
@@
struct world_instance {
rb_object rb_geo;
rb_object rb_geo;
- ent_
challeng
e *challenge_target;
+ ent_
objectiv
e *challenge_target;
f32 challenge_timer;
};
f32 challenge_timer;
};
@@
-215,6
+215,11
@@
struct world_static {
world_instance instances[4];
i32 active_instance;
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;
addon_reg *addon_hub,
*addon_client;