Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OpenJK Update #209

Merged
merged 3 commits into from
Sep 22, 2024
Merged

OpenJK Update #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f7fc86
Fix setting wrong servertime on mapchange with active clients
ensiform Jun 20, 2024
e932457
Check netadr by const pointer instead of by value
ensiform Jun 20, 2024
54521f2
Missed reference in null client for CL_PacketEvent
ensiform Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codemp/client/cl_input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1510,7 +1510,7 @@ qboolean CL_ReadyToSendPacket( void ) {
}

// send every frame for LAN
if ( cl_lanForcePackets->integer && Sys_IsLANAddress( clc.netchan.remoteAddress ) ) {
if ( cl_lanForcePackets->integer && Sys_IsLANAddress( &clc.netchan.remoteAddress ) ) {
return qtrue;
}

Expand Down
14 changes: 7 additions & 7 deletions codemp/client/cl_lan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ int LAN_AddServer(int source, const char *name, const char *address) {
if (servers && *count < max) {
NET_StringToAdr( address, &adr );
for ( i = 0; i < *count; i++ ) {
if (NET_CompareAdr(servers[i].adr, adr)) {
if (NET_CompareAdr(&servers[i].adr, &adr)) {
break;
}
}
Expand All @@ -164,7 +164,7 @@ int LAN_AddFavAddr( const char *address ) {
}

for ( int i = 0; i < cls.numfavoriteservers; i++ ) {
if ( NET_CompareAdr( cls.favoriteServers[i].adr, adr ) ) {
if ( NET_CompareAdr( &cls.favoriteServers[i].adr, &adr ) ) {
return 0;
}
}
Expand Down Expand Up @@ -207,7 +207,7 @@ void LAN_RemoveServer(int source, const char *addr) {
netadr_t comp;
NET_StringToAdr( addr, &comp );
for (i = 0; i < *count; i++) {
if (NET_CompareAdr( comp, servers[i].adr)) {
if (NET_CompareAdr( &comp, &servers[i].adr)) {
int j = i;
while (j < *count - 1) {
Com_Memcpy(&servers[j], &servers[j+1], sizeof(servers[j]));
Expand Down Expand Up @@ -251,20 +251,20 @@ void LAN_GetServerAddressString( int source, int n, char *buf, int buflen ) {
switch (source) {
case AS_LOCAL :
if (n >= 0 && n < MAX_OTHER_SERVERS) {
Q_strncpyz(buf, NET_AdrToString( cls.localServers[n].adr) , buflen );
Q_strncpyz(buf, NET_AdrToString( &cls.localServers[n].adr) , buflen );
return;
}
break;
case AS_MPLAYER:
case AS_GLOBAL :
if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
Q_strncpyz(buf, NET_AdrToString( cls.globalServers[n].adr) , buflen );
Q_strncpyz(buf, NET_AdrToString( &cls.globalServers[n].adr) , buflen );
return;
}
break;
case AS_FAVORITES :
if (n >= 0 && n < MAX_OTHER_SERVERS) {
Q_strncpyz(buf, NET_AdrToString( cls.favoriteServers[n].adr) , buflen );
Q_strncpyz(buf, NET_AdrToString( &cls.favoriteServers[n].adr) , buflen );
return;
}
break;
Expand Down Expand Up @@ -316,7 +316,7 @@ void LAN_GetServerInfo( int source, int n, char *buf, int buflen ) {
Info_SetValueForKey( info, "fdisable", va("%i", server->forceDisable ) );
Info_SetValueForKey( info, "game", server->game);
Info_SetValueForKey( info, "gametype", va("%i",server->gameType));
Info_SetValueForKey( info, "addr", NET_AdrToString(server->adr));
Info_SetValueForKey( info, "addr", NET_AdrToString(&server->adr));
Info_SetValueForKey( info, "g_humanplayers", va( "%i", server->humans ) );
Info_SetValueForKey( info, "bots", va( "%i", server->bots ) );
// Info_SetValueForKey( info, "sv_allowAnonymous", va("%i", server->allowAnonymous));
Expand Down
Loading