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

Improve collision for projectiles

Browse source 
This does a few things:

-projectiles now use clipmovex() instead of clipmove() (this is like CON_CLIPMOVENOSLIDE)
-the z distances passed to clipmove() are now calculated from the sprite's size instead of being hard-coded
-projectiles now move as if they had SFLAG_NOCLIP applied for the first tic after spawning

git-svn-id: https://svn.eduke32.com/eduke32@7409 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-03-19 17:08:27 +00:00
parent b61027086c
commit da6b01bf8e
1 changed files with 47 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
source/duke3d/src/actors.cpp
View file

@ -441,45 +441,59 @@ int32_t A_MoveSpriteClipdist(int32_t spriteNum, vec3_t const * const change, uin
setsprite(spriteNum, (vec3_t *)pSprite); setsprite(spriteNum, (vec3_t *)pSprite);
if (clipDist >= 0) if (clipDist < 0)
{ {
// use that value if (A_CheckSpriteFlags(spriteNum, SFLAG_REALCLIPDIST))
} clipDist = pSprite->clipdist << 2;
else if (A_CheckSpriteFlags(spriteNum, SFLAG_REALCLIPDIST)) else if (isEnemy)
clipDist = pSprite->clipdist<<2; {
else if (isEnemy) if (pSprite->xrepeat > 60)
{ clipDist = 1024;
if (pSprite->xrepeat > 60)
clipDist = 1024;
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
else if (pSprite->picnum == LIZMAN) else if (pSprite->picnum == LIZMAN)
clipDist = 292; clipDist = 292;
#endif #endif
else if (A_CheckSpriteFlags(spriteNum, SFLAG_BADGUY)) else if (A_CheckSpriteFlags(spriteNum, SFLAG_BADGUY))
clipDist = pSprite->clipdist<<2; clipDist = pSprite->clipdist << 2;
else
clipDist = 192;
}
else else
clipDist = 192; {
} if (pSprite->statnum == STAT_PROJECTILE && (SpriteProjectile[spriteNum].workslike & PROJECTILE_REALCLIPDIST) == 0)
else clipDist = 8;
{ else
if (pSprite->statnum == STAT_PROJECTILE && (SpriteProjectile[spriteNum].workslike & PROJECTILE_REALCLIPDIST) == 0) clipDist = pSprite->clipdist << 2;
clipDist = 8; }
else
clipDist = pSprite->clipdist<<2;
} }
int16_t newSectnum = pSprite->sectnum; int16_t newSectnum = pSprite->sectnum;
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
int const oldSectnum = newSectnum; int const oldSectnum = newSectnum;
#endif #endif
int32_t newZ = pSprite->z - 2 * tilesiz[pSprite->picnum].y * pSprite->yrepeat;
int const oldZ = pSprite->z;
// Handle horizontal movement first. // Handle horizontal movement first.
pSprite->z = newZ;
int returnValue = int returnValue;
clipmove((vec3_t *)pSprite, &newSectnum, change->x << 13, change->y << 13, clipDist, ZOFFSET6, ZOFFSET6, clipType); int const diffZ = spriteheightofs(spriteNum, NULL, 0);
pSprite->z = oldZ; int newZ = pSprite->z - diffZ;
pSprite->z -= diffZ >> 1;
switch (pSprite->statnum)
{
default:
{
returnValue = clipmove((vec3_t *)pSprite, &newSectnum, change->x << 13, change->y << 13, clipDist, diffZ >> 1, diffZ >> 1, clipType);
break;
}
case STAT_PROJECTILE:
{
returnValue = clipmovex((vec3_t *)pSprite, &newSectnum, change->x << 13, change->y << 13, clipDist, diffZ >> 2, diffZ >> 2, clipType, 1);
break;
}
}
pSprite->z += diffZ >> 1;
// Testing: For some reason the assert below this was tripping for clients // Testing: For some reason the assert below this was tripping for clients
EDUKE32_UNUSED int16_t dbg_ClipMoveSectnum = newSectnum; EDUKE32_UNUSED int16_t dbg_ClipMoveSectnum = newSectnum;
@ -487,8 +501,7 @@ int32_t A_MoveSpriteClipdist(int32_t spriteNum, vec3_t const * const change, uin
if (isEnemy) if (isEnemy)
{ {
// Handle potential stayput condition (map-provided or hard-coded). // Handle potential stayput condition (map-provided or hard-coded).
if (newSectnum < 0 if (newSectnum < 0 || ((actor[spriteNum].stayput >= 0 && actor[spriteNum].stayput != newSectnum)
|| ((actor[spriteNum].stayput >= 0 && actor[spriteNum].stayput != newSectnum)
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
|| (pSprite->picnum == BOSS2 && pSprite->pal == 0 && sector[newSectnum].lotag != ST_3) || (pSprite->picnum == BOSS2 && pSprite->pal == 0 && sector[newSectnum].lotag != ST_3)
|| ((pSprite->picnum == BOSS1 || pSprite->picnum == BOSS2) && sector[newSectnum].lotag == ST_1_ABOVE_WATER) || ((pSprite->picnum == BOSS1 || pSprite->picnum == BOSS2) && sector[newSectnum].lotag == ST_1_ABOVE_WATER)
@ -2855,26 +2868,15 @@ ACTOR_STATIC void Proj_MoveCustom(int const spriteNum)
projZvel >>= 1; projZvel >>= 1;
} }
uint16_t backupCstat = 0;
if (!projectileMoved && (unsigned)pSprite->owner < MAXSPRITES)
{
backupCstat = sprite[pSprite->owner].cstat;
sprite[pSprite->owner].cstat &= (uint16_t)~CSTAT_SPRITE_BLOCK_HITSCAN;
}
do do
{ {
vec3_t tmpvect = { (projVel * (sintable[(pSprite->ang + 512) & 2047])) >> 14, vec3_t tmpvect = { (projVel * (sintable[(pSprite->ang + 512) & 2047])) >> 14,
(projVel * (sintable[pSprite->ang & 2047])) >> 14, projZvel }; (projVel * (sintable[pSprite->ang & 2047])) >> 14, projZvel };
Bmemcpy(&davect, pSprite, sizeof(vec3_t)); Bmemcpy(&davect, pSprite, sizeof(vec3_t));
otherSprite = A_MoveSprite(spriteNum, &tmpvect, (A_CheckSpriteFlags(spriteNum, SFLAG_NOCLIP) ? 0 : CLIPMASK1)); otherSprite = A_MoveSprite(spriteNum, &tmpvect, (!projectileMoved || A_CheckSpriteFlags(spriteNum, SFLAG_NOCLIP) ? 0 : CLIPMASK1));
} }
while (!otherSprite && --projMoveCnt > 0); while (!otherSprite && --projMoveCnt > 0);
if (backupCstat)
sprite[pSprite->owner].cstat = backupCstat;
if (!(pProj->workslike & PROJECTILE_BOUNCESOFFWALLS) && // NOT_BOUNCESOFFWALLS_YVEL if (!(pProj->workslike & PROJECTILE_BOUNCESOFFWALLS) && // NOT_BOUNCESOFFWALLS_YVEL
(unsigned)pSprite->yvel < MAXSPRITES (unsigned)pSprite->yvel < MAXSPRITES
&& sprite[pSprite->yvel].sectnum != MAXSECTORS) && sprite[pSprite->yvel].sectnum != MAXSECTORS)
@ -3095,6 +3097,9 @@ ACTOR_STATIC void G_MoveWeapons(void)
case SPIT__STATIC: case SPIT__STATIC:
case COOLEXPLOSION1__STATIC: case COOLEXPLOSION1__STATIC:
{ {
int const projectileMoved = SpriteProjectile[spriteNum].workslike & PROJECTILE_MOVED;
SpriteProjectile[spriteNum].workslike |= PROJECTILE_MOVED;
if (pSprite->picnum == COOLEXPLOSION1) if (pSprite->picnum == COOLEXPLOSION1)
if (!S_CheckSoundPlaying(WIERDSHOT_FLY)) if (!S_CheckSoundPlaying(WIERDSHOT_FLY))
A_PlaySound(WIERDSHOT_FLY, spriteNum); A_PlaySound(WIERDSHOT_FLY, spriteNum);
@ -3123,7 +3128,7 @@ ACTOR_STATIC void G_MoveWeapons(void)
vec3_t const tmpvect = { (spriteXvel * (sintable[(pSprite->ang + 512) & 2047])) >> 14, vec3_t const tmpvect = { (spriteXvel * (sintable[(pSprite->ang + 512) & 2047])) >> 14,
(spriteXvel * (sintable[pSprite->ang & 2047])) >> 14, spriteZvel }; (spriteXvel * (sintable[pSprite->ang & 2047])) >> 14, spriteZvel };
int moveSprite = A_MoveSprite(spriteNum, &tmpvect, (A_CheckSpriteFlags(spriteNum, SFLAG_NOCLIP) ? 0 : CLIPMASK1)); int moveSprite = A_MoveSprite(spriteNum, &tmpvect, (!projectileMoved || A_CheckSpriteFlags(spriteNum, SFLAG_NOCLIP) ? 0 : CLIPMASK1));
if (pSprite->picnum == RPG && (unsigned) pSprite->yvel < MAXSPRITES) // RPG_YVEL if (pSprite->picnum == RPG && (unsigned) pSprite->yvel < MAXSPRITES) // RPG_YVEL
if (FindDistance2D(pSprite->x - sprite[pSprite->yvel].x, pSprite->y - sprite[pSprite->yvel].y) < 256) if (FindDistance2D(pSprite->x - sprite[pSprite->yvel].x, pSprite->y - sprite[pSprite->yvel].y) < 256)