zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- buildutils: Replace sintable[] use within Exhumed with bsin()/bcos().

Browse source
This commit is contained in:
Mitchell Richters 2020-11-14 20:19:28 +11:00 committed by Christoph Oelckers
parent d6d74c2712
commit bae4d77427
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/exhumed/src/gun.cpp
View file

@ -302,7 +302,7 @@ int CheckCloseRange(short nPlayer, int *x, int *y, int *z, short *nSector)
hitSect = hitData.sect; hitSect = hitData.sect;
hitWall = hitData.wall; hitWall = hitData.wall;
int ecx = sintable[150] >> 3; int ecx = bsin(150, -3);
uint32_t xDiff = klabs(hitX - *x); uint32_t xDiff = klabs(hitX - *x);
uint32_t yDiff = klabs(hitY - *y); uint32_t yDiff = klabs(hitY - *y);

5
source/exhumed/src/map.cpp
View file

@ -68,8 +68,9 @@ template<typename T> void GetSpriteExtents(T const* const pSprite, int* top, int
bool GameInterface::DrawAutomapPlayer(int x, int y, int z, int a) bool GameInterface::DrawAutomapPlayer(int x, int y, int z, int a)
{ {
int nCos = z * sintable[(0 - a) & 2047]; // [MR]: Confirm that this is correct as math doesn't match the variable names.
int nSin = z * sintable[(1536 - a) & 2047]; int nCos = z * -bsin(a);
int nSin = z * -bcos(a);
int nCos2 = mulscale16(nCos, yxaspect); int nCos2 = mulscale16(nCos, yxaspect);
int nSin2 = mulscale16(nSin, yxaspect); int nSin2 = mulscale16(nSin, yxaspect);

2
source/exhumed/src/mummy.cpp
View file

@ -240,7 +240,7 @@ void FuncMummy(int a, int nDamage, int nRun)
MummyList[nMummy].G = 90; MummyList[nMummy].G = 90;
sprite[nSprite].xvel = bcos(sprite[nSprite].ang, -2); sprite[nSprite].xvel = bcos(sprite[nSprite].ang, -2);
sprite[nSprite].yvel = sintable[sprite[nSprite].ang] >> 2; // NOTE no angle masking in original code sprite[nSprite].yvel = bsin(sprite[nSprite].ang, -2);
} }
} }
} }

1
source/exhumed/src/queen.cpp
View file

@ -966,7 +966,6 @@ __MOVEQS:
// DEMO-TODO: in disassembly angle was used without masking and thus causing OOB issue. // DEMO-TODO: in disassembly angle was used without masking and thus causing OOB issue.
// This behavior probably would be needed emulated for demo compatibility // This behavior probably would be needed emulated for demo compatibility
// int dx = sintable[nAngle + 512] << 10;
int dx = bcos(nAngle, 10); int dx = bcos(nAngle, 10);
int dy = bsin(nAngle, 10); int dy = bsin(nAngle, 10);
int dz = (RandomSize(5) - RandomSize(5)) << 7; int dz = (RandomSize(5) - RandomSize(5)) << 7;

2
source/exhumed/src/snake.cpp
View file

@ -158,7 +158,7 @@ int BuildSnake(short nPlayer, short zVal)
int nSqrt = ksqrt(sqrtNum); int nSqrt = ksqrt(sqrtNum);
if (nSqrt < (sintable[512] >> 4)) if (nSqrt < bsin(512, -4))
{ {
BackUpBullet(&hitx, &hity, nAngle); BackUpBullet(&hitx, &hity, nAngle);
nSprite = insertsprite(hitsect, 202); nSprite = insertsprite(hitsect, 202);

2
source/exhumed/src/spider.cpp
View file

@ -193,7 +193,7 @@ void FuncSpider(int a, int nDamage, int nRun)
SpiderList[nSpider].nTarget = nTarget; SpiderList[nSpider].nTarget = nTarget;
sprite[nSprite].xvel = bcos(sprite[nSprite].ang); sprite[nSprite].xvel = bcos(sprite[nSprite].ang);
sprite[nSprite].yvel = sintable[sprite[nSprite].ang]; // NOTE - not angle masking here in original code sprite[nSprite].yvel = bsin(sprite[nSprite].ang);
return; return;
} }
} }

2
source/exhumed/src/status.cpp
View file

@ -745,7 +745,7 @@ private:
{ {
int s = -8; int s = -8;
if (althud_flashing && pp->nHealth > 800) if (althud_flashing && pp->nHealth > 800)
s += (sintable[(leveltime << 7) & 2047] >> 10); s += bsin(leveltime << 7, -10);
int intens = clamp(255 - 4 * s, 0, 255); int intens = clamp(255 - 4 * s, 0, 255);
auto pe = PalEntry(255, intens, intens, intens); auto pe = PalEntry(255, intens, intens, intens);
format.Format("%d", pp->nHealth >> 3); format.Format("%d", pp->nHealth >> 3);