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

Remove dead code branch from RECON (logic oversight) and get rid of a useless fallthrough__

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7047 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-10-07 05:23:53 +00:00
parent 59214a2d78
commit eee0a71496
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,11 +69,11 @@ void G_DoInterpolations(int smoothRatio)
if (g_interpolationLock++) if (g_interpolationLock++)
return; return;
int32_t odelta, ndelta = 0; int32_t ndelta = 0;
for (bssize_t i = 0, j = 0; i < g_interpolationCnt; ++i) for (bssize_t i = 0, j = 0; i < g_interpolationCnt; ++i)
{ {
odelta = ndelta; int32_t const odelta = ndelta;
bakipos[i] = *curipos[i]; bakipos[i] = *curipos[i];
ndelta = (*curipos[i]) - oldipos[i]; ndelta = (*curipos[i]) - oldipos[i];
if (odelta != ndelta) if (odelta != ndelta)
@ -2916,7 +2916,7 @@ ACTOR_STATIC void Proj_MoveCustom(int const spriteNum)
pSprite->yvel--; pSprite->yvel--;
int const projAngle = getangle(sprite[otherSprite].x - pSprite->x, sprite[otherSprite].y - pSprite->y) int const projAngle = getangle(sprite[otherSprite].x - pSprite->x, sprite[otherSprite].y - pSprite->y)
+ (sprite[otherSprite].cstat & 16 ? 0 : 512); + ((sprite[otherSprite].cstat & 16) ? 0 : 512);
pSprite->ang = ((projAngle << 1) - pSprite->ang) & 2047; pSprite->ang = ((projAngle << 1) - pSprite->ang) & 2047;
if (pProj->bsound >= 0) if (pProj->bsound >= 0)
@ -4173,14 +4173,7 @@ ACTOR_STATIC void G_MoveActors(void)
else else
{ {
// Control speed here // Control speed here
if (locatorDist > 1524) if (pSprite->xvel < 256) pSprite->xvel += 32;
{
if (pSprite->xvel < 256) pSprite->xvel += 32;
}
else
{
pSprite->xvel = (pSprite->xvel > 0) ? pSprite->xvel - 16 : 0;
}
} }
if (pData[0] < 2) pData[2]++; if (pData[0] < 2) pData[2]++;
@ -5243,7 +5236,6 @@ ACTOR_STATIC void G_MoveMisc(void) // STATNUM 5
if (pData[1] == 5) if (pData[1] == 5)
A_DeleteSprite(spriteNum); A_DeleteSprite(spriteNum);
goto next_sprite; goto next_sprite;
fallthrough__;
case INNERJAW__STATIC: case INNERJAW__STATIC:
{ {
// case INNERJAW+1: // case INNERJAW+1:
@ -6927,8 +6919,6 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
case SE_17_WARP_ELEVATOR: case SE_17_WARP_ELEVATOR:
{ {
int32_t nextk;
q = pData[0]*(SP(spriteNum)<<2); q = pData[0]*(SP(spriteNum)<<2);
pSector->ceilingz += q; pSector->ceilingz += q;
@ -6991,6 +6981,8 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
if (j == -1) break; if (j == -1) break;
int32_t nextk;
for (SPRITES_OF_SECT_SAFE(pSprite->sectnum, k, nextk)) for (SPRITES_OF_SECT_SAFE(pSprite->sectnum, k, nextk))
{ {
if (sprite[k].statnum == STAT_PLAYER && sprite[k].owner >= 0) if (sprite[k].statnum == STAT_PLAYER && sprite[k].owner >= 0)