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

- buildutils: Replace sintable[] use within WHaven's ai.cpp with bsin()/bcos().

Browse source
This commit is contained in:
Mitchell Richters 2021-01-01 18:47:18 +11:00
parent a8d8335e2b
commit 60761ba779
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
source/games/whaven/src/ai.cpp
View file

@ -213,8 +213,8 @@ void aiProcess() {
// short daang = plr.angle.ang.asbuild(); // short daang = plr.angle.ang.asbuild();
// int daz2 = -mulscale16(plr.horizon.horiz.asq16(), 2000); // int daz2 = -mulscale16(plr.horizon.horiz.asq16(), 2000);
// hitscan(plr.x, plr.y, plr.z, plr.sector, // Start position // hitscan(plr.x, plr.y, plr.z, plr.sector, // Start position
// sintable[(daang + 2560) & 2047], // X vector of 3D ang // bcos(daang), // X vector of 3D ang
// sintable[(daang + 2048) & 2047], // Y vector of 3D ang // bsin(daang), // Y vector of 3D ang
// daz2, // Z vector of 3D ang // daz2, // Z vector of 3D ang
// pHitInfo, CLIPMASK0); // pHitInfo, CLIPMASK0);
// //
@ -236,8 +236,8 @@ void aiProcess() {
nextsprite = nextspritestat[i]; nextsprite = nextspritestat[i];
SPRITE& spr = sprite[i]; SPRITE& spr = sprite[i];
short movestat = (short)movesprite((short)i, ((sintable[(spr.ang + 512) & 2047]) * TICSPERFRAME) << 3, short movestat = (short)movesprite((short)i, (bcos(spr.ang) * TICSPERFRAME) << 3,
((sintable[spr.ang]) * TICSPERFRAME) << 3, 0, 4 << 8, 4 << 8, 0); (bsin(spr.ang) * TICSPERFRAME) << 3, 0, 4 << 8, 4 << 8, 0);
if (zr_florz > spr.z + (48 << 8)) { if (zr_florz > spr.z + (48 << 8)) {
setsprite(i, spr.x, spr.y, spr.z); setsprite(i, spr.x, spr.y, spr.z);
movestat = 1; movestat = 1;
@ -260,8 +260,7 @@ void aiProcess() {
} }
j = nextj; j = nextj;
} }
if (sintable[(spr.ang + 2560) & 2047] * (plr.x - spr.x) if (bcos(spr.ang) * (plr.x - spr.x) + bsin(spr.ang) * (plr.y - spr.y) >= 0) {
+ sintable[(spr.ang + 2048) & 2047] * (plr.y - spr.y) >= 0) {
if (cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7), if (cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),
spr.sectnum)) { spr.sectnum)) {
newstatus(i, CHASE); newstatus(i, CHASE);
@ -421,14 +420,14 @@ int aimove(short i) {
int oz = sprite[i].z; int oz = sprite[i].z;
// short osect = sprite[i].sectnum; // short osect = sprite[i].sectnum;
int movestate = movesprite(i, ((sintable[(sprite[i].ang + 512) & 2047]) * TICSPERFRAME) << 3, int movestate = movesprite(i, (bcos(sprite[i].ang) * TICSPERFRAME) << 3,
((sintable[sprite[i].ang & 2047]) * TICSPERFRAME) << 3, 0, 4 << 8, 4 << 8, CLIFFCLIP); (bsin(sprite[i].ang) * TICSPERFRAME) << 3, 0, 4 << 8, 4 << 8, CLIFFCLIP);
if (((zr_florz - oz) >> 4) > tileHeight(sprite[i].picnum) + (sprite[i].yrepeat << 2) if (((zr_florz - oz) >> 4) > tileHeight(sprite[i].picnum) + (sprite[i].yrepeat << 2)
|| (movestate & kHitTypeMask) == kHitWall) { || (movestate & kHitTypeMask) == kHitWall) {
// changespritesect(i, osect); // changespritesect(i, osect);
// setsprite(i, ox + mulscale((sprite[i].clipdist) << 2, sintable[(sprite[i].ang + 1536) & 2047], 16), // setsprite(i, ox + mulscale((sprite[i].clipdist) << 2, -bcos(sprite[i].ang), 16),
// oy + mulscale((sprite[i].clipdist) << 2, sintable[(sprite[i].ang + 1024) & 2047], 16), oz); // oy + mulscale((sprite[i].clipdist) << 2, -bsin(sprite[i].ang), 16), oz);
setsprite(i, ox, oy, oz); setsprite(i, ox, oy, oz);
@ -448,8 +447,8 @@ int aimove(short i) {
int aifly(short i) { int aifly(short i) {
SPRITE& spr = sprite[i]; SPRITE& spr = sprite[i];
int movestate = movesprite(i, ((sintable[(sprite[i].ang + 512) & 2047]) * TICSPERFRAME) << 3, int movestate = movesprite(i, (bcos(sprite[i].ang) * TICSPERFRAME) << 3,
((sintable[sprite[i].ang & 2047]) * TICSPERFRAME) << 3, 0, 4 << 8, 4 << 8, CLIFFCLIP); (bsin(sprite[i].ang) * TICSPERFRAME) << 3, 0, 4 << 8, 4 << 8, CLIFFCLIP);
spr.z -= TICSPERFRAME << 8; spr.z -= TICSPERFRAME << 8;
short ocs = spr.cstat; short ocs = spr.cstat;
@ -599,8 +598,8 @@ void castspell(PLAYER& plr, int i) {
else else
sprite[j].ang = (short)(((getangle(plr.x - sprite[j].x, plr.y - sprite[j].y) + (krand() & 15) sprite[j].ang = (short)(((getangle(plr.x - sprite[j].x, plr.y - sprite[j].y) + (krand() & 15)
- 8) + 2048) & 2047); - 8) + 2048) & 2047);
sprite[j].xvel = (short)(sintable[(sprite[j].ang + 2560) & 2047] >> 6); sprite[j].xvel = bcos(sprite[j].ang, -6);
sprite[j].yvel = (short)(sintable[(sprite[j].ang + 2048) & 2047] >> 6); sprite[j].yvel = bsin(sprite[j].ang, -6);
int discrim = ksqrt((plr.x - sprite[j].x) * (plr.x - sprite[j].x) + (plr.y - sprite[j].y) * (plr.y - sprite[j].y)); int discrim = ksqrt((plr.x - sprite[j].x) * (plr.x - sprite[j].x) + (plr.y - sprite[j].y) * (plr.y - sprite[j].y));
if (discrim == 0) if (discrim == 0)
@ -635,8 +634,8 @@ void skullycastspell(PLAYER& plr, int i) {
else else
sprite[j].ang = (short)(((getangle(plr.x - sprite[j].x, plr.y - sprite[j].y) + (krand() & 15) sprite[j].ang = (short)(((getangle(plr.x - sprite[j].x, plr.y - sprite[j].y) + (krand() & 15)
- 8) + 2048) & 2047); - 8) + 2048) & 2047);
sprite[j].xvel = (short)(sintable[(sprite[j].ang + 2560) & 2047] >> 6); sprite[j].xvel = bcos(sprite[j].ang, -6);
sprite[j].yvel = (short)(sintable[(sprite[j].ang + 2048) & 2047] >> 6); sprite[j].yvel = bsin(sprite[j].ang, -6);
int discrim = ksqrt((plr.x - sprite[j].x) * (plr.x - sprite[j].x) + (plr.y - sprite[j].y) * (plr.y - sprite[j].y)); int discrim = ksqrt((plr.x - sprite[j].x) * (plr.x - sprite[j].x) + (plr.y - sprite[j].y) * (plr.y - sprite[j].y));
if (discrim == 0) if (discrim == 0)