wrong world display
authorhgn <hgodden00@gmail.com>
Mon, 27 Nov 2023 07:03:54 +0000 (07:03 +0000)
committerhgn <hgodden00@gmail.com>
Mon, 27 Nov 2023 07:12:34 +0000 (07:12 +0000)
player_remote.c

index 7256fbd08548feb7cf7b2d39127bd25b071eeccf..b4a5c1067f595da4214cf8dbbb511471a344e89b 100644 (file)
@@ -616,6 +616,8 @@ static void render_remote_players( world_instance *world, camera *cam ){
       struct network_player *player = &netplayers.list[i];
       if( !player->active || player->isblocked ) continue;
       if( player->active_world != world ) continue;
+      if( !player->isfriend && 
+            (world-world_static.instances == k_world_purpose_hub)) continue;
       
       m4x3f *final_mtx = &netplayers.final_mtx[ sk->bone_count*i ];
 
@@ -877,8 +879,7 @@ static void remote_players_imgui_lobby(void){
       struct network_player *player = &netplayers.list[i];
       if( !player->active || player->isblocked ) continue;
 
-      int in_same_world = player->active_world != world_current_instance();
-
+      int in_same_world = player->active_world == world_current_instance();
       if( !player->isfriend && !in_same_world )
          continue;
 
@@ -906,6 +907,8 @@ static void remote_players_imgui_world( world_instance *world, m4x4f pv,
 
          if( !player->active_world )
             continue;
+         if( !player->isfriend && 
+               (world-world_static.instances == k_world_purpose_hub)) continue;
 
          /* their in our active subworld */
          if( player->active_world != world ){