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

Rearrange G_MoveTransports() code a little to cut down on nested switches.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3074 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-10-14 20:41:23 +00:00
parent a92d5486c4
commit 8adb9d27af
1 changed files with 47 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
polymer/eduke32/source/actors.c
View file

@ -3230,6 +3230,12 @@ static void P_FinishWaterChange(int32_t j, DukePlayer_t *ps, int32_t sectlotag,
} }
} }
static int32_t A_CheckNonTeleporting(int32_t pic)
{
return (pic == SHARK || pic == COMMANDER || pic == OCTABRAIN
|| (pic >= GREENSLIME && pic <= GREENSLIME+7));
}
ACTOR_STATIC void G_MoveTransports(void) ACTOR_STATIC void G_MoveTransports(void)
{ {
int32_t i = headspritestat[STAT_TRANSPORT], j, k; int32_t i = headspritestat[STAT_TRANSPORT], j, k;
@ -3352,31 +3358,31 @@ ACTOR_STATIC void G_MoveTransports(void)
} }
break; break;
////////// Non-player teleportation //////////
case STAT_PROJECTILE: case STAT_PROJECTILE:
// comment out to make RPGs pass through water: (r1450 breaks this) // comment out to make RPGs pass through water: (r1450 breaks this)
// if (sectlotag != 0) goto JBOLT; // if (sectlotag != 0) goto JBOLT;
case STAT_ACTOR: case STAT_ACTOR:
if ((sprite[j].picnum == SHARK) || (sprite[j].picnum == COMMANDER) || (sprite[j].picnum == OCTABRAIN) if (sprite[j].extra > 0 && A_CheckNonTeleporting(sprite[j].picnum))
|| ((sprite[j].picnum >= GREENSLIME) && (sprite[j].picnum <= GREENSLIME+7))) goto JBOLT;
{
if (sprite[j].extra > 0)
goto JBOLT;
}
case STAT_MISC: case STAT_MISC:
case STAT_FALLER: case STAT_FALLER:
case STAT_DUMMYPLAYER: case STAT_DUMMYPLAYER:
{ {
int32_t ll = klabs(sprite[j].zvel);
if (totalclock > actor[j].lasttransport) if (totalclock > actor[j].lasttransport)
{ {
const int32_t ll = klabs(sprite[j].zvel);
int32_t warpspriteto = 0; int32_t warpspriteto = 0;
if (ll && sectlotag == ST_2_UNDERWATER && sprite[j].z < (sector[sect].ceilingz+ll)) if (ll != 0)
warpspriteto = 1; {
if (sectlotag == ST_2_UNDERWATER && sprite[j].z < (sector[sect].ceilingz+ll))
if (ll && sectlotag == ST_1_ABOVE_WATER && sprite[j].z > (sector[sect].floorz-ll)) warpspriteto = 1;
warpspriteto = 1; if (sectlotag == ST_1_ABOVE_WATER && sprite[j].z > (sector[sect].floorz-ll))
warpspriteto = 1;
}
if (sectlotag == 0 && (onfloorz || klabs(sprite[j].z-SZ) < 4096)) if (sectlotag == 0 && (onfloorz || klabs(sprite[j].z-SZ) < 4096))
{ {
@ -3388,9 +3394,12 @@ ACTOR_STATIC void G_MoveTransports(void)
warpspriteto = 1; warpspriteto = 1;
} }
if (warpspriteto && A_CheckSpriteFlags(j,SPRITE_DECAL)) goto JBOLT; if (warpspriteto)
{
if (A_CheckSpriteFlags(j,SPRITE_DECAL))
goto JBOLT;
if (warpspriteto) switch (DYNAMICTILEMAP(sprite[j].picnum)) switch (DYNAMICTILEMAP(sprite[j].picnum))
{ {
case TRANSPORTERSTAR__STATIC: case TRANSPORTERSTAR__STATIC:
case TRANSPORTERBEAM__STATIC: case TRANSPORTERBEAM__STATIC:
@ -3420,6 +3429,10 @@ ACTOR_STATIC void G_MoveTransports(void)
if (sectlotag > 0) if (sectlotag > 0)
{ {
const int32_t osect = sprite[OW].sectnum;
Bassert(sectlotag==ST_1_ABOVE_WATER || sectlotag==ST_2_UNDERWATER);
k = A_Spawn(j,WATERSPLASH2); k = A_Spawn(j,WATERSPLASH2);
if (sectlotag == ST_1_ABOVE_WATER && sprite[j].statnum == STAT_PROJECTILE) if (sectlotag == ST_1_ABOVE_WATER && sprite[j].statnum == STAT_PROJECTILE)
{ {
@ -3427,11 +3440,21 @@ ACTOR_STATIC void G_MoveTransports(void)
sprite[k].ang = sprite[j].ang; sprite[k].ang = sprite[j].ang;
A_SetSprite(k,CLIPMASK0); A_SetSprite(k,CLIPMASK0);
} }
}
switch (sectlotag) //
actor[j].lasttransport = totalclock + (TICSPERFRAME<<2);
sprite[j].x += (sprite[OW].x-SX);
sprite[j].y += (sprite[OW].y-SY);
sprite[j].z = sectlotag==ST_1_ABOVE_WATER ?
sector[osect].ceilingz : sector[osect].floorz;
Bmemcpy(&actor[j].bposx, &sprite[j], sizeof(vec3_t));
changespritesect(j, sprite[OW].sectnum);
}
else if (Bassert(sectlotag==0), 1)
{ {
case 0:
if (onfloorz) if (onfloorz)
{ {
if (sprite[j].statnum == STAT_PROJECTILE || if (sprite[j].statnum == STAT_PROJECTILE ||
@ -3472,33 +3495,16 @@ ACTOR_STATIC void G_MoveTransports(void)
changespritesect(j,sprite[OW].sectnum); changespritesect(j,sprite[OW].sectnum);
} }
break;
case ST_1_ABOVE_WATER:
case ST_2_UNDERWATER:
{
int32_t osect = sprite[OW].sectnum;
actor[j].lasttransport = totalclock + (TICSPERFRAME<<2);
sprite[j].x += (sprite[OW].x-SX);
sprite[j].y += (sprite[OW].y-SY);
sprite[j].z = sectlotag==ST_1_ABOVE_WATER ?
sector[osect].ceilingz : sector[osect].floorz;
Bmemcpy(&actor[j].bposx, &sprite[j], sizeof(vec3_t));
changespritesect(j, sprite[OW].sectnum);
break;
}
} }
break; break;
} } // switch (DYNAMICTILEMAP(sprite[j].picnum))
} } // if (warpspriteto)
} // if (totalclock > actor[j].lasttransport)
break; break;
} } // five cases
} // switch (sprite[j].statnum) } // switch (sprite[j].statnum)
JBOLT: JBOLT:
j = nextj; j = nextj;