mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-11 07:11:39 +00:00
General warning fixes and regular fixes. (64 bit only)
git-svn-id: https://svn.eduke32.com/eduke32@789 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
9f361fd293
commit
22085fa9d3
2 changed files with 4 additions and 4 deletions
|
@ -1621,7 +1621,7 @@ static int defsparser(scriptfile *script)
|
|||
switch (getatoken(script,sound_musictokens,sizeof(sound_musictokens)/sizeof(tokenlist)))
|
||||
{
|
||||
case T_ID:
|
||||
scriptfile_getsymbol(script,(intptr_t *)&dummy2);
|
||||
scriptfile_getsymbol(script,(int *)&dummy2);
|
||||
break;
|
||||
case T_FILE:
|
||||
scriptfile_getstring(script,&dummy2);
|
||||
|
|
|
@ -2277,7 +2277,7 @@ static int isolid(int x, int y, int z)
|
|||
|
||||
static voxmodel *vox2poly()
|
||||
{
|
||||
int i, j, x, y, z, v, ov, oz = 0, cnt, sc, x0, y0, dx, dy, *bx0, *by0;
|
||||
int i, j, x, y, z, v, ov, oz = 0, cnt, sc, x0, y0, dx, dy,*bx0, *by0;
|
||||
void (*daquad)(int, int, int, int, int, int, int, int, int, int);
|
||||
|
||||
gvox = (voxmodel *)malloc(sizeof(voxmodel)); if (!gvox) return(0);
|
||||
|
@ -2297,7 +2297,7 @@ static voxmodel *vox2poly()
|
|||
|
||||
i = ((max(ysiz,zsiz)+1)<<2);
|
||||
bx0 = (int *)malloc(i<<1); if (!bx0) { free(gvox); return(0); }
|
||||
by0 = (int *)(((int)bx0)+i);
|
||||
by0 = (int *)(((intptr_t)bx0)+i);
|
||||
|
||||
for (cnt=0;cnt<2;cnt++)
|
||||
{
|
||||
|
@ -2681,7 +2681,7 @@ static int voxdraw(voxmodel *m, spritetype *tspr)
|
|||
float f, g, k0, k1, k2, k3, k4, k5, k6, k7, mat[16], omat[16], pc[4];
|
||||
vert_t *vptr;
|
||||
|
||||
if ((int)m == (int)0xffffffff) // hackhackhack
|
||||
if ((intptr_t)m == (intptr_t)(-1)) // hackhackhack
|
||||
return 0;
|
||||
if ((tspr->cstat&48)==32) return 0;
|
||||
|
||||
|
|
Loading…
Reference in a new issue