marrub
/
spingle
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix random crap

master
an 2019-12-03 08:23:56 -05:00
parent 7fcd77c295
commit 61fa56b316
17 changed files with 109 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/common.c
View File

@ -1858,7 +1858,7 @@ static pack_t *COM_LoadPackFile(const char *packfile)
if(Sys_FileOpenRead(packfile, &packhandle) == -1)
return NULL;
Sys_FileRead(packhandle, (void *)&header, sizeof(header));
Sys_FileRead(packhandle, &header, sizeof(header));
if(header.id[0] != 'P' || header.id[1] != 'A' || header.id[2] != 'C' || header.id[3] != 'K')
Sys_Error("%s is not a packfile", packfile);
@ -1884,7 +1884,7 @@ static pack_t *COM_LoadPackFile(const char *packfile)
newfiles = (packfile_t *) Z_Malloc(numpackfiles * sizeof(packfile_t));
Sys_FileSeek(packhandle, header.dirofs);
Sys_FileRead(packhandle, (void *)info, header.dirlen);
Sys_FileRead(packhandle, info, header.dirlen);
// parse the directory
for(i = 0; i < numpackfiles; i++)

4
source/cvar.c
View File

@ -403,7 +403,7 @@ void Cvar_SetQuick(cvar_t *var, const char *value)
len = Q_strlen(value);
if(len != Q_strlen(var->string))
{
Z_Free((void *)var->string);
Z_Free(var->string);
var->string = (char *) Z_Malloc(len + 1);
}
memcpy((char *)var->string, value, len + 1);
@ -419,7 +419,7 @@ void Cvar_SetQuick(cvar_t *var, const char *value)
{
// Sys_Printf("changing default of %s: %s -> %s\n",
// var->name, var->default_string, var->string);
Z_Free((void *)var->default_string);
Z_Free(var->default_string);
var->default_string = Z_Strdup(var->string);
}
//johnfitz

4
source/cvar.h
View File

@ -80,10 +80,10 @@ typedef void (*cvarcallback_t)(struct cvar_s *);
typedef struct cvar_s
{
const char *name;
const char *string;
char *string;
uint32_t flags;
float value;
const char *default_string; //johnfitz -- remember defaults for reset function
char *default_string; //johnfitz -- remember defaults for reset function
cvarcallback_t callback;
struct cvar_s *next;
} cvar_t;

12
source/gl_model.c
View File

