remove sub-world concept

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index d35f0646b6ec1e8ed76b4d789e2f57bac4a74793..76d43d6e66d6e58f4c5a841983fb1feaa5aa286a 100644 (file)
--- a/world.h
+++ b/world.h
@@ -17,10 +17,10 @@ enum world_geo_type{
 };
 
 enum world_purpose{
-   k_world_purpose_hub,
-   k_world_purpose_client
-}
-purpose;
+   k_world_purpose_hub = 0,
+   k_world_purpose_client = 1,
+   k_world_max
+};
 
 typedef struct world_instance world_instance;
 
@@ -209,8 +209,10 @@ struct world_static {
    u32 active_trigger_volumes[8];
    u32 active_trigger_volume_count;
 
-   world_instance instances[4];
-   i32            active_instance;
+   addon_reg *instance_addons[ k_world_max ];
+   world_instance instances[ k_world_max ];
+
+   enum world_purpose active_instance;
    u32            focused_entity; /* like skateshop, challenge.. */
    f32            focus_strength;
    camera         focus_cam;
@@ -219,9 +221,6 @@ struct world_static {
    ent_objective *challenge_target;
    f32 challenge_timer;
 
-   addon_reg *addon_hub,
-             *addon_client;
-
    enum world_loader_state{
       k_world_loader_none,
       k_world_loader_preload,