zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove a couple of blocks in A_MoveSpriteClipdist() from standalone builds and call setsprite() unconditionally before doing any movement

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7406 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-03-19 17:08:16 +00:00
parent 798eaeb980
commit c7f003a1a9
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -425,6 +425,7 @@ int32_t A_MoveSpriteClipdist(int32_t spriteNum, vec3_t const * const change, uin
// check to make sure the netcode didn't leave a deleted sprite in the sprite lists. // check to make sure the netcode didn't leave a deleted sprite in the sprite lists.
Bassert(pSprite->sectnum < MAXSECTORS); Bassert(pSprite->sectnum < MAXSECTORS);
#ifndef EDUKE32_STANDALONE
if (pSprite->statnum == STAT_MISC || (isEnemy && pSprite->xrepeat < 4)) if (pSprite->statnum == STAT_MISC || (isEnemy && pSprite->xrepeat < 4))
{ {
pSprite->x += change->x; pSprite->x += change->x;
@ -436,6 +437,9 @@ int32_t A_MoveSpriteClipdist(int32_t spriteNum, vec3_t const * const change, uin
return 0; return 0;
} }
#endif
setsprite(spriteNum, (vec3_t *)pSprite);
if (clipDist >= 0) if (clipDist >= 0)
{ {
@ -447,8 +451,10 @@ int32_t A_MoveSpriteClipdist(int32_t spriteNum, vec3_t const * const change, uin
{ {
if (pSprite->xrepeat > 60) if (pSprite->xrepeat > 60)
clipDist = 1024; clipDist = 1024;
#ifndef EDUKE32_STANDALONE
else if (pSprite->picnum == LIZMAN) else if (pSprite->picnum == LIZMAN)
clipDist = 292; clipDist = 292;
#endif
else if (A_CheckSpriteFlags(spriteNum, SFLAG_BADGUY)) else if (A_CheckSpriteFlags(spriteNum, SFLAG_BADGUY))
clipDist = pSprite->clipdist<<2; clipDist = pSprite->clipdist<<2;
else else