@ -1590,7 +1590,7 @@ Mod_LoadLeafs
*/
void Mod_LoadLeafs(lump_t *l, int32_t bsp2)
{
void *in = (void *)(mod_base + l->fileofs);
void *in = mod_base + l->fileofs;
if(bsp2 == 2)
Mod_ProcessLeafs_L2((dl2leaf_t *)in, l->filelen);
@ -2156,7 +2156,7 @@ void * Mod_LoadAliasFrame(void * pin, maliasframedesc_t *frame)
pinframe += pheader->numverts;
return (void *)pinframe;
return pinframe;
}
@ -2193,7 +2193,7 @@ void *Mod_LoadAliasGroup(void * pin, maliasframedesc_t *frame)
pin_intervals += numframes;
ptemp = (void *)pin_intervals;
ptemp = pin_intervals;
for(i = 0 ; i < numframes ; i++)
{
@ -2391,7 +2391,7 @@ void *Mod_LoadAllSkins(int32_t numskins, daliasskintype_t *pskintype)
}
}
return (void *)pskintype;
return pskintype;
}
//=========================================================================
@ -2711,7 +2711,7 @@ void * Mod_LoadSpriteFrame(void * pin, mspriteframe_t **ppframe, int32_t framenu
(byte *)(pinframe + 1), loadmodel->name, offset,
TEXPREF_PAD | TEXPREF_ALPHA | TEXPREF_NOPICMIP); //johnfitz -- TexMgr
return (void *)((byte *)pinframe + sizeof(dspriteframe_t) + size);
return (byte *)pinframe + sizeof(dspriteframe_t) + size;
}
@ -2756,7 +2756,7 @@ void * Mod_LoadSpriteGroup(void * pin, mspriteframe_t **ppframe, int32_t framenu
pin_intervals++;
}
ptemp = (void *)pin_intervals;
ptemp = pin_intervals;
for(i = 0 ; i < numframes ; i++)
{

2
source/gl_texmgr.c
View File

@ -59,7 +59,7 @@ typedef struct
{
int32_t magfilter;
int32_t minfilter;
const char *name;
char name[32];
} glmode_t;
static glmode_t glmodes[] =
{

8
source/net_defs.h
View File

@ -248,10 +248,10 @@ extern hostcache_t hostcache[HOSTCACHESIZE];
typedef struct _PollProcedure
{
struct _PollProcedure *next;
double nextTime;
void (*procedure)(void *);
void *arg;
struct _PollProcedure *next;
double nextTime;
void (*procedure)(void *arg);
void *arg;
} PollProcedure;
void SchedulePollProcedure(PollProcedure *pp, double timeOffset);

4
source/net_dgrm.c
View File

@ -519,7 +519,7 @@ static int32_t testPollCount;
static int32_t testDriver;
static sys_socket_t testSocket;
static void Test_Poll(void *);
static void Test_Poll(void *unused);
static PollProcedure testPollProcedure = {NULL, 0.0, Test_Poll};
static void Test_Poll(void *unused)
@ -654,7 +654,7 @@ static bool test2InProgress = false;
static int32_t test2Driver;
static sys_socket_t test2Socket;
static void Test2_Poll(void *);
static void Test2_Poll(void *unused);
static PollProcedure test2PollProcedure = {NULL, 0.0, Test2_Poll};
static void Test2_Poll(void *unused)

4
source/net_loop.c
View File

@ -101,8 +101,8 @@ qsocket_t *Loop_Connect(const char *host)
loop_server->sendMessageLength = 0;
loop_server->canSend = true;
loop_client->driverdata = (void *)loop_server;
loop_server->driverdata = (void *)loop_client;
loop_client->driverdata = loop_server;
loop_server->driverdata = loop_client;
return loop_client;
}

4
source/net_main.c
View File

@ -45,8 +45,8 @@ bool slistLocal = true;
static double slistStartTime;
static int32_t slistLastShown;
static void Slist_Send(void *);
static void Slist_Poll(void *);
static void Slist_Send(void *unused);
static void Slist_Poll(void *unused);
static PollProcedure slistSendProcedure = {NULL, 0.0, Slist_Send};
static PollProcedure slistPollProcedure = {NULL, 0.0, Slist_Poll};

78
source/pr_edict.c
View File

@ -418,7 +418,7 @@ const char *PR_GlobalString(int32_t ofs)
ddef_t *def;
void *val;
val = (void *)&pr_globals[ofs];
val = &pr_globals[ofs];
def = ED_GlobalAtOfs(ofs);
if(!def)
sprintf(line, "%" PRIi32 "(?)", ofs);
@ -724,7 +724,7 @@ const char *ED_ParseGlobals(const char *data)
continue;
}
if(!ED_ParseEpair((void *)pr_globals, key, com_token))
if(!ED_ParseEpair(pr_globals, key, com_token))
Host_Error("ED_ParseGlobals: parse error");
}
return data;
@ -783,7 +783,7 @@ static bool ED_ParseEpair(void *base, ddef_t *key, const char *s)
void *d;
dfunction_t *func;
d = (void *)((int32_t *)base + key->ofs);
d = (int32_t *)base + key->ofs;
switch(key->type & ~DEF_SAVEGLOBAL)
{
@ -944,7 +944,7 @@ const char *ED_ParseEdict(const char *data, edict_t *ent)
sprintf(com_token, "0 %s 0", temp);
}
if(!ED_ParseEpair((void *)&ent->v, key, com_token))
if(!ED_ParseEpair(&ent->v, key, com_token))
Host_Error("ED_ParseEdict: parse error");
}
@ -1042,32 +1042,8 @@ void ED_LoadFromFile(const char *data)
Con_DPrintf("%" PRIi32 " entities inhibited\n", inhibit);
}
/*
===============
PR_LoadProgs
===============
*/
void PR_LoadProgs(void)
static void PR_LoadProgHeader(byte *prog_data)
{
byte *prog_data;
int32_t i;
// flush the non-C variable lookup cache
for(i = 0; i < GEFV_CACHESIZE; i++)
gefvCache[i].field[0] = 0;
CRC_Init(&pr_crc);
prog_data = COM_LoadHunkFile("progs.dat", NULL);
if(!prog_data)
Host_Error("PR_LoadProgs: couldn't load progs.dat");
Con_DPrintf("Programs occupy %" PRIi32 "K.\n", com_filesize / 1024);
for(i = 0; i < com_filesize; i++)
CRC_ProcessByte(&pr_crc, prog_data[i]);
// byte swap the header
progs.version = ReadLittleLong(&prog_data[4 * 0]);
progs.crc = ReadLittleLong(&prog_data[4 * 1]);
@ -1093,11 +1069,39 @@ void PR_LoadProgs(void)
if(progs.version != PROG_VERSION)
Host_Error("progs.dat has wrong version number (%" PRIi32 " should be %" PRIi32 ")", progs.version, PROG_VERSION);
if(progs.crc != PROGHEADER_CRC)
Host_Error("progs.dat system vars have been modified, progdefs.h is out of date");
}
pr_functions = (dfunction_t *)(prog_data + progs.ofs_functions);
pr_strings = (char *)prog_data + progs.ofs_strings;
/*
===============
PR_LoadProgs
===============
*/
void PR_LoadProgs(void)
{
byte *prog_data;
int32_t i;
// flush the non-C variable lookup cache
for(i = 0; i < GEFV_CACHESIZE; i++)
gefvCache[i].field[0] = 0;
CRC_Init(&pr_crc);
prog_data = COM_LoadHunkFile("progs.dat", NULL);
if(!prog_data)
Host_Error("PR_LoadProgs: couldn't load progs.dat");
Con_DPrintf("Programs occupy %" PRIi32 "K.\n", com_filesize / 1024);
for(i = 0; i < com_filesize; i++)
CRC_ProcessByte(&pr_crc, prog_data[i]);
PR_LoadProgHeader(prog_data);
pr_functions = (dfunction_t *)&prog_data[progs.ofs_functions];
pr_strings = (char *)&prog_data[progs.ofs_strings];
if(progs.ofs_strings + progs.numstrings >= com_filesize)
Host_Error("progs.dat strings go past end of file\n");
@ -1106,15 +1110,15 @@ void PR_LoadProgs(void)
pr_maxknownstrings = 0;
pr_stringssize = progs.numstrings;
if(pr_knownstrings)
Z_Free((void *)pr_knownstrings);
Z_Free(pr_knownstrings);
pr_knownstrings = NULL;
PR_SetEngineString("");
pr_globaldefs = (ddef_t *)(prog_data + progs.ofs_globaldefs);
pr_fielddefs = (ddef_t *)(prog_data + progs.ofs_fielddefs);
pr_statements = (dstatement_t *)(prog_data + progs.ofs_statements);
pr_globaldefs = (ddef_t *)&prog_data[progs.ofs_globaldefs];
pr_fielddefs = (ddef_t *)&prog_data[progs.ofs_fielddefs];
pr_statements = (dstatement_t *)&prog_data[progs.ofs_statements];
pr_global_struct = (globalvars_t *)(prog_data + progs.ofs_globals);
pr_global_struct = (globalvars_t *)&prog_data[progs.ofs_globals];
pr_globals = (float *)pr_global_struct;
// byte swap the lumps
@ -1224,7 +1228,7 @@ static void PR_AllocStringSlots(void)
{
pr_maxknownstrings += PR_STRING_ALLOCSLOTS;
Con_DPrintf2("PR_AllocStringSlots: realloc'ing for %" PRIi32 " slots\n", pr_maxknownstrings);
pr_knownstrings = (const char **) Z_Realloc((void *)pr_knownstrings, pr_maxknownstrings * sizeof(char *));
pr_knownstrings = (const char **) Z_Realloc(pr_knownstrings, pr_maxknownstrings * sizeof(char *));
}
const char *PR_GetString(int32_t num)

4
source/r_alias.c
View File

@ -98,7 +98,7 @@ model and pose.
static void *GLARB_GetXYZOffset(aliashdr_t *hdr, int32_t pose)
{
const int32_t xyzoffs = offsetof(meshxyz_t, xyz);
return (void *)(currententity->model->vboxyzofs + (hdr->numverts_vbo * pose * sizeof(meshxyz_t)) + xyzoffs);
return &((byte *)NULL)[currententity->model->vboxyzofs + hdr->numverts_vbo * pose * sizeof(meshxyz_t) + xyzoffs];
}
/*
@ -112,7 +112,7 @@ given model and pose.
static void *GLARB_GetNormalOffset(aliashdr_t *hdr, int32_t pose)
{
const int32_t normaloffs = offsetof(meshxyz_t, normal);
return (void *)(currententity->model->vboxyzofs + (hdr->numverts_vbo * pose * sizeof(meshxyz_t)) + normaloffs);
return &((byte *)NULL)[currententity->model->vboxyzofs + hdr->numverts_vbo * pose * sizeof(meshxyz_t) + normaloffs];
}
/*

32
source/snd_opus.c
View File

@ -31,16 +31,8 @@
#include <errno.h>
#include <opusfile.h>
/* CALLBACK FUNCTIONS: */
static int32_t opc_fclose(void *f)
{
(void)f;
return 0; /* we fclose() elsewhere. */
}
static int32_t opc_fread(void *f, uint8_t *buf, int32_t size)
static int opc_fread(void *f, unsigned char *buf, int size)
{
int32_t ret;
@ -56,23 +48,29 @@ static int32_t opc_fread(void *f, uint8_t *buf, int32_t size)
return ret;
}
static int32_t opc_fseek(void *f, opus_int64 off, int32_t whence)
static int opc_fseek(void *f, opus_int64 off, int whence)
{
if(f == NULL) return (-1);
return FS_fseek((fshandle_t *)f, (long) off, whence);
if(f == NULL) return -1;
return FS_fseek((fshandle_t *)f, (long)off, whence);
}
static opus_int64 opc_ftell(void *f)
{
return (opus_int64) FS_ftell((fshandle_t *)f);
return (opus_int64)FS_ftell(f);
}
static int opc_fclose(void *f)
{
(void)f;
return 0; /* we fclose() elsewhere. */
}
static const OpusFileCallbacks opc_qfs =
{
(int32_t (*)(void *, uint8_t *, int32_t)) opc_fread,
(int32_t (*)(void *, opus_int64, int32_t)) opc_fseek,
(opus_int64(*)(void *)) opc_ftell,
(int32_t (*)(void *)) opc_fclose
.read = opc_fread,
.seek = opc_fseek,
.tell = opc_ftell,
.close = opc_fclose,
};
static bool S_OPUS_CodecInitialize(void)

2
source/snd_sdl.c
View File

@ -126,7 +126,7 @@ bool SNDDMA_Init(dma_t *dma)
return false;
}
memset((void *) dma, 0, sizeof(dma_t));
memset(dma, 0, sizeof(dma_t));
shm = dma;
/* Fill the audio DMA information block */

