zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-23 15:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a couple of botched FindDistance3D calls

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4659 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2014-10-25 03:29:38 +00:00
parent 6c6b68d534
commit 508595cac8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/source/sounds.c
View file

@ -508,7 +508,7 @@ static int32_t S_CalcDistAndAng(int32_t i, int32_t num, int32_t camsect, int32_t
sndang = S_GetAngle(camang, cam, pos); sndang = S_GetAngle(camang, cam, pos);
sndist = FindDistance3D(cam->x-pos->x, cam->y-pos->y, (cam->z-pos->z)>>4); sndist = FindDistance3D(cam->x-pos->x, cam->y-pos->y, (cam->z-pos->z));
#ifdef SPLITSCREEN_MOD_HACKS #ifdef SPLITSCREEN_MOD_HACKS
if (g_fakeMultiMode==2) if (g_fakeMultiMode==2)
@ -524,7 +524,7 @@ static int32_t S_CalcDistAndAng(int32_t i, int32_t num, int32_t camsect, int32_t
{ {
const vec3_t *cam2 = &g_player[1].ps->pos; const vec3_t *cam2 = &g_player[1].ps->pos;
int32_t sndist2 = FindDistance3D(cam2->x-pos->x, cam2->y-pos->y, (cam2->z-pos->z)>>4); int32_t sndist2 = FindDistance3D(cam2->x-pos->x, cam2->y-pos->y, (cam2->z-pos->z));
if (sndist2 < sndist) if (sndist2 < sndist)
{ {

4
polymer/eduke32/source/sounds_mapster32.c
View file

@ -190,7 +190,7 @@ int32_t S_PlaySound3D(int32_t num, int32_t i, const vec3_t *pos)
cs = cursectnum; cs = cursectnum;
ca = ang; ca = ang;
sndist = FindDistance3D((cx-pos->x),(cy-pos->y),(cz-pos->z)>>4); sndist = FindDistance3D((cx-pos->x),(cy-pos->y),(cz-pos->z));
if (i >= 0 && (g_sounds[num].m & SF_GLOBAL) == 0 && PN == MUSICANDSFX && SLT < 999 && (sector[SECT].lotag&0xff) < 9) if (i >= 0 && (g_sounds[num].m & SF_GLOBAL) == 0 && PN == MUSICANDSFX && SLT < 999 && (sector[SECT].lotag&0xff) < 9)
sndist = divscale14(sndist,(SHT+1)); sndist = divscale14(sndist,(SHT+1));
@ -403,7 +403,7 @@ void S_Update(void)
sndang = 2048 + ca - getangle(cx-sx,cy-sy); sndang = 2048 + ca - getangle(cx-sx,cy-sy);
sndang &= 2047; sndang &= 2047;
sndist = FindDistance3D((cx-sx),(cy-sy),(cz-sz)>>4); sndist = FindDistance3D((cx-sx),(cy-sy),(cz-sz));
if (i >= 0 && (g_sounds[j].m & SF_GLOBAL) == 0 && PN == MUSICANDSFX && SLT < 999 && (sector[SECT].lotag&0xff) < 9) if (i >= 0 && (g_sounds[j].m & SF_GLOBAL) == 0 && PN == MUSICANDSFX && SLT < 999 && (sector[SECT].lotag&0xff) < 9)
sndist = divscale14(sndist,(SHT+1)); sndist = divscale14(sndist,(SHT+1));