celisej567/source-engine
1
0
Fork 0
mirror of https://github.com/celisej567/source-engine.git synced 2025-12-31 21:48:22 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

serverbrowser: rewrite according my expectations

Browse Source
This commit is contained in:
nillerusr
2023-02-11 19:39:01 +03:00
parent efbcaf7820
commit 2b2ca63b48
10 changed files with 155 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
serverbrowser/DialogAddServer.cpp
View File

@@ -177,15 +177,13 @@ void CDialogAddServer::OnOK()
if ( AllowInvalidIPs() || netaddr.IsValid() )
{
gameserveritem_t server;
newgameserver_t server;
memset(&server, 0, sizeof(server));
server.SetName( address );
strncpy( server.m_szServerName, address, sizeof(server.m_szServerName) );
// We assume here that the query and connection ports are the same. This is why it's much
// better if they click "Servers" and choose a server in there.
server.m_NetAdr.Init( netaddr.GetIPHostByteOrder(), netaddr.GetPort(), netaddr.GetPort() );
server.m_nAppID = 0;
server.m_NetAdr = netaddr;
FinishAddServer( server );
}
else
@@ -257,21 +255,21 @@ void CDialogAddServer::TestServers()
m_pTabPanel->AddPage( m_pDiscoveredGames, str );
m_pTabPanel->InvalidateLayout();
FOR_EACH_VEC( vecAdress, iAddress )
/* FOR_EACH_VEC( vecAdress, iAddress )
{
m_Queries.AddToTail( steamapicontext->SteamMatchmakingServers()->PingServer( vecAdress[ iAddress ].GetIPHostByteOrder(), vecAdress[ iAddress ].GetPort(), this ) );
}
}*/
}
//-----------------------------------------------------------------------------
// Purpose: A server answered our ping
//-----------------------------------------------------------------------------
void CDialogAddServer::ServerResponded( gameserveritem_t &server )
void CDialogAddServer::ServerResponded( newgameserver_t &server )
{
KeyValues *kv = new KeyValues( "Server" );
kv->SetString( "name", server.GetName() );
kv->SetString( "name", server.m_szServerName );
kv->SetString( "map", server.m_szMap );
kv->SetString( "GameDir", server.m_szGameDir );
kv->SetString( "GameDesc", server.m_szGameDescription );
@@ -279,21 +277,9 @@ void CDialogAddServer::ServerResponded( gameserveritem_t &server )
kv->SetInt( "password", server.m_bPassword ? 1 : 0);
kv->SetInt( "bots", server.m_nBotPlayers ? 2 : 0);
kv->SetInt( "Replay", IsReplayServer( server ) ? 5 : 0 );
kv->SetInt("secure", 0);
if ( server.m_bSecure )
{
// show the denied icon if banned from secure servers, the secure icon otherwise
kv->SetInt("secure", ServerBrowser().IsVACBannedFromGame( server.m_nAppID ) ? 4 : 3);
}
else
{
kv->SetInt("secure", 0);
}
netadr_t reportedIPAddr;
reportedIPAddr.SetIP( server.m_NetAdr.GetIP() );
reportedIPAddr.SetPort( server.m_NetAdr.GetConnectionPort() );
kv->SetString("IPAddr", reportedIPAddr.ToString() );
kv->SetString("IPAddr", server.m_NetAdr.ToString() );
char buf[32];
Q_snprintf(buf, sizeof(buf), "%d / %d", server.m_nPlayers, server.m_nMaxPlayers);
@@ -366,7 +352,7 @@ void CDialogAddServer::OnItemSelected()
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CDialogAddServer::FinishAddServer( gameserveritem_t &pServer )
void CDialogAddServer::FinishAddServer( newgameserver_t &pServer )
{
ServerBrowserDialog().AddServerToFavorites( pServer );
}