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

- use the new iterators in the movetransports functions.

Browse source 
Also prefer pointers over array access.
This commit is contained in:
Christoph Oelckers 2020-10-12 20:45:08 +02:00
parent 91fdf160b6
commit 8ece66e55c
2 changed files with 291 additions and 283 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

339
source/games/duke/src/actors_d.cpp
View file

@ -2039,118 +2039,123 @@ void moveweapons_d(void)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// //
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void movetransports_d(void) void movetransports_d(void)
{ {
char warpspriteto; char warpspriteto;
short j, k, l, p, sect, sectlotag, nextj; short k, l, p, sect, sectlotag;
int ll, onfloorz, q, nexti; int ll, onfloorz, q;
int i, j;
for (int i = headspritestat[STAT_TRANSPORT]; i >= 0; i = nexti)
StatIterator iti(STAT_TRANSPORT);
while ((i = iti.NextIndex()) >= 0)
{ {
sect = sprite[i].sectnum; auto spri = &sprite[i];
auto hiti = &hittype[i];
auto spriowner = spri->owner < 0? nullptr : &sprite[spri->owner];
sect = spri->sectnum;
sectlotag = sector[sect].lotag; sectlotag = sector[sect].lotag;
nexti = nextspritestat[i];
if (spri->owner == i)
if (sprite[i].owner == i)
{ {
i = nexti;
continue; continue;
} }
onfloorz = hittype[i].temp_data[4]; onfloorz = hiti->temp_data[4];
if (hittype[i].temp_data[0] > 0) hittype[i].temp_data[0]--; if (hiti->temp_data[0] > 0) hiti->temp_data[0]--;
j = headspritesect[sect]; SectIterator itj(sect);
while (j >= 0) while ((j = itj.NextIndex()) >= 0)
{ {
nextj = nextspritesect[j]; auto sprj = &sprite[j];
auto hitj = &hittype[j];
switch (sprite[j].statnum)
switch (sprj->statnum)
{ {
case STAT_PLAYER: // Player case STAT_PLAYER: // Player
if (sprite[j].owner != -1) if (sprj->owner != -1)
{ {
p = sprite[j].yvel; p = sprj->yvel;
ps[p].on_warping_sector = 1; ps[p].on_warping_sector = 1;
if (ps[p].transporter_hold == 0 && ps[p].jumping_counter == 0) if (ps[p].transporter_hold == 0 && ps[p].jumping_counter == 0)
{ {
if (ps[p].on_ground && sectlotag == 0 && onfloorz && ps[p].jetpack_on == 0) if (ps[p].on_ground && sectlotag == 0 && onfloorz && ps[p].jetpack_on == 0)
{ {
if (sprite[i].pal == 0) if (spri->pal == 0)
{ {
fi.spawn(i, TRANSPORTERBEAM); fi.spawn(i, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, i); S_PlayActorSound(TELEPORTER, i);
} }
for (k = connecthead; k >= 0; k = connectpoint2[k]) for (k = connecthead; k >= 0; k = connectpoint2[k])
if (ps[k].cursectnum == sprite[sprite[i].owner].sectnum) if (ps[k].cursectnum == spriowner->sectnum)
{
ps[k].frag_ps = p;
sprite[ps[k].i].extra = 0;
}
ps[p].angle.ang = buildang(sprite[sprite[i].owner].ang);
if (sprite[sprite[i].owner].owner != sprite[i].owner)
{ {
hittype[i].temp_data[0] = 13; ps[k].frag_ps = p;
hittype[sprite[i].owner].temp_data[0] = 13; sprite[ps[k].i].extra = 0;
}
ps[p].angle.ang = buildang(spriowner->ang);
if (spriowner->owner != spri->owner)
{
hiti->temp_data[0] = 13;
hittype[spri->owner].temp_data[0] = 13;
ps[p].transporter_hold = 13; ps[p].transporter_hold = 13;
} }
ps[p].bobposx = ps[p].oposx = ps[p].posx = sprite[sprite[i].owner].x; ps[p].bobposx = ps[p].oposx = ps[p].posx = spriowner->x;
ps[p].bobposy = ps[p].oposy = ps[p].posy = sprite[sprite[i].owner].y; ps[p].bobposy = ps[p].oposy = ps[p].posy = spriowner->y;
ps[p].oposz = ps[p].posz = sprite[sprite[i].owner].z - PHEIGHT; ps[p].oposz = ps[p].posz = spriowner->z - PHEIGHT;
changespritesect(j, sprite[sprite[i].owner].sectnum); changespritesect(j, spriowner->sectnum);
ps[p].cursectnum = sprite[j].sectnum; ps[p].cursectnum = sprj->sectnum;
if (sprite[i].pal == 0) if (spri->pal == 0)
{ {
k = fi.spawn(sprite[i].owner, TRANSPORTERBEAM); k = fi.spawn(spri->owner, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, k); S_PlayActorSound(TELEPORTER, k);
} }
break; break;
} }
} }
else if (!(sectlotag == 1 && ps[p].on_ground == 1)) break; else if (!(sectlotag == 1 && ps[p].on_ground == 1)) break;
if (onfloorz == 0 && abs(sprite[i].z - ps[p].posz) < 6144) if (onfloorz == 0 && abs(spri->z - ps[p].posz) < 6144)
if ((ps[p].jetpack_on == 0) || (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP))) || if ((ps[p].jetpack_on == 0) || (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP))) ||
(ps[p].jetpack_on && (PlayerInput(p, SB_CROUCH) ^ !!ps[p].crouch_toggle))) (ps[p].jetpack_on && (PlayerInput(p, SB_CROUCH) ^ !!ps[p].crouch_toggle)))
{ {
ps[p].oposx = ps[p].posx += sprite[sprite[i].owner].x - sprite[i].x; ps[p].oposx = ps[p].posx += spriowner->x - spri->x;
ps[p].oposy = ps[p].posy += sprite[sprite[i].owner].y - sprite[i].y; ps[p].oposy = ps[p].posy += spriowner->y - spri->y;
if (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP) || ps[p].jetpack_on < 11)) if (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP) || ps[p].jetpack_on < 11))
ps[p].posz = sprite[sprite[i].owner].z - 6144; ps[p].posz = spriowner->z - 6144;
else ps[p].posz = sprite[sprite[i].owner].z + 6144; else ps[p].posz = spriowner->z + 6144;
ps[p].oposz = ps[p].posz; ps[p].oposz = ps[p].posz;
hittype[ps[p].i].bposx = ps[p].posx; hittype[ps[p].i].bposx = ps[p].posx;
hittype[ps[p].i].bposy = ps[p].posy; hittype[ps[p].i].bposy = ps[p].posy;
hittype[ps[p].i].bposz = ps[p].posz; hittype[ps[p].i].bposz = ps[p].posz;
changespritesect(j, sprite[sprite[i].owner].sectnum); changespritesect(j, spriowner->sectnum);
ps[p].cursectnum = sprite[sprite[i].owner].sectnum; ps[p].cursectnum = spriowner->sectnum;
break; break;
} }
k = 0; k = 0;
if (onfloorz && sectlotag == ST_1_ABOVE_WATER && ps[p].on_ground && ps[p].posz > (sector[sect].floorz - (16 << 8)) && (PlayerInput(p, SB_CROUCH) || ps[p].poszv > 2048)) if (onfloorz && sectlotag == ST_1_ABOVE_WATER && ps[p].on_ground && ps[p].posz > (sector[sect].floorz - (16 << 8)) && (PlayerInput(p, SB_CROUCH) || ps[p].poszv > 2048))
// if( onfloorz && sectlotag == 1 && ps[p].posz > (sector[sect].floorz-(6<<8)) ) // if( onfloorz && sectlotag == 1 && ps[p].posz > (sector[sect].floorz-(6<<8)) )
{ {
k = 1; k = 1;
if (screenpeek == p) if (screenpeek == p)
@ -2160,59 +2165,59 @@ void movetransports_d(void)
if (sprite[ps[p].i].extra > 0) if (sprite[ps[p].i].extra > 0)
S_PlayActorSound(DUKE_UNDERWATER, j); S_PlayActorSound(DUKE_UNDERWATER, j);
ps[p].oposz = ps[p].posz = ps[p].oposz = ps[p].posz =
sector[sprite[sprite[i].owner].sectnum].ceilingz + (7 << 8); sector[spriowner->sectnum].ceilingz + (7 << 8);
ps[p].posxv = 4096 - (krand() & 8192); ps[p].posxv = 4096 - (krand() & 8192);
ps[p].posyv = 4096 - (krand() & 8192); ps[p].posyv = 4096 - (krand() & 8192);
} }
if (onfloorz && sectlotag == ST_2_UNDERWATER && ps[p].posz < (sector[sect].ceilingz + (6 << 8))) if (onfloorz && sectlotag == ST_2_UNDERWATER && ps[p].posz < (sector[sect].ceilingz + (6 << 8)))
{ {
k = 1; k = 1;
// if( sprite[j].extra <= 0) break; // if( sprj->extra <= 0) break;
if (screenpeek == p) if (screenpeek == p)
{ {
FX_StopAllSounds(); FX_StopAllSounds();
} }
S_PlayActorSound(DUKE_GASP, j); S_PlayActorSound(DUKE_GASP, j);
ps[p].oposz = ps[p].posz = ps[p].oposz = ps[p].posz =
sector[sprite[sprite[i].owner].sectnum].floorz - (7 << 8); sector[spriowner->sectnum].floorz - (7 << 8);
ps[p].jumping_toggle = 1; ps[p].jumping_toggle = 1;
ps[p].jumping_counter = 0; ps[p].jumping_counter = 0;
} }
if (k == 1) if (k == 1)
{ {
ps[p].oposx = ps[p].posx += sprite[sprite[i].owner].x - sprite[i].x; ps[p].oposx = ps[p].posx += spriowner->x - spri->x;
ps[p].oposy = ps[p].posy += sprite[sprite[i].owner].y - sprite[i].y; ps[p].oposy = ps[p].posy += spriowner->y - spri->y;
if (sprite[sprite[i].owner].owner != sprite[i].owner) if (spriowner->owner != spri->owner)
ps[p].transporter_hold = -2; ps[p].transporter_hold = -2;
ps[p].cursectnum = sprite[sprite[i].owner].sectnum; ps[p].cursectnum = spriowner->sectnum;
changespritesect(j, sprite[sprite[i].owner].sectnum); changespritesect(j, spriowner->sectnum);
setsprite(ps[p].i, ps[p].posx, ps[p].posy, ps[p].posz + PHEIGHT); setsprite(ps[p].i, ps[p].posx, ps[p].posy, ps[p].posz + PHEIGHT);
setpal(&ps[p]); setpal(&ps[p]);
if ((krand() & 255) < 32) if ((krand() & 255) < 32)
fi.spawn(j, WATERSPLASH2); fi.spawn(j, WATERSPLASH2);
if (sectlotag == 1) if (sectlotag == 1)
for (l = 0; l < 9; l++) for (l = 0; l < 9; l++)
{ {
q = fi.spawn(ps[p].i, WATERBUBBLE); q = fi.spawn(ps[p].i, WATERBUBBLE);
sprite[q].z += krand() & 16383; sprite[q].z += krand() & 16383;
} }
} }
} }
break; break;
case STAT_ACTOR: case STAT_ACTOR:
switch (sprite[j].picnum) switch (sprj->picnum)
{ {
case SHARK: case SHARK:
case COMMANDER: case COMMANDER:
@ -2225,35 +2230,35 @@ void movetransports_d(void)
case GREENSLIME + 5: case GREENSLIME + 5:
case GREENSLIME + 6: case GREENSLIME + 6:
case GREENSLIME + 7: case GREENSLIME + 7:
if (sprite[j].extra > 0) if (sprj->extra > 0)
goto JBOLT; continue;
} }
case STAT_PROJECTILE: case STAT_PROJECTILE:
case STAT_MISC: case STAT_MISC:
case STAT_FALLER: case STAT_FALLER:
case STAT_DUMMYPLAYER: case STAT_DUMMYPLAYER:
ll = abs(sprite[j].zvel); ll = abs(sprj->zvel);
{ {
warpspriteto = 0; warpspriteto = 0;
if (ll && sectlotag == 2 && sprite[j].z < (sector[sect].ceilingz + ll)) if (ll && sectlotag == 2 && sprj->z < (sector[sect].ceilingz + ll))
warpspriteto = 1; warpspriteto = 1;
if (ll && sectlotag == 1 && sprite[j].z > (sector[sect].floorz - ll)) if (ll && sectlotag == 1 && sprj->z > (sector[sect].floorz - ll))
warpspriteto = 1; warpspriteto = 1;
if (sectlotag == 0 && (onfloorz || abs(sprite[j].z - sprite[i].z) < 4096)) if (sectlotag == 0 && (onfloorz || abs(sprj->z - spri->z) < 4096))
{ {
if (sprite[sprite[i].owner].owner != sprite[i].owner && onfloorz && hittype[i].temp_data[0] > 0 && sprite[j].statnum != 5) if (spriowner->owner != spri->owner && onfloorz && hiti->temp_data[0] > 0 && sprj->statnum != 5)
{ {
hittype[i].temp_data[0]++; hiti->temp_data[0]++;
goto BOLT; goto BOLT;
} }
warpspriteto = 1; warpspriteto = 1;
} }
if (warpspriteto) switch (sprite[j].picnum) if (warpspriteto) switch (sprj->picnum)
{ {
case TRANSPORTERSTAR: case TRANSPORTERSTAR:
case TRANSPORTERBEAM: case TRANSPORTERBEAM:
@ -2266,113 +2271,111 @@ void movetransports_d(void)
case FIRE2: case FIRE2:
case TOILETWATER: case TOILETWATER:
case LASERLINE: case LASERLINE:
goto JBOLT; continue;
case PLAYERONWATER: case PLAYERONWATER:
if (sectlotag == 2) if (sectlotag == 2)
{ {
sprite[j].cstat &= 32767; sprj->cstat &= 32767;
break; break;
} }
default: default:
if (sprite[j].statnum == 5 && !(sectlotag == 1 || sectlotag == 2)) if (sprj->statnum == 5 && !(sectlotag == 1 || sectlotag == 2))
break; break;
case WATERBUBBLE: case WATERBUBBLE:
// if( rnd(192) && sprite[j].picnum == WATERBUBBLE) //if( rnd(192) && sprj->picnum == WATERBUBBLE)
// break; // break;
if (sectlotag > 0) if (sectlotag > 0)
{ {
k = fi.spawn(j, WATERSPLASH2); k = fi.spawn(j, WATERSPLASH2);
if (sectlotag == 1 && sprite[j].statnum == 4) if (sectlotag == 1 && sprj->statnum == 4)
{ {
sprite[k].xvel = sprite[j].xvel >> 1; sprite[k].xvel = sprj->xvel >> 1;
sprite[k].ang = sprite[j].ang; sprite[k].ang = sprj->ang;
ssp(k, CLIPMASK0); ssp(k, CLIPMASK0);
} }
} }
switch (sectlotag) switch (sectlotag)
{ {
case 0: case 0:
if (onfloorz) if (onfloorz)
{ {
if (sprite[j].statnum == 4 || (checkcursectnums(sect) == -1 && checkcursectnums(sprite[sprite[i].owner].sectnum) == -1)) if (sprj->statnum == 4 || (checkcursectnums(sect) == -1 && checkcursectnums(spriowner->sectnum) == -1))
{ {
sprite[j].x += (sprite[sprite[i].owner].x - sprite[i].x); sprj->x += (spriowner->x - spri->x);
sprite[j].y += (sprite[sprite[i].owner].y - sprite[i].y); sprj->y += (spriowner->y - spri->y);
sprite[j].z -= sprite[i].z - sector[sprite[sprite[i].owner].sectnum].floorz; sprj->z -= spri->z - sector[spriowner->sectnum].floorz;
sprite[j].ang = sprite[sprite[i].owner].ang; sprj->ang = spriowner->ang;
hittype[j].bposx = sprite[j].x; hitj->bposx = sprj->x;
hittype[j].bposy = sprite[j].y; hitj->bposy = sprj->y;
hittype[j].bposz = sprite[j].z; hitj->bposz = sprj->z;
if (sprite[i].pal == 0) if (spri->pal == 0)
{ {
k = fi.spawn(i, TRANSPORTERBEAM); k = fi.spawn(i, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, k); S_PlayActorSound(TELEPORTER, k);
k = fi.spawn(sprite[i].owner, TRANSPORTERBEAM); k = fi.spawn(spri->owner, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, k); S_PlayActorSound(TELEPORTER, k);
} }
if (sprite[sprite[i].owner].owner != sprite[i].owner) if (spriowner->owner != spri->owner)
{ {
hittype[i].temp_data[0] = 13; hiti->temp_data[0] = 13;
hittype[sprite[i].owner].temp_data[0] = 13; hittype[spri->owner].temp_data[0] = 13;
} }
changespritesect(j, sprite[sprite[i].owner].sectnum); changespritesect(j, spriowner->sectnum);
} }
} }
else else
{ {
sprite[j].x += (sprite[sprite[i].owner].x - sprite[i].x); sprj->x += (spriowner->x - spri->x);
sprite[j].y += (sprite[sprite[i].owner].y - sprite[i].y); sprj->y += (spriowner->y - spri->y);
sprite[j].z = sprite[sprite[i].owner].z + 4096; sprj->z = spriowner->z + 4096;
hittype[j].bposx = sprite[j].x; hitj->bposx = sprj->x;
hittype[j].bposy = sprite[j].y; hitj->bposy = sprj->y;
hittype[j].bposz = sprite[j].z; hitj->bposz = sprj->z;
changespritesect(j, sprite[sprite[i].owner].sectnum); changespritesect(j, spriowner->sectnum);
} }
break; break;
case 1: case 1:
sprite[j].x += (sprite[sprite[i].owner].x - sprite[i].x); sprj->x += (spriowner->x - spri->x);
sprite[j].y += (sprite[sprite[i].owner].y - sprite[i].y); sprj->y += (spriowner->y - spri->y);
sprite[j].z = sector[sprite[sprite[i].owner].sectnum].ceilingz + ll; sprj->z = sector[spriowner->sectnum].ceilingz + ll;
hittype[j].bposx = sprite[j].x; hitj->bposx = sprj->x;
hittype[j].bposy = sprite[j].y; hitj->bposy = sprj->y;
hittype[j].bposz = sprite[j].z; hitj->bposz = sprj->z;
changespritesect(j, sprite[sprite[i].owner].sectnum); changespritesect(j, spriowner->sectnum);
break; break;
case 2: case 2:
sprite[j].x += (sprite[sprite[i].owner].x - sprite[i].x); sprj->x += (spriowner->x - spri->x);
sprite[j].y += (sprite[sprite[i].owner].y - sprite[i].y); sprj->y += (spriowner->y - spri->y);
sprite[j].z = sector[sprite[sprite[i].owner].sectnum].floorz - ll; sprj->z = sector[spriowner->sectnum].floorz - ll;
hittype[j].bposx = sprite[j].x; hitj->bposx = sprj->x;
hittype[j].bposy = sprite[j].y; hitj->bposy = sprj->y;
hittype[j].bposz = sprite[j].z; hitj->bposz = sprj->z;
changespritesect(j, sprite[sprite[i].owner].sectnum); changespritesect(j, spriowner->sectnum);
break; break;
} }
break; break;
} }
} }
break; break;
} }
JBOLT:
j = nextj;
} }
BOLT:; BOLT:;
} }

