zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-28 22:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- jibs, bloodpool, shell, glasspieces and scrap.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-21 23:18:24 +02:00
parent 6cbe74e115
commit e9d6fb2bb5
4 changed files with 63 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2230,11 +2230,11 @@ bool money(DDukeActor* actor, int BLOODPOOL)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
bool jibs(int i, int JIBS6, bool timeout, bool callsetsprite, bool floorcheck, bool zcheck1, bool zcheck2) bool jibs(DDukeActor *actor, int JIBS6, bool timeout, bool callsetsprite, bool floorcheck, bool zcheck1, bool zcheck2)
{ {
spritetype* s = &sprite[i]; spritetype* s = &actor->s;
int sect = s->sectnum; int sect = s->sectnum;
auto t = &hittype[i].temp_data[0]; int* t = &actor->temp_data[0];
if (s->xvel > 0) s->xvel--; if (s->xvel > 0) s->xvel--;
else s->xvel = 0; else s->xvel = 0;
@ -2245,24 +2245,24 @@ bool jibs(int i, int JIBS6, bool timeout, bool callsetsprite, bool floorcheck, b
t[5]++; t[5]++;
else else
{ {
deletesprite(i); deletesprite(actor);
return false; return false;
} }
} }
if (s->zvel > 1024 && s->zvel < 1280) if (s->zvel > 1024 && s->zvel < 1280)
{ {
setsprite(i, s->x, s->y, s->z); setsprite(actor, s->pos);
sect = s->sectnum; sect = s->sectnum;
} }
if (callsetsprite) setsprite(i, s->x, s->y, s->z); if (callsetsprite) setsprite(actor, s->pos);
int l = getflorzofslope(sect, s->x, s->y); int l = getflorzofslope(sect, s->x, s->y);
int x = getceilzofslope(sect, s->x, s->y); int x = getceilzofslope(sect, s->x, s->y);
if (x == l || sect < 0 || sect >= MAXSECTORS) if (x == l || sect < 0 || sect >= MAXSECTORS)
{ {
deletesprite(i); deletesprite(actor);
return false; return false;
} }
@ -2302,7 +2302,7 @@ bool jibs(int i, int JIBS6, bool timeout, bool callsetsprite, bool floorcheck, b
if (floorcheck && s->z >= sector[s->sectnum].floorz) if (floorcheck && s->z >= sector[s->sectnum].floorz)
{ {
deletesprite(i); deletesprite(actor);
return false; return false;
} }
} }
@ -2310,19 +2310,19 @@ bool jibs(int i, int JIBS6, bool timeout, bool callsetsprite, bool floorcheck, b
{ {
if (zcheck2) if (zcheck2)
{ {
deletesprite(i); deletesprite(actor);
return false; return false;
} }
if (t[2] == 0) if (t[2] == 0)
{ {
if (s->sectnum == -1) if (s->sectnum == -1)
{ {
deletesprite(i); deletesprite(actor);
return false; return false;
} }
if ((sector[s->sectnum].floorstat & 2)) if ((sector[s->sectnum].floorstat & 2))
{ {
deletesprite(i); deletesprite(actor);
return false; return false;
} }
t[2]++; t[2]++;
@ -2339,7 +2339,7 @@ bool jibs(int i, int JIBS6, bool timeout, bool callsetsprite, bool floorcheck, b
t[0]++; t[0]++;
if (t[1] > 20) if (t[1] > 20)
{ {
deletesprite(i); deletesprite(actor);
return false; return false;
} }
} }
@ -2354,34 +2354,34 @@ bool jibs(int i, int JIBS6, bool timeout, bool callsetsprite, bool floorcheck, b
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
bool bloodpool(int i, bool puke, int TIRE) bool bloodpool(DDukeActor* actor, bool puke, int TIRE)
{ {
spritetype* s = &sprite[i]; spritetype* s = &actor->s;
int sect = s->sectnum; int sect = s->sectnum;
auto t = &hittype[i].temp_data[0]; int* t = &actor->temp_data[0];
if (t[0] == 0) if (t[0] == 0)
{ {
t[0] = 1; t[0] = 1;
if (sector[sect].floorstat & 2) if (sector[sect].floorstat & 2)
{ {
deletesprite(i); deletesprite(actor);
return false; return false;
} }
else insertspriteq(&hittype[i]); else insertspriteq(actor);
} }
makeitfall(i); makeitfall(actor);
int x; int x;
int p = findplayer(s, &x); int p = findplayer(&actor->s, &x);
s->z = hittype[i].floorz - (FOURSLEIGHT); s->z = actor->floorz - (FOURSLEIGHT);
if (t[2] < 32) if (t[2] < 32)
{ {
t[2]++; t[2]++;
if (hittype[i].picnum == TIRE) if (actor->picnum == TIRE)
{ {
if (s->xrepeat < 64 && s->yrepeat < 64) if (s->xrepeat < 64 && s->yrepeat < 64)
{ {
@ -2408,8 +2408,8 @@ bool bloodpool(int i, bool puke, int TIRE)
else else
{ {
if (!S_CheckSoundPlaying(DUKE_LONGTERM_PAIN)) if (!S_CheckSoundPlaying(DUKE_LONGTERM_PAIN))
S_PlayActorSound(DUKE_LONGTERM_PAIN, ps[p].i); S_PlayActorSound(DUKE_LONGTERM_PAIN, ps[p].GetActor());
sprite[ps[p].i].extra--; ps[p].GetActor()->s.extra--;
SetPlayerPal(&ps[p], PalEntry(32, 16, 0, 0)); SetPlayerPal(&ps[p], PalEntry(32, 16, 0, 0));
} }
} }
@ -2417,7 +2417,7 @@ bool bloodpool(int i, bool puke, int TIRE)
if (t[1] == 1) return false; if (t[1] == 1) return false;
t[1] = 1; t[1] = 1;
if (hittype[i].picnum == TIRE) if (actor->picnum == TIRE)
ps[p].footprintcount = 10; ps[p].footprintcount = 10;
else ps[p].footprintcount = 3; else ps[p].footprintcount = 3;
@ -2440,17 +2440,17 @@ bool bloodpool(int i, bool puke, int TIRE)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void shell(int i, bool morecheck) void shell(DDukeActor* actor, bool morecheck)
{ {
spritetype* s = &sprite[i]; spritetype* s = &actor->s;
int sect = s->sectnum; int sect = s->sectnum;
auto t = &hittype[i].temp_data[0]; int* t = &actor->temp_data[0];
ssp(i, CLIPMASK0); ssp(actor, CLIPMASK0);
if (sect < 0 || morecheck) if (sect < 0 || morecheck)
{ {
deletesprite(i); deletesprite(actor);
return; return;
} }
@ -2483,7 +2483,7 @@ void shell(int i, bool morecheck)
s->xvel--; s->xvel--;
else else
{ {
deletesprite(i); deletesprite(actor);
} }
} }
} }
@ -2494,22 +2494,22 @@ void shell(int i, bool morecheck)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void glasspieces(int i) void glasspieces(DDukeActor* actor)
{ {
spritetype* s = &sprite[i]; spritetype* s = &actor->s;
int sect = s->sectnum; int sect = s->sectnum;
auto t = &hittype[i].temp_data[0]; int* t = &actor->temp_data[0];
makeitfall(i); makeitfall(actor);
if (s->zvel > 4096) s->zvel = 4096; if (s->zvel > 4096) s->zvel = 4096;
if (sect < 0) if (sect < 0)
{ {
deletesprite(i); deletesprite(actor);
return; return;
} }
if (s->z == hittype[i].floorz - (FOURSLEIGHT) && t[0] < 3) if (s->z == actor->floorz - (FOURSLEIGHT) && t[0] < 3)
{ {
s->zvel = -((3 - t[0]) << 8) - (krand() & 511); s->zvel = -((3 - t[0]) << 8) - (krand() & 511);
if (sector[sect].lotag == 2) if (sector[sect].lotag == 2)
@ -2517,12 +2517,12 @@ void glasspieces(int i)
s->xrepeat >>= 1; s->xrepeat >>= 1;
s->yrepeat >>= 1; s->yrepeat >>= 1;
if (rnd(96)) if (rnd(96))
setsprite(i, s->x, s->y, s->z); setsprite(actor, s->pos);
t[0]++;//Number of bounces t[0]++;//Number of bounces
} }
else if (t[0] == 3) else if (t[0] == 3)
{ {
deletesprite(i); deletesprite(actor);
return; return;
} }
@ -2533,7 +2533,7 @@ void glasspieces(int i)
} }
else s->xvel = 0; else s->xvel = 0;
ssp(i, CLIPMASK0); ssp(actor, CLIPMASK0);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -2542,11 +2542,11 @@ void glasspieces(int i)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void scrap(int i, int SCRAP1, int SCRAP6) void scrap(DDukeActor* actor, int SCRAP1, int SCRAP6)
{ {
spritetype* s = &sprite[i]; spritetype* s = &actor->s;
int sect = s->sectnum; int sect = s->sectnum;
auto t = &hittype[i].temp_data[0]; int* t = &actor->temp_data[0];
if (s->xvel > 0) if (s->xvel > 0)
s->xvel--; s->xvel--;
@ -2554,7 +2554,7 @@ void scrap(int i, int SCRAP1, int SCRAP6)
if (s->zvel > 1024 && s->zvel < 1280) if (s->zvel > 1024 && s->zvel < 1280)
{ {
setsprite(i, s->x, s->y, s->z); setsprite(actor, s->pos);
sect = s->sectnum; sect = s->sectnum;
} }
@ -2587,12 +2587,12 @@ void scrap(int i, int SCRAP1, int SCRAP6)
{ {
if (s->picnum == SCRAP1 && s->yvel > 0) if (s->picnum == SCRAP1 && s->yvel > 0)
{ {
int j = fi.spawn(i, s->yvel); auto spawned = spawn(actor, s->yvel);
setsprite(j, s->x, s->y, s->z); setsprite(spawned, s->pos);
getglobalz(j); getglobalz(spawned);
sprite[j].hitag = sprite[j].lotag = 0; spawned->s.hitag = spawned->s.lotag = 0;
} }
deletesprite(i); deletesprite(actor);
} }
} }

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

@ -3486,12 +3486,12 @@ void moveexplosions_d(void) // STATNUM 5
case DUKETORSO: case DUKETORSO:
case DUKEGUN: case DUKEGUN:
case DUKELEG: case DUKELEG:
jibs(i, JIBS6, true, false, false, s->picnum == DUKELEG || s->picnum == DUKETORSO || s->picnum == DUKEGUN, false); jibs(&hittype[i], JIBS6, true, false, false, s->picnum == DUKELEG || s->picnum == DUKETORSO || s->picnum == DUKEGUN, false);
continue; continue;
case BLOODPOOL: case BLOODPOOL:
case PUKE: case PUKE:
bloodpool(i, s->picnum == PUKE, TIRE); bloodpool(&hittype[i], s->picnum == PUKE, TIRE);
continue; continue;
@ -3523,19 +3523,19 @@ void moveexplosions_d(void) // STATNUM 5
case SHELL: case SHELL:
case SHOTGUNSHELL: case SHOTGUNSHELL:
shell(i, (sector[sect].floorz + (24 << 8)) < s->z); shell(&hittype[i], (sector[sect].floorz + (24 << 8)) < s->z);
continue; continue;
case GLASSPIECES: case GLASSPIECES:
case GLASSPIECES + 1: case GLASSPIECES + 1:
case GLASSPIECES + 2: case GLASSPIECES + 2:
glasspieces(i); glasspieces(&hittype[i]);
continue; continue;
} }
if (s->picnum >= SCRAP6 && s->picnum <= SCRAP5 + 3) if (s->picnum >= SCRAP6 && s->picnum <= SCRAP5 + 3)
{ {
scrap(i, SCRAP1, SCRAP6); scrap(&hittype[i], SCRAP1, SCRAP6);
} }
} }
} }

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

@ -3388,7 +3388,7 @@ void moveexplosions_r(void) // STATNUM 5
case DUKETORSO: case DUKETORSO:
case DUKEGUN: case DUKEGUN:
case DUKELEG: case DUKELEG:
if (!jibs(i, JIBS6, false, true, true, s->picnum == DUKELEG || s->picnum == DUKETORSO || s->picnum == DUKEGUN, if (!jibs(&hittype[i], JIBS6, false, true, true, s->picnum == DUKELEG || s->picnum == DUKETORSO || s->picnum == DUKEGUN,
isRRRA() && (s->picnum == RRTILE2465 || s->picnum == RRTILE2560))) continue; isRRRA() && (s->picnum == RRTILE2465 || s->picnum == RRTILE2560))) continue;
if (sector[s->sectnum].lotag == 800) if (sector[s->sectnum].lotag == 800)
@ -3401,7 +3401,7 @@ void moveexplosions_r(void) // STATNUM 5
continue; continue;
case BLOODPOOL: case BLOODPOOL:
if (!bloodpool(i, false, TIRE)) continue; if (!bloodpool(&hittype[i], false, TIRE)) continue;
if (sector[s->sectnum].lotag == 800) if (sector[s->sectnum].lotag == 800)
if (s->z >= sector[s->sectnum].floorz - (8 << 8)) if (s->z >= sector[s->sectnum].floorz - (8 << 8))
@ -3425,20 +3425,20 @@ void moveexplosions_r(void) // STATNUM 5
case SHELL: case SHELL:
case SHOTGUNSHELL: case SHOTGUNSHELL:
shell(i, false); shell(&hittype[i], false);
continue; continue;
case GLASSPIECES: case GLASSPIECES:
case GLASSPIECES + 1: case GLASSPIECES + 1:
case GLASSPIECES + 2: case GLASSPIECES + 2:
case POPCORN: case POPCORN:
glasspieces(i); glasspieces(&hittype[i]);
continue; continue;
} }
if (s->picnum >= SCRAP6 && s->picnum <= SCRAP5 + 3) if (s->picnum >= SCRAP6 && s->picnum <= SCRAP5 + 3)
{ {
scrap(i, SCRAP1, SCRAP6); scrap(&hittype[i], SCRAP1, SCRAP6);
} }
} }
} }

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

@ -57,11 +57,11 @@ void forcesphereexplode(DDukeActor* i);
void watersplash2(DDukeActor* i); void watersplash2(DDukeActor* i);
void frameeffect1(DDukeActor* i); void frameeffect1(DDukeActor* i);
bool money(DDukeActor* i, int BLOODPOOL); bool money(DDukeActor* i, int BLOODPOOL);
bool jibs(int i, int JIBS6, bool timeout, bool callsetsprite, bool floorcheck, bool zcheck1, bool zcheck2); bool jibs(DDukeActor* i, int JIBS6, bool timeout, bool callsetsprite, bool floorcheck, bool zcheck1, bool zcheck2);
bool bloodpool(int i, bool puke, int TIRE); bool bloodpool(DDukeActor* i, bool puke, int TIRE);
void shell(int i, bool morecheck); void shell(DDukeActor* i, bool morecheck);
void glasspieces(int i); void glasspieces(DDukeActor* i);
void scrap(int i, int SCRAP1, int SCRAP6); void scrap(DDukeActor* i, int SCRAP1, int SCRAP6);
void handle_se00(int i, int LASERLINE); void handle_se00(int i, int LASERLINE);
void handle_se01(int i); void handle_se01(int i);