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

- renamed variables in movetransports.

Browse source
This commit is contained in:
Christoph Oelckers 2020-11-01 14:56:23 +01:00
parent 2d1b8a2b4b
commit 076dcef5d0
2 changed files with 124 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2008,7 +2008,7 @@ void movetransports_d(void)
while ((i = iti.NextIndex()) >= 0) while ((i = iti.NextIndex()) >= 0)
{ {
auto spri = &sprite[i]; auto spri = &sprite[i];
auto hiti = &hittype[i]; auto act1 = &hittype[i];
auto spriowner = spri->owner < 0? nullptr : &sprite[spri->owner]; auto spriowner = spri->owner < 0? nullptr : &sprite[spri->owner];
int sect = spri->sectnum; int sect = spri->sectnum;
@ -2020,23 +2020,23 @@ void movetransports_d(void)
continue; continue;
} }
onfloorz = hiti->temp_data[4]; onfloorz = act1->temp_data[4];
if (hiti->temp_data[0] > 0) hiti->temp_data[0]--; if (act1->temp_data[0] > 0) act1->temp_data[0]--;
SectIterator itj(sect); SectIterator itj(sect);
while ((j = itj.NextIndex()) >= 0) while ((j = itj.NextIndex()) >= 0)
{ {
auto sprj = &sprite[j]; auto spr2 = &sprite[j];
auto hitj = &hittype[j]; auto act2 = &hittype[j];
switch (sprj->statnum) switch (spr2->statnum)
{ {
case STAT_PLAYER: // Player case STAT_PLAYER: // Player
if (sprj->owner != -1) if (spr2->owner != -1)
{ {
int p = sprj->yvel; int p = spr2->yvel;
ps[p].on_warping_sector = 1; ps[p].on_warping_sector = 1;
@ -2061,7 +2061,7 @@ void movetransports_d(void)
if (spriowner->owner != spri->owner) if (spriowner->owner != spri->owner)
{ {
hiti->temp_data[0] = 13; act1->temp_data[0] = 13;
hittype[spri->owner].temp_data[0] = 13; hittype[spri->owner].temp_data[0] = 13;
ps[p].transporter_hold = 13; ps[p].transporter_hold = 13;
} }
@ -2071,7 +2071,7 @@ void movetransports_d(void)
ps[p].oposz = ps[p].posz = spriowner->z - PHEIGHT; ps[p].oposz = ps[p].posz = spriowner->z - PHEIGHT;
changespritesect(j, spriowner->sectnum); changespritesect(j, spriowner->sectnum);
ps[p].cursectnum = sprj->sectnum; ps[p].cursectnum = spr2->sectnum;
if (spri->pal == 0) if (spri->pal == 0)
{ {
@ -2171,7 +2171,7 @@ void movetransports_d(void)
break; break;
case STAT_ACTOR: case STAT_ACTOR:
switch (sprj->picnum) switch (spr2->picnum)
{ {
case SHARK: case SHARK:
case COMMANDER: case COMMANDER:
@ -2184,7 +2184,7 @@ void movetransports_d(void)
case GREENSLIME + 5: case GREENSLIME + 5:
case GREENSLIME + 6: case GREENSLIME + 6:
case GREENSLIME + 7: case GREENSLIME + 7:
if (sprj->extra > 0) if (spr2->extra > 0)
continue; continue;
} }
case STAT_PROJECTILE: case STAT_PROJECTILE:
@ -2192,27 +2192,27 @@ void movetransports_d(void)
case STAT_FALLER: case STAT_FALLER:
case STAT_DUMMYPLAYER: case STAT_DUMMYPLAYER:
ll = abs(sprj->zvel); ll = abs(spr2->zvel);
{ {
warpspriteto = 0; warpspriteto = 0;
if (ll && sectlotag == 2 && sprj->z < (sector[sect].ceilingz + ll)) if (ll && sectlotag == 2 && spr2->z < (sector[sect].ceilingz + ll))
warpspriteto = 1; warpspriteto = 1;
if (ll && sectlotag == 1 && sprj->z > (sector[sect].floorz - ll)) if (ll && sectlotag == 1 && spr2->z > (sector[sect].floorz - ll))
warpspriteto = 1; warpspriteto = 1;
if (sectlotag == 0 && (onfloorz || abs(sprj->z - spri->z) < 4096)) if (sectlotag == 0 && (onfloorz || abs(spr2->z - spri->z) < 4096))
{ {
if (spriowner->owner != spri->owner && onfloorz && hiti->temp_data[0] > 0 && sprj->statnum != 5) if (spriowner->owner != spri->owner && onfloorz && act1->temp_data[0] > 0 && spr2->statnum != 5)
{ {
hiti->temp_data[0]++; act1->temp_data[0]++;
goto BOLT; goto BOLT;
} }
warpspriteto = 1; warpspriteto = 1;
} }
if (warpspriteto) switch (sprj->picnum) if (warpspriteto) switch (spr2->picnum)
{ {
case TRANSPORTERSTAR: case TRANSPORTERSTAR:
case TRANSPORTERBEAM: case TRANSPORTERBEAM:
@ -2229,11 +2229,11 @@ void movetransports_d(void)
case PLAYERONWATER: case PLAYERONWATER:
if (sectlotag == 2) if (sectlotag == 2)
{ {
sprj->cstat &= 32767; spr2->cstat &= 32767;
break; break;
} }
default: default:
if (sprj->statnum == 5 && !(sectlotag == 1 || sectlotag == 2)) if (spr2->statnum == 5 && !(sectlotag == 1 || sectlotag == 2))
break; break;
case WATERBUBBLE: case WATERBUBBLE:
@ -2243,10 +2243,10 @@ void movetransports_d(void)
if (sectlotag > 0) if (sectlotag > 0)
{ {
int k = fi.spawn(j, WATERSPLASH2); int k = fi.spawn(j, WATERSPLASH2);
if (sectlotag == 1 && sprj->statnum == 4) if (sectlotag == 1 && spr2->statnum == 4)
{ {
sprite[k].xvel = sprj->xvel >> 1; sprite[k].xvel = spr2->xvel >> 1;
sprite[k].ang = sprj->ang; sprite[k].ang = spr2->ang;
ssp(k, CLIPMASK0); ssp(k, CLIPMASK0);
} }
} }
@ -2256,16 +2256,16 @@ void movetransports_d(void)
case 0: case 0:
if (onfloorz) if (onfloorz)
{ {
if (sprj->statnum == 4 || (checkcursectnums(sect) == -1 && checkcursectnums(spriowner->sectnum) == -1)) if (spr2->statnum == 4 || (checkcursectnums(sect) == -1 && checkcursectnums(spriowner->sectnum) == -1))
{ {
sprj->x += (spriowner->x - spri->x); spr2->x += (spriowner->x - spri->x);
sprj->y += (spriowner->y - spri->y); spr2->y += (spriowner->y - spri->y);
sprj->z -= spri->z - sector[spriowner->sectnum].floorz; spr2->z -= spri->z - sector[spriowner->sectnum].floorz;
sprj->ang = spriowner->ang; spr2->ang = spriowner->ang;
hitj->bposx = sprj->x; act2->bposx = spr2->x;
hitj->bposy = sprj->y; act2->bposy = spr2->y;
hitj->bposz = sprj->z; act2->bposz = spr2->z;
if (spri->pal == 0) if (spri->pal == 0)
{ {
@ -2278,7 +2278,7 @@ void movetransports_d(void)
if (spriowner->owner != spri->owner) if (spriowner->owner != spri->owner)
{ {
hiti->temp_data[0] = 13; act1->temp_data[0] = 13;
hittype[spri->owner].temp_data[0] = 13; hittype[spri->owner].temp_data[0] = 13;
} }
@ -2287,37 +2287,37 @@ void movetransports_d(void)
} }
else else
{ {
sprj->x += (spriowner->x - spri->x); spr2->x += (spriowner->x - spri->x);
sprj->y += (spriowner->y - spri->y); spr2->y += (spriowner->y - spri->y);
sprj->z = spriowner->z + 4096; spr2->z = spriowner->z + 4096;
hitj->bposx = sprj->x; act2->bposx = spr2->x;
hitj->bposy = sprj->y; act2->bposy = spr2->y;
hitj->bposz = sprj->z; act2->bposz = spr2->z;
changespritesect(j, spriowner->sectnum); changespritesect(j, spriowner->sectnum);
} }
break; break;
case 1: case 1:
sprj->x += (spriowner->x - spri->x); spr2->x += (spriowner->x - spri->x);
sprj->y += (spriowner->y - spri->y); spr2->y += (spriowner->y - spri->y);
sprj->z = sector[spriowner->sectnum].ceilingz + ll; spr2->z = sector[spriowner->sectnum].ceilingz + ll;
hitj->bposx = sprj->x; act2->bposx = spr2->x;
hitj->bposy = sprj->y; act2->bposy = spr2->y;
hitj->bposz = sprj->z; act2->bposz = spr2->z;
changespritesect(j, spriowner->sectnum); changespritesect(j, spriowner->sectnum);
break; break;
case 2: case 2:
sprj->x += (spriowner->x - spri->x); spr2->x += (spriowner->x - spri->x);
sprj->y += (spriowner->y - spri->y); spr2->y += (spriowner->y - spri->y);
sprj->z = sector[spriowner->sectnum].floorz - ll; spr2->z = sector[spriowner->sectnum].floorz - ll;
hitj->bposx = sprj->x; act2->bposx = spr2->x;
hitj->bposy = sprj->y; act2->bposy = spr2->y;
hitj->bposz = sprj->z; act2->bposz = spr2->z;
changespritesect(j, spriowner->sectnum); changespritesect(j, spriowner->sectnum);

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

@ -1589,7 +1589,7 @@ void movetransports_r(void)
while ((i = iti.NextIndex()) >= 0) while ((i = iti.NextIndex()) >= 0)
{ {
auto spri = &sprite[i]; auto spri = &sprite[i];
auto hiti = &hittype[i]; auto act = &hittype[i];
auto spriowner = spri->owner < 0? nullptr : &sprite[spri->owner]; auto spriowner = spri->owner < 0? nullptr : &sprite[spri->owner];
sect = spri->sectnum; sect = spri->sectnum;
@ -1602,23 +1602,23 @@ void movetransports_r(void)
continue; continue;
} }
onfloorz = hiti->temp_data[4]; onfloorz = act->temp_data[4];
if (hiti->temp_data[0] > 0) hiti->temp_data[0]--; if (act->temp_data[0] > 0) act->temp_data[0]--;
SectIterator itj(sect); SectIterator itj(sect);
while ((j = itj.NextIndex()) >= 0) while ((j = itj.NextIndex()) >= 0)
{ {
auto sprj = &sprite[j]; auto spr2 = &sprite[j];
auto hitj = &hittype[j]; auto act2 = &hittype[j];
switch (sprj->statnum) switch (spr2->statnum)
{ {
case STAT_PLAYER: // Player case STAT_PLAYER: // Player
if (sprj->owner != -1) if (spr2->owner != -1)
{ {
p = sprj->yvel; p = spr2->yvel;
ps[p].on_warping_sector = 1; ps[p].on_warping_sector = 1;
@ -1640,7 +1640,7 @@ void movetransports_r(void)
if (spriowner->owner != OW) if (spriowner->owner != OW)
{ {
hiti->temp_data[0] = 13; act->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;
} }
@ -1650,7 +1650,7 @@ void movetransports_r(void)
ps[p].oposz = ps[p].posz = spriowner->z - (PHEIGHT - (4 << 8)); ps[p].oposz = ps[p].posz = spriowner->z - (PHEIGHT - (4 << 8));
changespritesect(j, spriowner->sectnum); changespritesect(j, spriowner->sectnum);
ps[p].cursectnum = sprj->sectnum; ps[p].cursectnum = spr2->sectnum;
k = fi.spawn(OW, TRANSPORTERBEAM); k = fi.spawn(OW, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, k); S_PlayActorSound(TELEPORTER, k);
@ -1766,10 +1766,10 @@ void movetransports_r(void)
case STAT_MISC: case STAT_MISC:
case STAT_DUMMYPLAYER: case STAT_DUMMYPLAYER:
ll = abs(sprj->zvel); ll = abs(spr2->zvel);
if (isRRRA()) if (isRRRA())
{ {
if (sprj->zvel >= 0) if (spr2->zvel >= 0)
warpdir = 2; warpdir = 2;
else else
warpdir = 1; warpdir = 1;
@ -1777,48 +1777,48 @@ void movetransports_r(void)
{ {
warpspriteto = 0; warpspriteto = 0;
if (ll && sectlotag == ST_2_UNDERWATER && sprj->z < (sector[sect].ceilingz + ll)) if (ll && sectlotag == ST_2_UNDERWATER && spr2->z < (sector[sect].ceilingz + ll))
warpspriteto = 1; warpspriteto = 1;
if (ll && sectlotag == ST_1_ABOVE_WATER && sprj->z > (sector[sect].floorz - ll)) if (ll && sectlotag == ST_1_ABOVE_WATER && spr2->z > (sector[sect].floorz - ll))
if (!isRRRA() || (sprj->picnum != CHEERBOAT && sprj->picnum != HULKBOAT && sprj->picnum != MINIONBOAT)) if (!isRRRA() || (spr2->picnum != CHEERBOAT && spr2->picnum != HULKBOAT && spr2->picnum != MINIONBOAT))
warpspriteto = 1; warpspriteto = 1;
if (isRRRA()) if (isRRRA())
{ {
if (ll && sectlotag == 161 && sprj->z < (sector[sect].ceilingz + ll) && warpdir == 1) if (ll && sectlotag == 161 && spr2->z < (sector[sect].ceilingz + ll) && warpdir == 1)
{ {
warpspriteto = 1; warpspriteto = 1;
ll2 = ll - abs(sprj->z - sector[sect].ceilingz); ll2 = ll - abs(spr2->z - sector[sect].ceilingz);
} }
else if (sectlotag == 161 && sprj->z < (sector[sect].ceilingz + 1000) && warpdir == 1) else if (sectlotag == 161 && spr2->z < (sector[sect].ceilingz + 1000) && warpdir == 1)
{ {
warpspriteto = 1; warpspriteto = 1;
ll2 = 1; ll2 = 1;
} }
if (ll && sectlotag == 160 && sprj->z > (sector[sect].floorz - ll) && warpdir == 2) if (ll && sectlotag == 160 && spr2->z > (sector[sect].floorz - ll) && warpdir == 2)
{ {
warpspriteto = 1; warpspriteto = 1;
ll2 = ll - abs(sector[sect].floorz - sprj->z); ll2 = ll - abs(sector[sect].floorz - spr2->z);
} }
else if (sectlotag == 160 && sprj->z > (sector[sect].floorz - 1000) && warpdir == 2) else if (sectlotag == 160 && spr2->z > (sector[sect].floorz - 1000) && warpdir == 2)
{ {
warpspriteto = 1; warpspriteto = 1;
ll2 = 1; ll2 = 1;
} }
} }
if (sectlotag == 0 && (onfloorz || abs(sprj->z - spri->z) < 4096)) if (sectlotag == 0 && (onfloorz || abs(spr2->z - spri->z) < 4096))
{ {
if (spriowner->owner != OW && onfloorz && hiti->temp_data[0] > 0 && sprj->statnum != 5) if (spriowner->owner != OW && onfloorz && act->temp_data[0] > 0 && spr2->statnum != 5)
{ {
hiti->temp_data[0]++; act->temp_data[0]++;
continue; continue;
} }
warpspriteto = 1; warpspriteto = 1;
} }
if (warpspriteto) switch (sprj->picnum) if (warpspriteto) switch (spr2->picnum)
{ {
case TRANSPORTERSTAR: case TRANSPORTERSTAR:
case TRANSPORTERBEAM: case TRANSPORTERBEAM:
@ -1831,24 +1831,24 @@ void movetransports_r(void)
case PLAYERONWATER: case PLAYERONWATER:
if (sectlotag == ST_2_UNDERWATER) if (sectlotag == ST_2_UNDERWATER)
{ {
sprj->cstat &= 32767; spr2->cstat &= 32767;
break; break;
} }
default: default:
if (sprj->statnum == 5 && !(sectlotag == ST_1_ABOVE_WATER || sectlotag == ST_2_UNDERWATER || (isRRRA() && (sectlotag == 160 || sectlotag == 161)))) if (spr2->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) && sprj->picnum == WATERBUBBLE) if (rnd(192) && spr2->picnum == WATERBUBBLE)
break; break;
if (sectlotag > 0) if (sectlotag > 0)
{ {
k = fi.spawn(j, WATERSPLASH2); k = fi.spawn(j, WATERSPLASH2);
if (sectlotag == 1 && sprj->statnum == 4) if (sectlotag == 1 && spr2->statnum == 4)
{ {
sprite[k].xvel = sprj->xvel >> 1; sprite[k].xvel = spr2->xvel >> 1;
sprite[k].ang = sprj->ang; sprite[k].ang = spr2->ang;
ssp(k, CLIPMASK0); ssp(k, CLIPMASK0);
} }
} }
@ -1860,14 +1860,14 @@ void movetransports_r(void)
{ {
if (checkcursectnums(sect) == -1 && checkcursectnums(spriowner->sectnum) == -1) if (checkcursectnums(sect) == -1 && checkcursectnums(spriowner->sectnum) == -1)
{ {
sprj->x += (spriowner->x - spri->x); spr2->x += (spriowner->x - spri->x);
sprj->y += (spriowner->y - spri->y); spr2->y += (spriowner->y - spri->y);
sprj->z -= spri->z - sector[spriowner->sectnum].floorz; spr2->z -= spri->z - sector[spriowner->sectnum].floorz;
sprj->ang = spriowner->ang; spr2->ang = spriowner->ang;
hitj->bposx = sprj->x; act2->bposx = spr2->x;
hitj->bposy = sprj->y; act2->bposy = spr2->y;
hitj->bposz = sprj->z; act2->bposz = spr2->z;
k = fi.spawn(i, TRANSPORTERBEAM); k = fi.spawn(i, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, k); S_PlayActorSound(TELEPORTER, k);
@ -1877,7 +1877,7 @@ void movetransports_r(void)
if (spriowner->owner != OW) if (spriowner->owner != OW)
{ {
hiti->temp_data[0] = 13; act->temp_data[0] = 13;
hittype[OW].temp_data[0] = 13; hittype[OW].temp_data[0] = 13;
} }
@ -1886,37 +1886,37 @@ void movetransports_r(void)
} }
else else
{ {
sprj->x += (spriowner->x - spri->x); spr2->x += (spriowner->x - spri->x);
sprj->y += (spriowner->y - spri->y); spr2->y += (spriowner->y - spri->y);
sprj->z = spriowner->z + 4096; spr2->z = spriowner->z + 4096;
hitj->bposx = sprj->x; act2->bposx = spr2->x;
hitj->bposy = sprj->y; act2->bposy = spr2->y;
hitj->bposz = sprj->z; act2->bposz = spr2->z;
changespritesect(j, spriowner->sectnum); changespritesect(j, spriowner->sectnum);
} }
break; break;
case ST_1_ABOVE_WATER: case ST_1_ABOVE_WATER:
sprj->x += (spriowner->x - spri->x); spr2->x += (spriowner->x - spri->x);
sprj->y += (spriowner->y - spri->y); spr2->y += (spriowner->y - spri->y);
sprj->z = sector[spriowner->sectnum].ceilingz + ll; spr2->z = sector[spriowner->sectnum].ceilingz + ll;
hitj->bposx = sprj->x; act2->bposx = spr2->x;
hitj->bposy = sprj->y; act2->bposy = spr2->y;
hitj->bposz = sprj->z; act2->bposz = spr2->z;
changespritesect(j, spriowner->sectnum); changespritesect(j, spriowner->sectnum);
break; break;
case ST_2_UNDERWATER: case ST_2_UNDERWATER:
sprj->x += (spriowner->x - spri->x); spr2->x += (spriowner->x - spri->x);
sprj->y += (spriowner->y - spri->y); spr2->y += (spriowner->y - spri->y);
sprj->z = sector[spriowner->sectnum].floorz - ll; spr2->z = sector[spriowner->sectnum].floorz - ll;
hitj->bposx = sprj->x; act2->bposx = spr2->x;
hitj->bposy = sprj->y; act2->bposy = spr2->y;
hitj->bposz = sprj->z; act2->bposz = spr2->z;
changespritesect(j, spriowner->sectnum); changespritesect(j, spriowner->sectnum);
@ -1924,34 +1924,34 @@ void movetransports_r(void)
case 160: case 160:
if (!isRRRA()) break; if (!isRRRA()) break;
sprj->x += (spriowner->x - spri->x); spr2->x += (spriowner->x - spri->x);
sprj->y += (spriowner->y - spri->y); spr2->y += (spriowner->y - spri->y);
sprj->z = sector[spriowner->sectnum].ceilingz + ll2; spr2->z = sector[spriowner->sectnum].ceilingz + ll2;
hitj->bposx = sprj->x; act2->bposx = spr2->x;
hitj->bposy = sprj->y; act2->bposy = spr2->y;
hitj->bposz = sprj->z; act2->bposz = spr2->z;
changespritesect(j, spriowner->sectnum); changespritesect(j, spriowner->sectnum);
fi.movesprite(j, (sprj->xvel * sintable[(sprj->ang + 512) & 2047]) >> 14, fi.movesprite(j, (spr2->xvel * sintable[(spr2->ang + 512) & 2047]) >> 14,
(sprj->xvel * sintable[sprj->ang & 2047]) >> 14, 0, CLIPMASK1); (spr2->xvel * sintable[spr2->ang & 2047]) >> 14, 0, CLIPMASK1);
break; break;
case 161: case 161:
if (!isRRRA()) break; if (!isRRRA()) break;
sprj->x += (spriowner->x - spri->x); spr2->x += (spriowner->x - spri->x);
sprj->y += (spriowner->y - spri->y); spr2->y += (spriowner->y - spri->y);
sprj->z = sector[spriowner->sectnum].floorz - ll2; spr2->z = sector[spriowner->sectnum].floorz - ll2;
hitj->bposx = sprj->x; act2->bposx = spr2->x;
hitj->bposy = sprj->y; act2->bposy = spr2->y;
hitj->bposz = sprj->z; act2->bposz = spr2->z;
changespritesect(j, spriowner->sectnum); changespritesect(j, spriowner->sectnum);
fi.movesprite(j, (sprj->xvel * sintable[(sprj->ang + 512) & 2047]) >> 14, fi.movesprite(j, (spr2->xvel * sintable[(spr2->ang + 512) & 2047]) >> 14,
(sprj->xvel * sintable[sprj->ang & 2047]) >> 14, 0, CLIPMASK1); (spr2->xvel * sintable[spr2->ang & 2047]) >> 14, 0, CLIPMASK1);
break; break;
} }