zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@721 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-05-02 07:52:13 +00:00
parent 6b0f2d5956
commit 21fc17b70b
2 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/source/gameexec.c
View file

@ -3897,7 +3897,7 @@ int furthestcanseepoint(int iActor,spritetype *ts,int *dax,int *day)
d = klabs(hx-ts->x)+klabs(hy-ts->y); d = klabs(hx-ts->x)+klabs(hy-ts->y);
da = klabs(hx-s->x)+klabs(hy-s->y); da = klabs(hx-s->x)+klabs(hy-s->y);
if (d < da) if (d < da && hitsect > -1)
if (cansee(hx,hy,hz,hitsect,s->x,s->y,s->z-(16<<8),s->sectnum)) if (cansee(hx,hy,hz,hitsect,s->x,s->y,s->z-(16<<8),s->sectnum))
{ {
*dax = hx; *dax = hx;

36
polymer/eduke32/source/gamevars.c
View file

@ -530,7 +530,7 @@ static int GetGameID(const char *szGameLabel)
int GetGameVarID(int id, int iActor, int iPlayer) int GetGameVarID(int id, int iActor, int iPlayer)
{ {
int inv = 0; int m = 1;
if (id == MAXGAMEVARS) if (id == MAXGAMEVARS)
{ {
@ -552,17 +552,13 @@ int GetGameVarID(int id, int iActor, int iPlayer)
if (id&(MAXGAMEVARS<<1)) // negative array access if (id&(MAXGAMEVARS<<1)) // negative array access
{ {
m = -1;
id ^= (MAXGAMEVARS<<1); id ^= (MAXGAMEVARS<<1);
// OSD_Printf("GetGameVarID(): reading from array\n");
if ((index < aGameArrays[id].size)&&(index>=0))
return(-aGameArrays[id].plValues[index]);
OSD_Printf("GetGameVarID(): invalid array index (%s[%d])\n",aGameArrays[id].szLabel,index);
return -1;
} }
// OSD_Printf("GetGameVarID(): reading from array\n"); // OSD_Printf("GetGameVarID(): reading from array\n");
if ((index < aGameArrays[id].size)&&(index>=0)) if ((index < aGameArrays[id].size)&&(index>=0))
return(aGameArrays[id].plValues[index]); return(m * aGameArrays[id].plValues[index]);
OSD_Printf("GetGameVarID(): invalid array index (%s[%d])\n",aGameArrays[id].szLabel,index); OSD_Printf("GetGameVarID(): invalid array index (%s[%d])\n",aGameArrays[id].szLabel,index);
return -1; return -1;
} }
@ -573,7 +569,7 @@ int GetGameVarID(int id, int iActor, int iPlayer)
return -1; return -1;
} }
inv = 1; m = -1;
id ^= (MAXGAMEVARS<<1); id ^= (MAXGAMEVARS<<1);
} }
@ -584,12 +580,10 @@ int GetGameVarID(int id, int iActor, int iPlayer)
{ {
//Bsprintf(g_szBuf,"GetGameVarID(%d, %d, %d) returns %d\n",id,iActor,iPlayer, aGameVars[id].plValues[iPlayer]); //Bsprintf(g_szBuf,"GetGameVarID(%d, %d, %d) returns %d\n",id,iActor,iPlayer, aGameVars[id].plValues[iPlayer]);
//AddLog(g_szBuf); //AddLog(g_szBuf);
if (inv) return(-aGameVars[id].plValues[iPlayer]); return(m * aGameVars[id].plValues[iPlayer]);
return (aGameVars[id].plValues[iPlayer]);
} }
if (inv) return(-aGameVars[id].lValue); return(m * aGameVars[id].lValue);
return (aGameVars[id].lValue);
} }
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERACTOR) if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERACTOR)
@ -597,34 +591,28 @@ int GetGameVarID(int id, int iActor, int iPlayer)
// for the current actor // for the current actor
if (iActor >= 0 && iActor <= MAXSPRITES) if (iActor >= 0 && iActor <= MAXSPRITES)
{ {
if (inv) return(-aGameVars[id].plValues[iActor]); return(m * aGameVars[id].plValues[iActor]);
return (aGameVars[id].plValues[iActor]);
} }
if (inv) return(-aGameVars[id].lValue); return(m * aGameVars[id].lValue);
return (aGameVars[id].lValue);
} }
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_INTPTR) if (aGameVars[id].dwFlags & GAMEVAR_FLAG_INTPTR)
{ {
if (inv) return(-(*((int*)aGameVars[id].lValue))); return(m * (*((int*)aGameVars[id].lValue)));
return(*((int*)aGameVars[id].lValue));
} }
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_SHORTPTR) if (aGameVars[id].dwFlags & GAMEVAR_FLAG_SHORTPTR)
{ {
if (inv) return(-(*((short*)aGameVars[id].lValue))); return(m * (*((short*)aGameVars[id].lValue)));
return(*((short*)aGameVars[id].lValue));
} }
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_CHARPTR) if (aGameVars[id].dwFlags & GAMEVAR_FLAG_CHARPTR)
{ {
if (inv) return(-(*((char*)aGameVars[id].lValue))); return(m * (*((char*)aGameVars[id].lValue)));
return(*((char*)aGameVars[id].lValue));
} }
if (inv) return(-aGameVars[id].lValue); return(m * aGameVars[id].lValue);
return (aGameVars[id].lValue);
} }
void SetGameArrayID(int id,int index, int lValue) void SetGameArrayID(int id,int index, int lValue)