projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
review save method
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index 49c030ea37260f7945311ee69e4a9db447882f9d..c412a88097cc3bb98ba044f0a08df45c4dc49764 100644
(file)
--- a/
world.h
+++ b/
world.h
@@
-156,7
+156,9
@@
struct world_instance {
ent_camera,
ent_swspreview,
ent_ccmd,
ent_camera,
ent_swspreview,
ent_ccmd,
- ent_challenge;
+ ent_challenge,
+ ent_unlock,
+ ent_relay;
ent_gate *rendering_gate;
ent_gate *rendering_gate;
@@
-199,8
+201,18
@@
struct world_static {
u32 active_trigger_volumes[8];
u32 active_trigger_volume_count;
u32 active_trigger_volumes[8];
u32 active_trigger_volume_count;
- world_instance worlds[4];
- i32 active_world;
+ world_instance instances[4];
+ i32 active_instance;
+
+ 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;