Merge remote-tracking branch 'yquake2/master'

This commit is contained in:
Denis Pauk 2025-03-15 13:42:36 +02:00
commit 3578d4353d
7 changed files with 18 additions and 15 deletions

View file

@ -193,7 +193,7 @@ NET_CompareAdr(netadr_t a, netadr_t b)
if (a.type == NA_LOOPBACK)
{
return TRUE;
return true;
}
if (a.type == NA_IP)
@ -240,7 +240,7 @@ NET_CompareBaseAdr(netadr_t a, netadr_t b)
if (a.type == NA_LOOPBACK)
{
return TRUE;
return true;
}
if (a.type == NA_IP)
@ -411,7 +411,7 @@ NET_StringToSockaddr(const char *s, struct sockaddr_storage *sadr)
if (!*space)
{
Com_Printf("NET_StringToSockaddr: invalid IPv6 address %s\n", s);
return 0;
return false;
}
*space++ = '\0';
@ -431,7 +431,7 @@ NET_StringToSockaddr(const char *s, struct sockaddr_storage *sadr)
/* Error */
Com_Printf("NET_StringToSockaddr: string %s:\n%s\n", s,
gai_strerror(err));
return 0;
return false;
}
switch (resultp->ai_family)

View file

@ -1179,7 +1179,7 @@ qboolean CL_PendingHTTPDownloads(void)
return false;
}
return pendingCount + handleCount;
return ((pendingCount + handleCount) > 0);
}
/*

View file

@ -35,6 +35,7 @@
*/
#include <SDL2/SDL.h>
#include <limits.h>
#include "header/input.h"
#include "../header/keyboard.h"

View file

@ -35,6 +35,7 @@
*/
#include <SDL3/SDL.h>
#include <limits.h>
#include "SDL3/SDL_gamepad.h"
#include "SDL3/SDL_properties.h"

View file

@ -1346,7 +1346,7 @@ SDL_BackendInit(void)
but this is Quake 2 ... */
if (snd_inited)
{
return 1;
return true;
}
int sndbits = (Cvar_Get("sndbits", "16", CVAR_ARCHIVE))->value;
@ -1371,7 +1371,7 @@ SDL_BackendInit(void)
#endif
{
Com_Printf ("Couldn't init SDL audio: %s.\n", SDL_GetError ());
return 0;
return false;
}
}
const char* drivername = SDL_GetCurrentAudioDriver();
@ -1434,7 +1434,7 @@ SDL_BackendInit(void)
{
Com_Printf("SDL_OpenAudio() failed: %s\n", SDL_GetError());
SDL_QuitSubSystem(SDL_INIT_AUDIO);
return 0;
return false;
}
/* This points to the frontend */
@ -1475,7 +1475,7 @@ SDL_BackendInit(void)
soundtime = 0;
snd_inited = 1;
return 1;
return true;
}
/*
@ -1510,7 +1510,7 @@ SDL_BackendInit(void)
but this is Quake 2 ... */
if (snd_inited)
{
return 1;
return true;
}
int sndbits = (Cvar_Get("sndbits", "16", CVAR_ARCHIVE))->value;
@ -1531,7 +1531,7 @@ SDL_BackendInit(void)
if (SDL_Init(SDL_INIT_AUDIO) == -1)
{
Com_Printf ("Couldn't init SDL audio: %s.\n", SDL_GetError ());
return 0;
return false;
}
}
const char* drivername = SDL_GetCurrentAudioDriver();
@ -1594,7 +1594,7 @@ SDL_BackendInit(void)
{
Com_Printf("SDL_OpenAudio() failed: %s\n", SDL_GetError());
SDL_QuitSubSystem(SDL_INIT_AUDIO);
return 0;
return false;
}
/* This points to the frontend */
@ -1635,7 +1635,7 @@ SDL_BackendInit(void)
soundtime = 0;
snd_inited = 1;
return 1;
return true;
}
/*

View file

@ -35,6 +35,7 @@
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include <strings.h>
#include <stdlib.h>
#include <time.h>

View file

@ -179,11 +179,11 @@ SV_FilterPacket(char *from)
{
if ((in & ipfilters[i].mask) == ipfilters[i].compare)
{
return (int)filterban->value;
return (filterban->value != 0);
}
}
return (int)!filterban->value;
return (filterban->value == 0);
}
static void