X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_remote.c;h=e910170ca3f2d4462adc4a9d1b42811fe4bc39ff;hb=78cc452a8343821ba47c0905d755657847dafd25;hp=b4a5c1067f595da4214cf8dbbb511471a344e89b;hpb=e2fcbe131ec9d296d3175ce2fcafcfbcf058f916;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_remote.c b/player_remote.c index b4a5c10..e910170 100644 --- a/player_remote.c +++ b/player_remote.c @@ -642,10 +642,12 @@ static int remote_players_randomize( int argc, const char *argv[] ){ for( int i=0; iactive = (vg_randu32() & 0x1)? 2: 0; - player->isfriend = vg_randu32() & vg_randu32() & 0x1; - player->isblocked = vg_randu32() & vg_randu32() & vg_randu32() & 0x1; - player->world_match[ 0 ] = vg_randu32() & 0x1; + player->active = (vg_randu32(&vg.rand) & 0x1)? 2: 0; + player->isfriend = vg_randu32(&vg.rand) & vg_randu32(&vg.rand) & 0x1; + player->isblocked = vg_randu32(&vg.rand) & + vg_randu32(&vg.rand) & + vg_randu32(&vg.rand) & 0x1; + player->world_match[ 0 ] = vg_randu32(&vg.rand) & 0x1; player->world_match[ 1 ] = 0; if( player->world_match[0] ) @@ -654,20 +656,20 @@ static int remote_players_randomize( int argc, const char *argv[] ){ player->active_world = NULL; for( int i=0; iusername)-1; i ++ ){ - player->username[i] = 'a' + (vg_randu32() % 30); + player->username[i] = 'a' + (vg_randu32(&vg.rand) % 30); player->username[i+1] = '\0'; - if( (vg_randu32() % 8) == 3 ) + if( (vg_randu32(&vg.rand) % 8) == 3 ) break; } for( int i=0; i<3; i ++ ){ - player->medals[i] = vg_randu32() % 3; + player->medals[i] = vg_randu32(&vg.rand) % 3; } v3f pos; - vg_rand_sphere( pos ); + vg_rand_sphere( &vg.rand, pos ); v3_muladds( localplayer.rb.co, pos, 100.0f, netplayers.final_mtx[ i*localplayer.skeleton.bone_count][3] ); } @@ -857,15 +859,20 @@ static void remote_player_gui_info( ui_rect box, } static void remote_players_imgui_lobby(void){ - /* - * TODO: send location string over the network */ + if( network_client.user_intent == k_server_intent_online ){ + if( !(steam_ready && + (network_client.state == k_ESteamNetworkingConnectionState_Connected))) + { + return; + } + } ui_px y = 50, width = 200, height = 42, gap = 2, x = vg.window_x - width; vg_ui.font = &vg_ui_font_big; ui_text( (ui_rect){ x, 0, width, height }, - "Online Players", 1, k_ui_align_middle_center, 0 ); + "In World", 1, k_ui_align_middle_center, 0 ); vg_ui.font = &vg_ui_font_small;