29
source/snd_vorbis.c
View File

@ -44,25 +44,34 @@
#define VORBIS_SIGNED_DATA 1
/* CALLBACK FUNCTIONS: */
static int32_t ovc_fclose(void *f)
static size_t ovc_fread(void *ptr, size_t size, size_t nmemb, void *fh)
{
(void)f;
return 0; /* we fclose() elsewhere. */
return FS_fread(ptr, size, nmemb, fh);
}
static int32_t ovc_fseek(void *f, ogg_int64_t off, int32_t whence)
{
if(f == NULL) return (-1);
return FS_fseek((fshandle_t *)f, (long) off, whence);
if(f == NULL) return -1;
return FS_fseek(f, (long)off, whence);
}
static long ovc_ftell(void *f)
{
return (long)FS_ftell(f);
}
static int32_t ovc_fclose(void *f)
{
(void)f;
return 0; /* we fclose() elsewhere. */
}
static ov_callbacks ovc_qfs =
{
(size_t (*)(void *, size_t, size_t, void *)) FS_fread,
(int32_t (*)(void *, ogg_int64_t, int32_t)) ovc_fseek,
(int32_t (*)(void *)) ovc_fclose,
(long (*)(void *)) FS_ftell
.read_func = ovc_fread,
.seek_func = ovc_fseek,
.tell_func = ovc_ftell,
.close_func = ovc_fclose,
};
static bool S_VORBIS_CodecInitialize(void)

