zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-29 02:10:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- respawnmarker, rat and queball.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-21 22:34:45 +02:00
parent 6257ebc30c
commit 3d16d9f44a
4 changed files with 46 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
source/games/duke/src/actors.cpp
View file

@ -1439,19 +1439,19 @@ void rpgexplode(DDukeActor *actor, int hit, const vec3_t &pos, int EXPLOSION2, i
//
//---------------------------------------------------------------------------
bool respawnmarker(int i, int yellow, int green)
bool respawnmarker(DDukeActor *actor, int yellow, int green)
{
hittype[i].temp_data[0]++;
if (hittype[i].temp_data[0] > respawnitemtime)
actor->temp_data[0]++;
if (actor->temp_data[0] > respawnitemtime)
{
deletesprite(i);
deletesprite(actor);
return false;
}
if (hittype[i].temp_data[0] >= (respawnitemtime >> 1) && hittype[i].temp_data[0] < ((respawnitemtime >> 1) + (respawnitemtime >> 2)))
sprite[i].picnum = yellow;
else if (hittype[i].temp_data[0] > ((respawnitemtime >> 1) + (respawnitemtime >> 2)))
sprite[i].picnum = green;
makeitfall(i);
if (actor->temp_data[0] >= (respawnitemtime >> 1) && actor->temp_data[0] < ((respawnitemtime >> 1) + (respawnitemtime >> 2)))
actor->s.picnum = yellow;
else if (actor->temp_data[0] > ((respawnitemtime >> 1) + (respawnitemtime >> 2)))
actor->s.picnum = green;
makeitfall(actor);
return true;
}
@ -1461,21 +1461,21 @@ bool respawnmarker(int i, int yellow, int green)
//
//---------------------------------------------------------------------------
bool rat(int i, bool makesound)
bool rat(DDukeActor* actor, bool makesound)
{
spritetype* s = &sprite[i];
makeitfall(i);
if (ssp(i, CLIPMASK0))
auto s = &actor->s;
makeitfall(actor);
if (ssp(actor, CLIPMASK0))
{
if (makesound && (krand() & 255) == 0) S_PlayActorSound(RATTY, i);
s->ang += (krand() & 31) - 15 + (sintable[(hittype[i].temp_data[0] << 8) & 2047] >> 11);
if (makesound && (krand() & 255) == 0) S_PlayActorSound(RATTY, actor);
s->ang += (krand() & 31) - 15 + (sintable[(actor->temp_data[0] << 8) & 2047] >> 11);
}
else
{
hittype[i].temp_data[0]++;
if (hittype[i].temp_data[0] > 1)
actor->temp_data[0]++;
if (actor->temp_data[0] > 1)
{
deletesprite(i);
deletesprite(actor);
return false;
}
else s->ang = (krand() & 2047);
@ -1492,41 +1492,40 @@ bool rat(int i, bool makesound)
//
//---------------------------------------------------------------------------
bool queball(int i, int pocket, int queball, int stripeball)
bool queball(DDukeActor *actor, int pocket, int queball, int stripeball)
{
spritetype* s = &sprite[i];
auto s = &actor->s;
if (s->xvel)
{
StatIterator it(STAT_DEFAULT);
int j;
while ((j = it.NextIndex()) >= 0)
DukeStatIterator it(STAT_DEFAULT);
while (auto aa = it.Next())
{
if (sprite[j].picnum == pocket && ldist(&sprite[j], s) < 52)
if (aa->s.picnum == pocket && ldist(aa, actor) < 52)
{
deletesprite(i);
deletesprite(actor);
return false;
}
}
j = clipmove(&s->x, &s->y, &s->z, &s->sectnum,
int j = clipmove(&s->x, &s->y, &s->z, &s->sectnum,
(((s->xvel * (sintable[(s->ang + 512) & 2047])) >> 14) * TICSPERFRAME) << 11,
(((s->xvel * (sintable[s->ang & 2047])) >> 14) * TICSPERFRAME) << 11,
24L, (4 << 8), (4 << 8), CLIPMASK1);
if (j & 49152)
if (j & kHitTypeMask)
{
if ((j & 49152) == 32768)
if ((j & kHitTypeMask) == kHitWall)
{
j &= (MAXWALLS - 1);
j &= kHitIndexMask;
int k = getangle(
wall[wall[j].point2].x - wall[j].x,
wall[wall[j].point2].y - wall[j].y);
s->ang = ((k << 1) - s->ang) & 2047;
}
else if ((j & 49152) == 49152)
else if ((j & kHitTypeMask) == kHitSprite)
{
j &= (MAXSPRITES - 1);
fi.checkhitsprite(i, j);
j &= kHitIndexMask;
fi.checkhitsprite(actor->GetIndex(), j);
}
}
s->xvel--;
@ -1541,22 +1540,21 @@ bool queball(int i, int pocket, int queball, int stripeball)
else
{
int x;
int p = findplayer(s, &x);
int p = findplayer(&actor->s, &x);
if (x < 1596)
{
// if(s->pal == 12)
{
int j = getincangle(ps[p].angle.ang.asbuild(), getangle(s->x - ps[p].posx, s->y - ps[p].posy));
if (j > -64 && j < 64 && PlayerInput(p, SB_OPEN))
if (ps[p].toggle_key_flag == 1)
{
StatIterator it(STAT_ACTOR);
int a;
while ((a = it.NextIndex()) >= 0)
DukeStatIterator it(STAT_ACTOR);
DDukeActor *act2;
while ((act2 = it.Next()))
{
auto sa = &sprite[a];
auto sa = &act2->s;
if (sa->picnum == queball || sa->picnum == stripeball)
{
j = getincangle(ps[p].angle.ang.asbuild(), getangle(sa->x - ps[p].posx, sa->y - ps[p].posy));
@ -1568,7 +1566,7 @@ bool queball(int i, int pocket, int queball, int stripeball)
}
}
}
if (a == -1)
if (act2 == nullptr)
{
if (s->pal == 12)
s->xvel = 164;

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

@ -3207,7 +3207,7 @@ void moveactors_d(void)
case RESPAWNMARKERRED:
case RESPAWNMARKERYELLOW:
case RESPAWNMARKERGREEN:
if (!respawnmarker(i, RESPAWNMARKERYELLOW, RESPAWNMARKERGREEN)) continue;
if (!respawnmarker(&hittype[i], RESPAWNMARKERYELLOW, RESPAWNMARKERGREEN)) continue;
break;
case HELECOPT:
@ -3232,11 +3232,11 @@ void moveactors_d(void)
ssp(i, CLIPMASK0);
break;
case RAT:
if (!rat(i, true)) continue;
if (!rat(&hittype[i], true)) continue;
break;
case QUEBALL:
case STRIPEBALL:
if (!queball(i, POCKET, QUEBALL, STRIPEBALL)) continue;
if (!queball(&hittype[i], POCKET, QUEBALL, STRIPEBALL)) continue;
break;
case FORCESPHERE:
forcesphere(i, FORCESPHERE);

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

@ -2968,10 +2968,10 @@ void moveactors_r(void)
case RESPAWNMARKERRED:
case RESPAWNMARKERYELLOW:
case RESPAWNMARKERGREEN:
if (!respawnmarker(i, RESPAWNMARKERYELLOW, RESPAWNMARKERGREEN)) continue;
if (!respawnmarker(&hittype[i], RESPAWNMARKERYELLOW, RESPAWNMARKERGREEN)) continue;
break;
case RAT:
if (!rat(i, !isRRRA())) continue;
if (!rat(&hittype[i], !isRRRA())) continue;
break;
case RRTILE3190:
case RRTILE3191:
@ -3099,7 +3099,7 @@ void moveactors_r(void)
case QUEBALL:
case STRIPEBALL:
if (!queball(i, POCKET, QUEBALL, STRIPEBALL)) continue;
if (!queball(&hittype[i], POCKET, QUEBALL, STRIPEBALL)) continue;
break;
case FORCESPHERE:
forcesphere(i, FORCESPHERE);

6
source/games/duke/src/funct.h
View file

@ -45,9 +45,9 @@ void movetongue(DDukeActor* i, int tongue, int jaw);
void rpgexplode(DDukeActor* i, int j, const vec3_t& pos, int EXPLOSION2, int EXPLOSIONBOT2, int newextra, int playsound);
void moveooz(DDukeActor* i, int seenine, int seeninedead, int ooz, int explosion);
void lotsofstuff(DDukeActor* s, int n, int spawntype);
bool respawnmarker(int i, int yellow, int green);
bool rat(int i, bool makesound);
bool queball(int i, int pocket, int queball, int stripeball);
bool respawnmarker(DDukeActor* i, int yellow, int green);
bool rat(DDukeActor* i, bool makesound);
bool queball(DDukeActor* i, int pocket, int queball, int stripeball);
void forcesphere(int i, int forcesphere);
void recon(int i, int explosion, int firelaser, int attacksnd, int painsnd, int roamsnd, int shift, int (*getspawn)(int i));
void ooz(int i);