fix misc errata

master
an 2019-11-25 16:33:54 -05:00
parent 2ebc7fb7dd
commit a24e23f6d7
11 changed files with 57 additions and 38 deletions

View File

@ -189,8 +189,8 @@ typedef struct mnode_s
mplane_t *plane;
struct mnode_s *children[2];
unsigned int firstsurface;
unsigned int numsurfaces;
int firstsurface;
int numsurfaces;
} mnode_t;

View File

@ -76,5 +76,6 @@ char *PL_GetClipboardData (void)
void PL_ErrorDialog (const char *errorMsg)
{
(void)errorMsg;
}

View File

@ -930,9 +930,9 @@ void R_DrawTextureChains_GLSL (qmodel_t *model, entity_t *ent, texchain_t chain)
GL_EnableVertexAttribArrayFunc (texCoordsAttrIndex);
GL_EnableVertexAttribArrayFunc (LMCoordsAttrIndex);
GL_VertexAttribPointerFunc (vertAttrIndex, 3, GL_FLOAT, GL_FALSE, VERTEXSIZE * sizeof(float), ((float *)0));
GL_VertexAttribPointerFunc (texCoordsAttrIndex, 2, GL_FLOAT, GL_FALSE, VERTEXSIZE * sizeof(float), ((float *)0) + 3);
GL_VertexAttribPointerFunc (LMCoordsAttrIndex, 2, GL_FLOAT, GL_FALSE, VERTEXSIZE * sizeof(float), ((float *)0) + 5);
GL_VertexAttribPointerFunc (vertAttrIndex, 3, GL_FLOAT, GL_FALSE, VERTEXSIZE * sizeof(float), &((float *)NULL)[0]);
GL_VertexAttribPointerFunc (texCoordsAttrIndex, 2, GL_FLOAT, GL_FALSE, VERTEXSIZE * sizeof(float), &((float *)NULL)[3]);
GL_VertexAttribPointerFunc (LMCoordsAttrIndex, 2, GL_FLOAT, GL_FALSE, VERTEXSIZE * sizeof(float), &((float *)NULL)[3 + 2]);
// set uniforms
GL_Uniform1iFunc (texLoc, 0);

View File

@ -116,11 +116,13 @@ static void S_SoundInfo_f (void)
static void SND_Callback_sfxvolume (cvar_t *var)
{
(void)var;
SND_InitScaletable ();
}
static void SND_Callback_snd_filterquality (cvar_t *var)
{
(void)var;
if (snd_filterquality.value < 1 || snd_filterquality.value > 5)
{
Con_Printf ("snd_filterquality must be between 1 and 5\n");

View File

@ -80,6 +80,7 @@ static void
flac_error_func (const FLAC__StreamDecoder *decoder,
FLAC__StreamDecoderErrorStatus status, void *client_data)
{
(void)decoder;
flacfile_t *ff = (flacfile_t *) client_data;
ff->error = -1;
Con_Printf ("FLAC: decoder error %i\n", status);
@ -90,6 +91,7 @@ flac_read_func (const FLAC__StreamDecoder *decoder, FLAC__byte buffer[],
FLAC_SIZE_T *bytes, void *client_data)
{
flacfile_t *ff = (flacfile_t *) client_data;
(void)decoder;
if (*bytes > 0)
{
*bytes = FS_fread(buffer, 1, *bytes, ff->file);
@ -107,6 +109,7 @@ flac_seek_func (const FLAC__StreamDecoder *decoder,
FLAC__uint64 absolute_byte_offset, void *client_data)
{
flacfile_t *ff = (flacfile_t *) client_data;
(void)decoder;
if (FS_fseek(ff->file, (long)absolute_byte_offset, SEEK_SET) < 0)
return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
@ -118,6 +121,7 @@ flac_tell_func (const FLAC__StreamDecoder *decoder,
{
flacfile_t *ff = (flacfile_t *) client_data;
long pos = FS_ftell (ff->file);
(void)decoder;
if (pos < 0) return FLAC__STREAM_DECODER_TELL_STATUS_ERROR;
*absolute_byte_offset = (FLAC__uint64) pos;
return FLAC__STREAM_DECODER_TELL_STATUS_OK;
@ -128,6 +132,7 @@ flac_length_func (const FLAC__StreamDecoder *decoder,
FLAC__uint64 *stream_length, void *client_data)
{
flacfile_t *ff = (flacfile_t *) client_data;
(void)decoder;
*stream_length = (FLAC__uint64) FS_filelength (ff->file);
return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
}
@ -136,6 +141,7 @@ static FLAC__bool
flac_eof_func (const FLAC__StreamDecoder *decoder, void *client_data)
{
flacfile_t *ff = (flacfile_t *) client_data;
(void)decoder;
if (FS_feof (ff->file)) return true;
return false;
}
@ -146,6 +152,7 @@ flac_write_func (const FLAC__StreamDecoder *decoder,
void *client_data)
{
flacfile_t *ff = (flacfile_t *) client_data;
(void)decoder;
if (!ff->buffer) {
ff->buffer = (byte *) malloc (ff->info->blocksize * ff->info->channels * ff->info->width);
@ -212,6 +219,7 @@ flac_meta_func (const FLAC__StreamDecoder *decoder,
const FLAC__StreamMetadata *metadata, void *client_data)
{
flacfile_t *ff = (flacfile_t *) client_data;
(void)decoder;
if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO)
{
ff->info->rate = metadata->data.stream_info.sample_rate;

View File

@ -36,6 +36,7 @@
static int opc_fclose (void *f)
{
(void)f;
return 0; /* we fclose() elsewhere. */
}

View File

@ -34,6 +34,8 @@ static void SDLCALL paint_audio (void *unused, Uint8 *stream, int len)
int pos, tobufend;
int len1, len2;
(void)unused;
if (!shm)
{ /* shouldn't happen, but just in case */
memset(stream, 0, len);

View File

@ -375,6 +375,7 @@ static qboolean S_UMX_CodecOpenStream (snd_stream_t *stream)
static int S_UMX_CodecReadStream (snd_stream_t *stream, int bytes, void *buffer)
{
(void)stream, (void)bytes, (void)buffer;
return -1;
}
@ -385,6 +386,7 @@ static void S_UMX_CodecCloseStream (snd_stream_t *stream)
static int S_UMX_CodecRewindStream (snd_stream_t *stream)
{
(void)stream;
return -1;
}

View File

@ -47,6 +47,7 @@
static int ovc_fclose (void *f)
{
(void)f;
return 0; /* we fclose() elsewhere. */
}

View File

@ -237,6 +237,7 @@ static int PartialIPAddress (const char *in, struct qsockaddr *hostaddr)
int UDP_Connect (sys_socket_t socketid, struct qsockaddr *addr)
{
(void)socketid, (void)addr;
return 0;
}

View File

@ -246,7 +246,6 @@ static char const *Sys_GetUserDir(void)
static char user_dir[MAX_OSPATH];
static char app_name[] = "AGWQuake";
size_t n;
char const *home_dir;
#ifdef PLATFORM_OSX
@ -315,6 +314,8 @@ static void Sys_GetBasedir (char *argv0, char *dst, size_t dstsize)
{
char *tmp;
(void)argv0;
if (getcwd(dst, dstsize - 1) == NULL)
Sys_Error ("Couldn't determine current directory");