remove sub-world concept

[carveJwlIkooP6JGAAIwe30JlM.git] / player_remote.c

diff --git a/player_remote.c b/player_remote.c
index b533d389e5af955ea6bc8dd9b0aa76d7c79cb604..3b7e6a6e88ef662c0a36420e3b69b210a5672656 100644 (file)
--- a/player_remote.c
+++ b/player_remote.c
@@ -22,24 +22,24 @@ static void player_remote_clear( struct network_player *player ){
 static void relink_remote_player_worlds( u32 client_id ){
    struct network_player *player = &netplayers.list[client_id];
 
-   player->hub_match = 0;
-   player->client_match = 0;
-
-   addon_alias q0,q1;
-   addon_uid_to_alias( player->items[k_netmsg_playeritem_world0], &q0 );
-   addon_uid_to_alias( player->items[k_netmsg_playeritem_world1], &q1 );
+   addon_alias q[2];
+   addon_uid_to_alias( player->items[k_netmsg_playeritem_world0], &q[0] );
+   addon_uid_to_alias( player->items[k_netmsg_playeritem_world1], &q[1] );
 
    /*
     * currently in 10.23, the hub world will always be the same.
     * this might but probably wont change in the future
     */
-   if( world_static.addon_hub )
-      if( addon_alias_eq( &q0, &world_static.addon_hub->alias ) )
-         player->hub_match = 1;
+   for( u32 i=0; i<k_world_max; i++ ){
+      addon_reg *reg = world_static.instance_addons[ i ];
+
+      player->world_match[i] = 0;
 
-   if( world_static.addon_client )
-      if( addon_alias_eq( &q1, &world_static.addon_client->alias ) )
-         player->client_match = 1;
+      if( reg ){
+         if( addon_alias_eq( &q[i], &world_static.instance_addons[i]->alias ) )
+            player->world_match[i] = 1;
+      }
+   }
 }
 
 /* 
@@ -499,16 +499,8 @@ static void pose_remote_player( u32 index,
       memcpy( board_pose, &pose0.board, sizeof(*board_pose) );
    }
 
-   if( instance_id ){
-      if( player->client_match ){
-         player->active_world = &world_static.instances[ instance_id ];
-      }
-   }
-   else{
-      if( player->hub_match ){
-         player->active_world = &world_static.instances[ instance_id ];
-      }
-   }
+   if( player->world_match[ instance_id ] )
+      player->active_world = &world_static.instances[ instance_id ];
 }
 
 /*