2
source/stb_image_write.h
View File

@ -214,7 +214,7 @@ static void stbi__stdio_write(void *context, void *data, int32_t size)
static int32_t stbi__start_write_file(stbi__write_context *s, const char *filename)
{
FILE *f = fopen(filename, "wb");
stbi__start_write_callbacks(s, stbi__stdio_write, (void *) f);
stbi__start_write_callbacks(s, stbi__stdio_write, f);
return f != NULL;
}

4
source/wad.c
View File

@ -137,7 +137,7 @@ void *W_GetLumpName(const char *name)
if(!lump) return NULL; //johnfitz
return (void *)(wad_base + lump->filepos);
return wad_base + lump->filepos;
}
void *W_GetLumpNum(int32_t num)
@ -149,7 +149,7 @@ void *W_GetLumpNum(int32_t num)
lump = wad_lumps + num;
return (void *)(wad_base + lump->filepos);
return wad_base + lump->filepos;
}
/*

10
source/zone.c
View File

@ -168,7 +168,7 @@ static void *Z_TagMalloc(int32_t size, int32_t tag)
// marker for memory trash testing
*(int32_t *)((byte *)base + base->size - 4) = ZONEID;
return (void *)((byte *)base + sizeof(memblock_t));
return (byte *)base + sizeof(memblock_t);
}
/*
@ -456,7 +456,7 @@ void *Hunk_AllocName(int32_t size, const char *name)
h->sentinel = HUNK_SENTINEL;
q_strlcpy(h->name, name, HUNKNAME_LEN);
return (void *)(h + 1);
return h + 1;
}
/*
@ -547,7 +547,7 @@ void *Hunk_HighAllocName(int32_t size, const char *name)
h->sentinel = HUNK_SENTINEL;
q_strlcpy(h->name, name, HUNKNAME_LEN);
return (void *)(h + 1);
return h + 1;
}
@ -628,7 +628,7 @@ void Cache_Move(cache_system_t *c)
new_cs->user = c->user;
Q_memcpy(new_cs->name, c->name, sizeof(new_cs->name));
Cache_Free(c->user, false); //johnfitz -- added second argument
new_cs->user->data = (void *)(new_cs + 1);
new_cs->user->data = new_cs + 1;
}
else
{
@ -926,7 +926,7 @@ void *Cache_Alloc(cache_user_t *c, int32_t size, const char *name)
if(cs)
{
q_strlcpy(cs->name, name, CACHENAME_LEN);
c->data = (void *)(cs + 1);
c->data = cs + 1;
cs->user = c;
break;
}