projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yet again more world load revision
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index d6f80412bb97f00336614b124198b905d2fcd058..c412a88097cc3bb98ba044f0a08df45c4dc49764 100644
(file)
--- a/
world.h
+++ b/
world.h
@@
-34,8
+34,8
@@
typedef struct world_instance world_instance;
/* console variables */
/* console variables */
-static f
loat
k_day_length = 30.0f; /* minutes */
-static i
nt
k_debug_light_indices = 0,
+static f
32
k_day_length = 30.0f; /* minutes */
+static i
32
k_debug_light_indices = 0,
k_debug_light_complexity= 0,
k_light_preview = 0;
k_debug_light_complexity= 0,
k_light_preview = 0;
@@
-154,7
+154,11
@@
struct world_instance {
ent_skateshop,
ent_marker,
ent_camera,
ent_skateshop,
ent_marker,
ent_camera,
- ent_swspreview;
+ ent_swspreview,
+ ent_ccmd,
+ ent_challenge,
+ ent_unlock,
+ ent_relay;
ent_gate *rendering_gate;
ent_gate *rendering_gate;
@@
-168,9
+172,9
@@
struct world_instance {
scene_lines;
/* spacial mappings */
scene_lines;
/* spacial mappings */
- bh_tree *
audi
o_bh,
- *
volume_bh,
-
*geo_bh
;
+ bh_tree *
ge
o_bh,
+ *
entity_bh;
+
u32 *entity_list
;
/* graphics */
glmesh mesh_route_lines;
/* graphics */
glmesh mesh_route_lines;
@@
-179,6
+183,9
@@
struct world_instance {
mesh_water;
rb_object rb_geo;
mesh_water;
rb_object rb_geo;
+
+ ent_challenge *challenge_target;
+ f32 challenge_timer;
};
struct world_static {
};
struct world_static {
@@
-191,10
+198,21
@@
struct world_static {
u32 current_run_version;
double time, rewind_from, rewind_to, last_use;
u32 current_run_version;
double time, rewind_from, rewind_to, last_use;
- int in_volume;
+ u32 active_trigger_volumes[8];
+ u32 active_trigger_volume_count;
+
+ world_instance instances[4];
+ i32 active_instance;
- world_instance worlds[4];
- u32 active_world;
+ addon_reg *addon_hub,
+ *addon_client;
+
+ enum world_loader_state{
+ k_world_loader_none,
+ k_world_loader_preload,
+ k_world_loader_load
+ }
+ load_state;
}
static world_static;
}
static world_static;