projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clear runs when respawning
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index 4da3791969609b9d12742a6e64d783aaa01c15c7..d35f0646b6ec1e8ed76b4d789e2f57bac4a74793 100644
(file)
--- a/
world.h
+++ b/
world.h
@@
-165,9
+165,10
@@
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_
relay
,
+ ent_
cubemap
;
ent_gate *rendering_gate;
ent_gate *rendering_gate;
@@
-190,11
+191,9
@@
struct world_instance {
glmesh mesh_geo,
mesh_no_collide,
mesh_water;
glmesh mesh_geo,
mesh_no_collide,
mesh_water;
+ u32 cubemap_cooldown, cubemap_side;
rb_object rb_geo;
rb_object rb_geo;
-
- ent_challenge *challenge_target;
- f32 challenge_timer;
};
struct world_static {
};
struct world_static {
@@
-212,6
+211,13
@@
struct world_static {
world_instance instances[4];
i32 active_instance;
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;
addon_reg *addon_hub,
*addon_client;
@@
-227,5
+233,6
@@
static world_static;
static void world_init(void);
static world_instance *world_current_instance(void);
static void world_init(void);
static world_instance *world_current_instance(void);
+static void world_set_active_instance( u32 index );
#endif /* WORLD_H */
#endif /* WORLD_H */