235
source/games/duke/src/actors_r.cpp
View file

@ -1679,40 +1679,45 @@ void moveweapons_r(void)
void movetransports_r(void) void movetransports_r(void)
{ {
char warpdir, warpspriteto; char warpdir, warpspriteto;
short i, j, k, p, sect, sectlotag, nexti, nextj; short i, j, k, p, sect, sectlotag;
int ll2, ll, onfloorz; int ll2, ll, onfloorz;
//Transporters //Transporters
for (i = headspritestat[STAT_TRANSPORT]; i >= 0; i = nexti) StatIterator iti(STAT_TRANSPORT);
while ((i = iti.NextIndex()) >= 0)
{ {
sect = sprite[i].sectnum; auto spri = &sprite[i];
auto hiti = &hittype[i];
auto spriowner = spri->owner < 0? nullptr : &sprite[spri->owner];
sect = spri->sectnum;
sectlotag = sector[sect].lotag; sectlotag = sector[sect].lotag;
nexti = nextspritestat[i]; auto& OW = spri->owner;
auto PN = spri->picnum;
auto& OW = sprite[i].owner;
auto PN = sprite[i].picnum;
if (OW == i) if (OW == i)
{ {
continue; continue;
} }
onfloorz = hittype[i].temp_data[4]; onfloorz = hiti->temp_data[4];
if (hittype[i].temp_data[0] > 0) hittype[i].temp_data[0]--; if (hiti->temp_data[0] > 0) hiti->temp_data[0]--;
for (j = headspritesect[sect]; j >= 0; j = nextj) SectIterator itj(sect);
while ((j = itj.NextIndex()) >= 0)
{ {
nextj = nextspritesect[j]; auto sprj = &sprite[j];
auto hitj = &hittype[j];
switch (sprite[j].statnum) switch (sprj->statnum)
{ {
case STAT_PLAYER: // Player case STAT_PLAYER: // Player
if (sprite[j].owner != -1) if (sprj->owner != -1)
{ {
p = sprite[j].yvel; p = sprj->yvel;
ps[p].on_warping_sector = 1; ps[p].on_warping_sector = 1;
@ -1724,27 +1729,27 @@ void movetransports_r(void)
S_PlayActorSound(TELEPORTER, i); S_PlayActorSound(TELEPORTER, i);
for (k = connecthead; k >= 0; k = connectpoint2[k])// connectpoinhittype[i].temp_data[1][k]) for (k = connecthead; k >= 0; k = connectpoint2[k])// connectpoinhittype[i].temp_data[1][k])
if (ps[k].cursectnum == sprite[OW].sectnum) if (ps[k].cursectnum == spriowner->sectnum)
{ {
ps[k].frag_ps = p; ps[k].frag_ps = p;
sprite[ps[k].i].extra = 0; sprite[ps[k].i].extra = 0;
} }
ps[p].angle.ang = buildang(sprite[OW].ang); ps[p].angle.ang = buildang(spriowner->ang);
if (sprite[OW].owner != OW) if (spriowner->owner != OW)
{ {
hittype[i].temp_data[0] = 13; hiti->temp_data[0] = 13;
hittype[OW].temp_data[0] = 13; hittype[OW].temp_data[0] = 13;
ps[p].transporter_hold = 13; ps[p].transporter_hold = 13;
} }
ps[p].bobposx = ps[p].oposx = ps[p].posx = sprite[OW].x; ps[p].bobposx = ps[p].oposx = ps[p].posx = spriowner->x;
ps[p].bobposy = ps[p].oposy = ps[p].posy = sprite[OW].y; ps[p].bobposy = ps[p].oposy = ps[p].posy = spriowner->y;
ps[p].oposz = ps[p].posz = sprite[OW].z - (PHEIGHT - (4 << 8)); ps[p].oposz = ps[p].posz = spriowner->z - (PHEIGHT - (4 << 8));
changespritesect(j, sprite[OW].sectnum); changespritesect(j, spriowner->sectnum);
ps[p].cursectnum = sprite[j].sectnum; ps[p].cursectnum = sprj->sectnum;
k = fi.spawn(OW, TRANSPORTERBEAM); k = fi.spawn(OW, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, k); S_PlayActorSound(TELEPORTER, k);
@ -1754,20 +1759,20 @@ void movetransports_r(void)
} }
else break; else break;
if (onfloorz == 0 && abs(sprite[i].z - ps[p].posz) < 6144) if (onfloorz == 0 && abs(spri->z - ps[p].posz) < 6144)
if ((ps[p].jetpack_on == 0) || (ps[p].jetpack_on && PlayerInput(p, SB_JUMP)) || if ((ps[p].jetpack_on == 0) || (ps[p].jetpack_on && PlayerInput(p, SB_JUMP)) ||
(ps[p].jetpack_on && PlayerInput(p, SB_CROUCH))) (ps[p].jetpack_on && PlayerInput(p, SB_CROUCH)))
{ {
ps[p].oposx = ps[p].posx += sprite[OW].x - sprite[i].x; ps[p].oposx = ps[p].posx += spriowner->x - spri->x;
ps[p].oposy = ps[p].posy += sprite[OW].y - sprite[i].y; ps[p].oposy = ps[p].posy += spriowner->y - spri->y;
if (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP) || ps[p].jetpack_on < 11)) if (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP) || ps[p].jetpack_on < 11))
ps[p].posz = sprite[OW].z - 6144; ps[p].posz = spriowner->z - 6144;
else ps[p].posz = sprite[OW].z + 6144; else ps[p].posz = spriowner->z + 6144;
ps[p].oposz = ps[p].posz; ps[p].oposz = ps[p].posz;
changespritesect(j, sprite[OW].sectnum); changespritesect(j, spriowner->sectnum);
ps[p].cursectnum = sprite[OW].sectnum; ps[p].cursectnum = spriowner->sectnum;
break; break;
} }
@ -1780,7 +1785,7 @@ void movetransports_r(void)
{ {
k = 2; k = 2;
ps[p].oposz = ps[p].posz = ps[p].oposz = ps[p].posz =
sector[sprite[OW].sectnum].ceilingz + (7 << 8); sector[spriowner->sectnum].ceilingz + (7 << 8);
} }
if (onfloorz && sectlotag == 161 && ps[p].posz < (sector[sect].ceilingz + (6 << 8))) if (onfloorz && sectlotag == 161 && ps[p].posz < (sector[sect].ceilingz + (6 << 8)))
@ -1788,7 +1793,7 @@ void movetransports_r(void)
k = 2; k = 2;
if (sprite[ps[p].i].extra <= 0) break; if (sprite[ps[p].i].extra <= 0) break;
ps[p].oposz = ps[p].posz = ps[p].oposz = ps[p].posz =
sector[sprite[OW].sectnum].floorz - (49 << 8); sector[spriowner->sectnum].floorz - (49 << 8);
} }
} }
@ -1803,7 +1808,7 @@ void movetransports_r(void)
} }
S_PlayActorSound(DUKE_UNDERWATER, ps[p].i); S_PlayActorSound(DUKE_UNDERWATER, ps[p].i);
ps[p].oposz = ps[p].posz = ps[p].oposz = ps[p].posz =
sector[sprite[OW].sectnum].ceilingz + (7 << 8); sector[spriowner->sectnum].ceilingz + (7 << 8);
if (ps[p].OnMotorcycle) if (ps[p].OnMotorcycle)
ps[p].moto_underwater = 1; ps[p].moto_underwater = 1;
} }
@ -1819,19 +1824,19 @@ void movetransports_r(void)
S_PlayActorSound(DUKE_GASP, ps[p].i); S_PlayActorSound(DUKE_GASP, ps[p].i);
ps[p].oposz = ps[p].posz = ps[p].oposz = ps[p].posz =
sector[sprite[OW].sectnum].floorz - (7 << 8); sector[spriowner->sectnum].floorz - (7 << 8);
} }
if (k == 1) if (k == 1)
{ {
ps[p].oposx = ps[p].posx += sprite[OW].x - sprite[i].x; ps[p].oposx = ps[p].posx += spriowner->x - spri->x;
ps[p].oposy = ps[p].posy += sprite[OW].y - sprite[i].y; ps[p].oposy = ps[p].posy += spriowner->y - spri->y;
if (sprite[OW].owner != OW) if (spriowner->owner != OW)
ps[p].transporter_hold = -2; ps[p].transporter_hold = -2;
ps[p].cursectnum = sprite[OW].sectnum; ps[p].cursectnum = spriowner->sectnum;
changespritesect(j, sprite[OW].sectnum); changespritesect(j, spriowner->sectnum);
setpal(&ps[p]); setpal(&ps[p]);
@ -1840,14 +1845,14 @@ void movetransports_r(void)
} }
else if (isRRRA() && k == 2) else if (isRRRA() && k == 2)
{ {
ps[p].oposx = ps[p].posx += sprite[OW].x - sprite[i].x; ps[p].oposx = ps[p].posx += spriowner->x - spri->x;
ps[p].oposy = ps[p].posy += sprite[OW].y - sprite[i].y; ps[p].oposy = ps[p].posy += spriowner->y - spri->y;
if (sprite[OW].owner != OW) if (spriowner->owner != OW)
ps[p].transporter_hold = -2; ps[p].transporter_hold = -2;
ps[p].cursectnum = sprite[OW].sectnum; ps[p].cursectnum = spriowner->sectnum;
changespritesect(j, sprite[OW].sectnum); changespritesect(j, spriowner->sectnum);
} }
} }
break; break;
@ -1860,10 +1865,10 @@ void movetransports_r(void)
case STAT_MISC: case STAT_MISC:
case STAT_DUMMYPLAYER: case STAT_DUMMYPLAYER:
ll = abs(sprite[j].zvel); ll = abs(sprj->zvel);
if (isRRRA()) if (isRRRA())
{ {
if (sprite[j].zvel >= 0) if (sprj->zvel >= 0)
warpdir = 2; warpdir = 2;
else else
warpdir = 1; warpdir = 1;
@ -1871,48 +1876,48 @@ void movetransports_r(void)
{ {
warpspriteto = 0; warpspriteto = 0;
if (ll && sectlotag == ST_2_UNDERWATER && sprite[j].z < (sector[sect].ceilingz + ll)) if (ll && sectlotag == ST_2_UNDERWATER && sprj->z < (sector[sect].ceilingz + ll))
warpspriteto = 1; warpspriteto = 1;
if (ll && sectlotag == ST_1_ABOVE_WATER && sprite[j].z > (sector[sect].floorz - ll)) if (ll && sectlotag == ST_1_ABOVE_WATER && sprj->z > (sector[sect].floorz - ll))
if (!isRRRA() || (sprite[j].picnum != CHEERBOAT && sprite[j].picnum != HULKBOAT && sprite[j].picnum != MINIONBOAT)) if (!isRRRA() || (sprj->picnum != CHEERBOAT && sprj->picnum != HULKBOAT && sprj->picnum != MINIONBOAT))
warpspriteto = 1; warpspriteto = 1;
if (isRRRA()) if (isRRRA())
{ {
if (ll && sectlotag == 161 && sprite[j].z < (sector[sect].ceilingz + ll) && warpdir == 1) if (ll && sectlotag == 161 && sprj->z < (sector[sect].ceilingz + ll) && warpdir == 1)
{ {
warpspriteto = 1; warpspriteto = 1;
ll2 = ll - abs(sprite[j].z - sector[sect].ceilingz); ll2 = ll - abs(sprj->z - sector[sect].ceilingz);
} }
else if (sectlotag == 161 && sprite[j].z < (sector[sect].ceilingz + 1000) && warpdir == 1) else if (sectlotag == 161 && sprj->z < (sector[sect].ceilingz + 1000) && warpdir == 1)
{ {
warpspriteto = 1; warpspriteto = 1;
ll2 = 1; ll2 = 1;
} }
if (ll && sectlotag == 160 && sprite[j].z > (sector[sect].floorz - ll) && warpdir == 2) if (ll && sectlotag == 160 && sprj->z > (sector[sect].floorz - ll) && warpdir == 2)
{ {
warpspriteto = 1; warpspriteto = 1;
ll2 = ll - abs(sector[sect].floorz - sprite[j].z); ll2 = ll - abs(sector[sect].floorz - sprj->z);
} }
else if (sectlotag == 160 && sprite[j].z > (sector[sect].floorz - 1000) && warpdir == 2) else if (sectlotag == 160 && sprj->z > (sector[sect].floorz - 1000) && warpdir == 2)
{ {
warpspriteto = 1; warpspriteto = 1;
ll2 = 1; ll2 = 1;
} }
} }
if (sectlotag == 0 && (onfloorz || abs(sprite[j].z - sprite[i].z) < 4096)) if (sectlotag == 0 && (onfloorz || abs(sprj->z - spri->z) < 4096))
{ {
if (sprite[OW].owner != OW && onfloorz && hittype[i].temp_data[0] > 0 && sprite[j].statnum != 5) if (spriowner->owner != OW && onfloorz && hiti->temp_data[0] > 0 && sprj->statnum != 5)
{ {
hittype[i].temp_data[0]++; hiti->temp_data[0]++;
continue; continue;
} }
warpspriteto = 1; warpspriteto = 1;
} }
if (warpspriteto) switch (sprite[j].picnum) if (warpspriteto) switch (sprj->picnum)
{ {
case TRANSPORTERSTAR: case TRANSPORTERSTAR:
case TRANSPORTERBEAM: case TRANSPORTERBEAM:
@ -1925,24 +1930,24 @@ void movetransports_r(void)
case PLAYERONWATER: case PLAYERONWATER:
if (sectlotag == ST_2_UNDERWATER) if (sectlotag == ST_2_UNDERWATER)
{ {
sprite[j].cstat &= 32767; sprj->cstat &= 32767;
break; break;
} }
default: default:
if (sprite[j].statnum == 5 && !(sectlotag == ST_1_ABOVE_WATER || sectlotag == ST_2_UNDERWATER || (isRRRA() && (sectlotag == 160 || sectlotag == 161)))) if (sprj->statnum == 5 && !(sectlotag == ST_1_ABOVE_WATER || sectlotag == ST_2_UNDERWATER || (isRRRA() && (sectlotag == 160 || sectlotag == 161))))
break; break;
case WATERBUBBLE: case WATERBUBBLE:
if (rnd(192) && sprite[j].picnum == WATERBUBBLE) if (rnd(192) && sprj->picnum == WATERBUBBLE)
break; break;
if (sectlotag > 0) if (sectlotag > 0)
{ {
k = fi.spawn(j, WATERSPLASH2); k = fi.spawn(j, WATERSPLASH2);
if (sectlotag == 1 && sprite[j].statnum == 4) if (sectlotag == 1 && sprj->statnum == 4)
{ {
sprite[k].xvel = sprite[j].xvel >> 1; sprite[k].xvel = sprj->xvel >> 1;
sprite[k].ang = sprite[j].ang; sprite[k].ang = sprj->ang;
ssp(k, CLIPMASK0); ssp(k, CLIPMASK0);
} }
} }
@ -1952,16 +1957,16 @@ void movetransports_r(void)
case ST_0_NO_EFFECT: case ST_0_NO_EFFECT:
if (onfloorz) if (onfloorz)
{ {
if (checkcursectnums(sect) == -1 && checkcursectnums(sprite[OW].sectnum) == -1) if (checkcursectnums(sect) == -1 && checkcursectnums(spriowner->sectnum) == -1)
{ {
sprite[j].x += (sprite[OW].x - sprite[i].x); sprj->x += (spriowner->x - spri->x);
sprite[j].y += (sprite[OW].y - sprite[i].y); sprj->y += (spriowner->y - spri->y);
sprite[j].z -= sprite[i].z - sector[sprite[OW].sectnum].floorz; sprj->z -= spri->z - sector[spriowner->sectnum].floorz;
sprite[j].ang = sprite[OW].ang; sprj->ang = spriowner->ang;
hittype[j].bposx = sprite[j].x; hitj->bposx = sprj->x;
hittype[j].bposy = sprite[j].y; hitj->bposy = sprj->y;
hittype[j].bposz = sprite[j].z; hitj->bposz = sprj->z;
k = fi.spawn(i, TRANSPORTERBEAM); k = fi.spawn(i, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, k); S_PlayActorSound(TELEPORTER, k);
@ -1969,83 +1974,83 @@ void movetransports_r(void)
k = fi.spawn(OW, TRANSPORTERBEAM); k = fi.spawn(OW, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, k); S_PlayActorSound(TELEPORTER, k);
if (sprite[OW].owner != OW) if (spriowner->owner != OW)
{ {
hittype[i].temp_data[0] = 13; hiti->temp_data[0] = 13;
hittype[OW].temp_data[0] = 13; hittype[OW].temp_data[0] = 13;
} }
changespritesect(j, sprite[OW].sectnum); changespritesect(j, spriowner->sectnum);
} }
} }
else else
{ {
sprite[j].x += (sprite[OW].x - sprite[i].x); sprj->x += (spriowner->x - spri->x);
sprite[j].y += (sprite[OW].y - sprite[i].y); sprj->y += (spriowner->y - spri->y);
sprite[j].z = sprite[OW].z + 4096; sprj->z = spriowner->z + 4096;
hittype[j].bposx = sprite[j].x; hitj->bposx = sprj->x;
hittype[j].bposy = sprite[j].y; hitj->bposy = sprj->y;
hittype[j].bposz = sprite[j].z; hitj->bposz = sprj->z;
changespritesect(j, sprite[OW].sectnum); changespritesect(j, spriowner->sectnum);
} }
break; break;
case ST_1_ABOVE_WATER: case ST_1_ABOVE_WATER:
sprite[j].x += (sprite[OW].x - sprite[i].x); sprj->x += (spriowner->x - spri->x);
sprite[j].y += (sprite[OW].y - sprite[i].y); sprj->y += (spriowner->y - spri->y);
sprite[j].z = sector[sprite[OW].sectnum].ceilingz + ll; sprj->z = sector[spriowner->sectnum].ceilingz + ll;
hittype[j].bposx = sprite[j].x; hitj->bposx = sprj->x;
hittype[j].bposy = sprite[j].y; hitj->bposy = sprj->y;
hittype[j].bposz = sprite[j].z; hitj->bposz = sprj->z;
changespritesect(j, sprite[OW].sectnum); changespritesect(j, spriowner->sectnum);
break; break;
case ST_2_UNDERWATER: case ST_2_UNDERWATER:
sprite[j].x += (sprite[OW].x - sprite[i].x); sprj->x += (spriowner->x - spri->x);
sprite[j].y += (sprite[OW].y - sprite[i].y); sprj->y += (spriowner->y - spri->y);
sprite[j].z = sector[sprite[OW].sectnum].floorz - ll; sprj->z = sector[spriowner->sectnum].floorz - ll;
hittype[j].bposx = sprite[j].x; hitj->bposx = sprj->x;
hittype[j].bposy = sprite[j].y; hitj->bposy = sprj->y;
hittype[j].bposz = sprite[j].z; hitj->bposz = sprj->z;
changespritesect(j, sprite[OW].sectnum); changespritesect(j, spriowner->sectnum);
break; break;
case 160: case 160:
if (!isRRRA()) break; if (!isRRRA()) break;
sprite[j].x += (sprite[OW].x - sprite[i].x); sprj->x += (spriowner->x - spri->x);
sprite[j].y += (sprite[OW].y - sprite[i].y); sprj->y += (spriowner->y - spri->y);
sprite[j].z = sector[sprite[OW].sectnum].ceilingz + ll2; sprj->z = sector[spriowner->sectnum].ceilingz + ll2;
hittype[j].bposx = sprite[j].x; hitj->bposx = sprj->x;
hittype[j].bposy = sprite[j].y; hitj->bposy = sprj->y;
hittype[j].bposz = sprite[j].z; hitj->bposz = sprj->z;
changespritesect(j, sprite[OW].sectnum); changespritesect(j, spriowner->sectnum);
fi.movesprite(j, (sprite[j].xvel * sintable[(sprite[j].ang + 512) & 2047]) >> 14, fi.movesprite(j, (sprj->xvel * sintable[(sprj->ang + 512) & 2047]) >> 14,
(sprite[j].xvel * sintable[sprite[j].ang & 2047]) >> 14, 0, CLIPMASK1); (sprj->xvel * sintable[sprj->ang & 2047]) >> 14, 0, CLIPMASK1);
break; break;
case 161: case 161:
if (!isRRRA()) break; if (!isRRRA()) break;
sprite[j].x += (sprite[OW].x - sprite[i].x); sprj->x += (spriowner->x - spri->x);
sprite[j].y += (sprite[OW].y - sprite[i].y); sprj->y += (spriowner->y - spri->y);
sprite[j].z = sector[sprite[OW].sectnum].floorz - ll2; sprj->z = sector[spriowner->sectnum].floorz - ll2;
hittype[j].bposx = sprite[j].x; hitj->bposx = sprj->x;
hittype[j].bposy = sprite[j].y; hitj->bposy = sprj->y;
hittype[j].bposz = sprite[j].z; hitj->bposz = sprj->z;
changespritesect(j, sprite[OW].sectnum); changespritesect(j, spriowner->sectnum);
fi.movesprite(j, (sprite[j].xvel * sintable[(sprite[j].ang + 512) & 2047]) >> 14, fi.movesprite(j, (sprj->xvel * sintable[(sprj->ang + 512) & 2047]) >> 14,
(sprite[j].xvel * sintable[sprite[j].ang & 2047]) >> 14, 0, CLIPMASK1); (sprj->xvel * sintable[sprj->ang & 2047]) >> 14, 0, CLIPMASK1);
break; break;
} }