more sensible world loading stuff (wip)

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index e95f005b5bffb8042108ab82deed8e567b3d6a6b..c412a88097cc3bb98ba044f0a08df45c4dc49764 100644 (file)
--- a/world.h
+++ b/world.h
@@ -201,8 +201,18 @@ struct world_static {
    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;