zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-05 07:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke/RR: guard all calls to EGS with a null pointer check.

Browse source 
Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here.
With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
This commit is contained in:
Christoph Oelckers 2021-11-19 09:47:17 +01:00
parent fcbb7320a8
commit 4c7662b4ea
10 changed files with 164 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -269,7 +269,7 @@ void lotsofstuff(DDukeActor* actor, int n, int spawntype)
{
int r1 = krand(), r2 = krand(); // using the RANDCORRECT version from RR.
auto j = EGS(s->sector(), s->x, s->y, s->z - (r2 % (47 << 8)), spawntype, -32, 8, 8, r1 & 2047, 0, 0, actor, 5);
j->s->cstat = krand() & 12;
if (j) j->s->cstat = krand() & 12;
}
}

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

@ -670,13 +670,16 @@ void guts_d(DDukeActor* actor, int gtype, int n, int p)
int r5 = krand();
// TRANSITIONAL: owned by a player???
auto spawned = EGS(s->sector(), s->x + (r5 & 255) - 128, s->y + (r4 & 255) - 128, gutz - (r3 & 8191), gtype, -32, sx, sy, a, 48 + (r2 & 31), -512 - (r1 & 2047), ps[p].GetActor(), 5);
if (spawned->s->picnum == JIBS2)
if (spawned)
{
spawned->s->xrepeat >>= 2;
spawned->s->yrepeat >>= 2;
if (spawned->s->picnum == JIBS2)
{
spawned->s->xrepeat >>= 2;
spawned->s->yrepeat >>= 2;
}
if (pal != 0)
spawned->s->pal = pal;
}
if (pal != 0)
spawned->s->pal = pal;
}
}
@ -1230,7 +1233,7 @@ static void movefireext(DDukeActor* actor)
for (int k = 0; k < 16; k++)
{
auto spawned = EGS(actor->s->sector(), actor->s->x, actor->s->y, actor->s->z - (krand() % (48 << 8)), SCRAP3 + (krand() & 3), -8, 48, 48, krand() & 2047, (krand() & 63) + 64, -(krand() & 4095) - (actor->s->zvel >> 2), actor, 5);
spawned->s->pal = 2;
if(spawned) spawned->s->pal = 2;
}
spawn(actor, EXPLOSION2);
@ -1809,9 +1812,11 @@ static void weaponcommon_d(DDukeActor* proj)
s->y + MulScale(k, bsin(s->ang), 9),
s->z + ((k * Sgn(s->zvel)) * abs(s->zvel / 24)), FIRELASER, -40 + (k << 2),
s->xrepeat, s->yrepeat, 0, 0, 0, proj->GetOwner(), 5);
spawned->s->cstat = 128;
spawned->s->pal = s->pal;
if (spawned)
{
spawned->s->cstat = 128;
spawned->s->pal = s->pal;
}
}
}
else if (s->picnum == SPIT) if (s->zvel < 6144)

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

@ -496,7 +496,7 @@ void guts_r(DDukeActor* actor, int gtype, int n, int p)
int r5 = krand();
// TRANSITIONAL: owned by a player???
auto spawned = EGS(s->sector(), s->x + (r5 & 255) - 128, s->y + (r4 & 255) - 128, gutz - (r3 & 8191), gtype, -32, sx >> 1, sy >> 1, a, 48 + (r2 & 31), -512 - (r1 & 2047), ps[p].GetActor(), 5);
if (pal != 0)
if (spawned && pal != 0)
spawned->s->pal = pal;
}
}
@ -1432,8 +1432,11 @@ static void weaponcommon_r(DDukeActor *proj)
s->z + ((k * Sgn(s->zvel)) * abs(s->zvel / 24)), FIRELASER, -40 + (k << 2),
s->xrepeat, s->yrepeat, 0, 0, 0, proj->GetOwner(), 5);
x->s->cstat = 128;
x->s->pal = s->pal;
if (x)
{
x->s->cstat = 128;
x->s->pal = s->pal;
}
}
}
else if (s->picnum == SPIT) if (s->zvel < 6144)
@ -3360,10 +3363,13 @@ void handle_se06_r(DDukeActor *actor)
if (!hulkspawn)
{
ns = EGS(s->sector(), s->x, s->y, s->sector()->ceilingz + 119428, 3677, -8, 16, 16, 0, 0, 0, actor, 5);
ns->s->cstat = 514;
ns->s->pal = 7;
ns->s->xrepeat = 80;
ns->s->yrepeat = 255;
if (ns)
{
ns->s->cstat = 514;
ns->s->pal = 7;
ns->s->xrepeat = 80;
ns->s->yrepeat = 255;
}
ns = spawn(actor, 296);
ns->s->cstat = 0;
ns->s->cstat |= 32768;

11
source/games/duke/src/gameexec.cpp
View file

@ -2162,10 +2162,13 @@ int ParseState::parse(void)
g_sp->x + (krand() & 255) - 128, g_sp->y + (krand() & 255) - 128, g_sp->z - (8 << 8) - (krand() & 8191),
dnum + s, g_sp->shade, 32 + (krand() & 15), 32 + (krand() & 15),
krand() & 2047, (krand() & 127) + 32, -(krand() & 2047), g_ac, 5);
if(weap)
l->s->yvel = gs.weaponsandammosprites[j%14];
else l->s->yvel = -1;
l->s->pal = g_sp->pal;
if (l)
{
if (weap)
l->s->yvel = gs.weaponsandammosprites[j % 14];
else l->s->yvel = -1;
l->s->pal = g_sp->pal;
}
}
insptr++;
}

74
source/games/duke/src/player_d.cpp
View file

@ -127,16 +127,19 @@ static void shootfireball(DDukeActor *actor, int p, int sx, int sy, int sz, int
}
auto spawned = EGS(s->sector(), sx, sy, sz, FIREBALL, -127, sizx, sizy, sa, vel, zvel, actor, (short)4);
auto spr = spawned->s;
spr->extra += (krand() & 7);
if (s->picnum == BOSS5 || p >= 0)
if (spawned)
{
spr->xrepeat = 40;
spr->yrepeat = 40;
auto spr = spawned->s;
spr->extra += (krand() & 7);
if (s->picnum == BOSS5 || p >= 0)
{
spr->xrepeat = 40;
spr->yrepeat = 40;
}
spr->yvel = p;
spr->cstat = 128;
spr->clipdist = 4;
}
spr->yvel = p;
spr->cstat = 128;
spr->clipdist = 4;
}
//---------------------------------------------------------------------------
@ -264,17 +267,19 @@ static void shootknee(DDukeActor* actor, int p, int sx, int sy, int sz, int sa)
if (hitwallp || hitsprt)
{
auto knee = EGS(hitsectp, hitx, hity, hitz, KNEE, -15, 0, 0, sa, 32, 0, actor, 4);
knee->s->extra += (krand() & 7);
if (p >= 0)
if (knee)
{
auto k = spawn(knee, SMALLSMOKE);
k->s->z -= (8 << 8);
S_PlayActorSound(KICK_HIT, knee);
knee->s->extra += (krand() & 7);
if (p >= 0)
{
auto k = spawn(knee, SMALLSMOKE);
k->s->z -= (8 << 8);
S_PlayActorSound(KICK_HIT, knee);
}
if (p >= 0 && ps[p].steroids_amount > 0 && ps[p].steroids_amount < 400)
knee->s->extra += (gs.max_player_health >> 2);
}
if (p >= 0 && ps[p].steroids_amount > 0 && ps[p].steroids_amount < 400)
knee->s->extra += (gs.max_player_health >> 2);
if (hitsprt && hitsprt->s->picnum != ACCESSSWITCH && hitsprt->s->picnum != ACCESSSWITCH2)
{
fi.checkhitsprite(hitsprt, knee);
@ -422,6 +427,8 @@ static void shootweapon(DDukeActor *actor, int p, int sx, int sy, int sz, int sa
if (p >= 0)
{
spark = EGS(hitsectp, hitx, hity, hitz, SHOTSPARK1, -15, 10, 10, sa, 0, 0, actor, 4);
if (!spark) return;
spark->s->extra = ScriptCode[gs.actorinfo[atwith].scriptaddress];
spark->s->extra += (krand() % 6);
@ -536,17 +543,20 @@ static void shootweapon(DDukeActor *actor, int p, int sx, int sy, int sz, int sa
else
{
spark = EGS(hitsectp, hitx, hity, hitz, SHOTSPARK1, -15, 24, 24, sa, 0, 0, actor, 4);
spark->s->extra = ScriptCode[gs.actorinfo[atwith].scriptaddress];
if (hitact)
if (spark)
{
fi.checkhitsprite(hitact, spark);
if (hitact->s->picnum != TILE_APLAYER)
spawn(spark, SMALLSMOKE);
else spark->s->xrepeat = spark->s->yrepeat = 0;
spark->s->extra = ScriptCode[gs.actorinfo[atwith].scriptaddress];
if (hitact)
{
fi.checkhitsprite(hitact, spark);
if (hitact->s->picnum != TILE_APLAYER)
spawn(spark, SMALLSMOKE);
else spark->s->xrepeat = spark->s->yrepeat = 0;
}
else if (hitwallp)
fi.checkhitwall(spark, hitwallp, hitx, hity, hitz, SHOTSPARK1);
}
else if (hitwallp)
fi.checkhitwall(spark, hitwallp, hitx, hity, hitz, SHOTSPARK1);
}
if ((krand() & 255) < 4)
@ -642,6 +652,7 @@ static void shootstuff(DDukeActor* actor, int p, int sx, int sy, int sz, int sa,
while (scount > 0)
{
auto spawned = EGS(sect, sx, sy, sz, atwith, -127, sizx, sizy, sa, vel, zvel, actor, 4);
if (!spawned) return;
spawned->s->extra += (krand() & 7);
if (atwith == COOLEXPLOSION1)
@ -736,6 +747,8 @@ static void shootrpg(DDukeActor *actor, int p, int sx, int sy, int sz, int sa, i
sy + (bsin(sa + 348) / 448),
sz - (1 << 8), atwith, 0, 14, 14, sa, vel, zvel, actor, 4);
if (!spawned) return;
auto spj = spawned->s;
spj->extra += (krand() & 7);
if (atwith != FREEZEBLAST)
@ -878,6 +891,7 @@ static void shootlaser(DDukeActor* actor, int p, int sx, int sy, int sz, int sa)
if (j == 1)
{
auto bomb = EGS(hitsectp, hitx, hity, hitz, TRIPBOMB, -16, 4, 5, sa, 0, 0, actor, 6);
if (!bomb) return;
if (isWW2GI())
{
int lTripBombControl = GetGameVar("TRIPBOMB_CONTROL", TRIPBOMB_TRIPWIRE, nullptr, -1);
@ -979,6 +993,7 @@ static void shootgrowspark(DDukeActor* actor, int p, int sx, int sy, int sz, int
s->cstat |= 257;
auto spark = EGS(sect, hitx, hity, hitz, GROWSPARK, -16, 28, 28, sa, 0, 0, actor, 1);
if (!spark) return;
spark->s->pal = 2;
spark->s->cstat |= 130;
@ -1174,8 +1189,11 @@ void shoot_d(DDukeActor* actor, int atwith)
sy + bcos(sa, -12),
sz + (2 << 8), SHRINKSPARK, -16, 28, 28, sa, 768, zvel, actor, 4);
j->s->cstat = 128;
j->s->clipdist = 32;
if (j)
{
j->s->cstat = 128;
j->s->clipdist = 32;
}
return;

34
source/games/duke/src/player_r.cpp
View file

@ -149,11 +149,13 @@ static void shootmelee(DDukeActor *actor, int p, int sx, int sy, int sz, int sa,
if (isRRRA() && atwith == SLINGBLADE)
{
wpn = EGS(hitsectp, hitx, hity, hitz, SLINGBLADE, -15, 0, 0, sa, 32, 0, actor, 4);
if (!wpn) return;
wpn->s->extra += 50;
}
else
{
wpn = EGS(hitsectp, hitx, hity, hitz, KNEE, -15, 0, 0, sa, 32, 0, actor, 4);
if (!wpn) return;
wpn->s->extra += (krand() & 7);
}
if (p >= 0)
@ -312,6 +314,7 @@ static void shootweapon(DDukeActor* actor, int p, int sx, int sy, int sz, int sa
if (p >= 0)
{
spark = EGS(hitsectp, hitx, hity, hitz, SHOTSPARK1, -15, 10, 10, sa, 0, 0, actor, 4);
if (!spark) return;
spark->s->extra = ScriptCode[gs.actorinfo[atwith].scriptaddress];
spark->s->extra += (krand() % 6);
@ -432,6 +435,7 @@ static void shootweapon(DDukeActor* actor, int p, int sx, int sy, int sz, int sa
else
{
spark = EGS(hitsectp, hitx, hity, hitz, SHOTSPARK1, -15, 24, 24, sa, 0, 0, actor, 4);
if (!spark) return;
spark->s->extra = ScriptCode[gs.actorinfo[atwith].scriptaddress];
if (hitsprt)
@ -575,6 +579,7 @@ static void shootstuff(DDukeActor* actor, int p, int sx, int sy, int sz, int sa,
while (scount > 0)
{
auto j = EGS(sect, sx, sy, sz, atwith, -127, sizx, sizy, sa, vel, zvel, actor, 4);
if (!j) return;
j->s->extra += (krand() & 7);
j->s->cstat = 128;
j->s->clipdist = 4;
@ -675,6 +680,7 @@ static void shootrpg(DDukeActor* actor, int p, int sx, int sy, int sz, int sa, i
sy + (bsin(sa + 348) / 448),
sz - (1 << 8), atwith, 0, 14, 14, sa, vel, zvel, actor, 4);
if (!spawned) return;
if (isRRRA())
{
if (atwith == RRTILE1790)
@ -808,6 +814,7 @@ static void shootwhip(DDukeActor* actor, int p, int sx, int sy, int sz, int sa,
while (scount > 0)
{
auto j = EGS(sect, sx, sy, sz, atwith, -127, sizx, sizy, sa, vel, zvel, actor, 4);
if (!j) return;
j->s->extra += (krand() & 7);
j->s->cstat = 128;
j->s->clipdist = 4;
@ -2742,21 +2749,24 @@ static void operateweapon(int snum, ESyncBits actions, sectortype* psectp)
p->pos.z, HEAVYHBOMB, -16, 9, 9,
p->angle.ang.asbuild(), (k + (p->hbomb_hold_delay << 5)) * 2, i, pact, 1);
if (k == 15)
if (spawned)
{
spawned->s->yvel = 3;
spawned->s->z += (8 << 8);
}
if (k == 15)
{
spawned->s->yvel = 3;
spawned->s->z += (8 << 8);
}
k = hits(p->GetActor());
if (k < 512)
{
spawned->s->ang += 1024;
spawned->s->zvel /= 3;
spawned->s->xvel /= 3;
}
k = hits(p->GetActor());
if (k < 512)
{
spawned->s->ang += 1024;
spawned->s->zvel /= 3;
spawned->s->xvel /= 3;
}
p->hbomb_on = 1;
p->hbomb_on = 1;
}
}
else if (p->kickback_pic < 12 && (actions & SB_FIRE))
p->hbomb_hold_delay++;

43
source/games/duke/src/player_w.cpp
View file

@ -346,30 +346,33 @@ void operateweapon_ww(int snum, ESyncBits actions, int psect)
p->pos.z, HEAVYHBOMB, -16, 9, 9,
p->angle.ang.asbuild(), (k + (p->hbomb_hold_delay << 5)), i, p->GetActor(), 1);
if (j)
{
int lGrenadeLifetime = GetGameVar("GRENADE_LIFETIME", NAM_GRENADE_LIFETIME, nullptr, snum);
int lGrenadeLifetimeVar = GetGameVar("GRENADE_LIFETIME_VAR", NAM_GRENADE_LIFETIME_VAR, nullptr, snum);
// set timer. blows up when at zero....
j->s->extra = lGrenadeLifetime
+ MulScale(krand(), lGrenadeLifetimeVar, 14)
- lGrenadeLifetimeVar;
}
{
int lGrenadeLifetime = GetGameVar("GRENADE_LIFETIME", NAM_GRENADE_LIFETIME, nullptr, snum);
int lGrenadeLifetimeVar = GetGameVar("GRENADE_LIFETIME_VAR", NAM_GRENADE_LIFETIME_VAR, nullptr, snum);
// set timer. blows up when at zero....
j->s->extra = lGrenadeLifetime
+ MulScale(krand(), lGrenadeLifetimeVar, 14)
- lGrenadeLifetimeVar;
}
if (k == 15)
{
j->s->yvel = 3;
j->s->z += (8 << 8);
}
if (k == 15)
{
j->s->yvel = 3;
j->s->z += (8 << 8);
}
k = hits(p->GetActor());
if (k < 512)
{
j->s->ang += 1024;
j->s->zvel /= 3;
j->s->xvel /= 3;
}
k = hits(p->GetActor());
if (k < 512)
{
j->s->ang += 1024;
j->s->zvel /= 3;
j->s->xvel /= 3;
}
p->hbomb_on = 1;
p->hbomb_on = 1;
}
}
else if (p->kickback_pic < aplWeaponHoldDelay[p->curr_weapon][snum] &&

24
source/games/duke/src/sectors_d.cpp
View file

@ -686,13 +686,14 @@ void checkhitwall_d(DDukeActor* spr, walltype* wal, int x, int y, int z, int atw
spawned = EGS(sptr, x, y, z, FORCERIPPLE, -127, 16 + spr->s->xrepeat, 16 + spr->s->yrepeat, 0, 0, 0, spr, 5);
else spawned = EGS(sptr, x, y, z, FORCERIPPLE, -127, 32, 32, 0, 0, 0, spr, 5);
}
if (spawned)
{
spawned->s->cstat |= 18 + 128;
auto delta = wal->delta();
spawned->s->ang = getangle(-delta.x, -delta.y) - 512;
spawned->s->cstat |= 18 + 128;
auto delta = wal->delta();
spawned->s->ang = getangle(-delta.x, -delta.y) - 512;
S_PlayActorSound(SOMETHINGHITFORCE, spawned);
S_PlayActorSound(SOMETHINGHITFORCE, spawned);
}
return;
}
case FANSPRITE:
@ -720,10 +721,13 @@ void checkhitwall_d(DDukeActor* spr, walltype* wal, int x, int y, int z, int atw
wal->nextWall()->cstat = 0;
auto spawned = EGS(sptr, x, y, z, SECTOREFFECTOR, 0, 0, 0, ps[0].angle.ang.asbuild(), 0, 0, spr, 3);
spawned->s->lotag = 128;
spawned->temp_data[1] = 5;
spawned->temp_walls[0] = wal;
S_PlayActorSound(GLASS_BREAKING, spawned);
if (spawned)
{
spawned->s->lotag = 128;
spawned->temp_data[1] = 5;
spawned->temp_walls[0] = wal;
S_PlayActorSound(GLASS_BREAKING, spawned);
}
return;
}
case STAINGLASS1:

21
source/games/duke/src/sectors_r.cpp
View file

@ -1036,10 +1036,12 @@ void checkhitwall_r(DDukeActor* spr, walltype* wal, int x, int y, int z, int atw
wal->nextWall()->cstat = 0;
auto spawned = EGS(sptr, x, y, z, SECTOREFFECTOR, 0, 0, 0, ps[0].angle.ang.asbuild(), 0, 0, spr, 3);
spawned->s->lotag = SE_128_GLASS_BREAKING;
spawned->temp_data[1] = 2;
spawned->temp_walls[0] = wal;
S_PlayActorSound(GLASS_BREAKING, spawned);
if (spawned)
{
spawned->s->lotag = 128;
spawned->temp_walls[0] = wal;
S_PlayActorSound(GLASS_BREAKING, spawned);
}
return;
}
case GLASS:
@ -1055,10 +1057,13 @@ void checkhitwall_r(DDukeActor* spr, walltype* wal, int x, int y, int z, int atw
wal->nextWall()->cstat = 0;
auto spawned = EGS(sptr, x, y, z, SECTOREFFECTOR, 0, 0, 0, ps[0].angle.ang.asbuild(), 0, 0, spr, 3);
spawned->s->lotag = SE_128_GLASS_BREAKING;
spawned->temp_data[1] = 2;
spawned->temp_walls[0] = wal;
S_PlayActorSound(GLASS_BREAKING, spawned);
if (spawned)
{
spawned->s->lotag = 128;
spawned->temp_data[1] = 2;
spawned->temp_walls[0] = wal;
S_PlayActorSound(GLASS_BREAKING, spawned);
}
return;
}
case STAINGLASS1:

19
source/games/duke/src/spawn.cpp
View file

@ -51,6 +51,8 @@ BEGIN_DUKE_NS
DDukeActor* EGS(sectortype* whatsectp, int s_x, int s_y, int s_z, int s_pn, int8_t s_s, int8_t s_xr, int8_t s_yr, int s_a, int s_ve, int s_zv, DDukeActor* s_ow, int8_t s_ss)
{
// sector pointer must be strictly validated here or the engine will crash.
if (whatsectp == nullptr || !validSectorIndex(sectnum(whatsectp))) return nullptr;
int const i = insertsprite(sectnum(whatsectp), s_ss);
if (i < 0)
@ -139,15 +141,16 @@ int initspriteforspawn(DDukeActor* actj, int pn, const std::initializer_list<int
{
spritetype* sp;
int* t;
int i;
int i = -1;
if (actj)
{
auto spawned = EGS(actj->s->sector(), actj->s->x, actj->s->y, actj->s->z, pn, 0, 0, 0, 0, 0, 0, actj, 0);
spawned->picnum = actj->s->picnum;
sp = spawned->s;
t = spawned->temp_data;
i = spawned->GetSpriteIndex();
if (spawned)
{
spawned->picnum = actj->s->picnum;
i = spawned->GetSpriteIndex();
}
}
else
{
@ -1138,7 +1141,7 @@ void spriteglass(DDukeActor* actor, int n)
int a = krand() & 2047;
int z = sp->z - ((krand() & 16) << 8);
auto k = EGS(sp->sector(), sp->x, sp->y, z, TILE_GLASSPIECES + (j % 3), krand() & 15, 36, 36, a, 32 + (krand() & 63), -512 - (krand() & 2047), actor, 5);
k->s->pal = sp->pal;
if (k) k->s->pal = sp->pal;
}
}
@ -1190,7 +1193,7 @@ void lotsofcolourglass(DDukeActor* actor, walltype* wal, int n)
{
a = krand() & 2047;
auto k = EGS(sp->sector(), sp->x, sp->y, sp->z - (krand() & (63 << 8)), TILE_GLASSPIECES + (j % 3), -32, 36, 36, a, 32 + (krand() & 63), 1024 - (krand() & 2047), actor, 5);
k->s->pal = krand() & 15;
if (k) k->s->pal = krand() & 15;
}
return;
}
@ -1211,7 +1214,7 @@ void lotsofcolourglass(DDukeActor* actor, walltype* wal, int n)
z = sp->z - (32 << 8) + (krand() & ((64 << 8) - 1));
a = sp->ang - 1024;
auto k = EGS(sp->sector(), x1, y1, z, TILE_GLASSPIECES + (j % 3), -32, 36, 36, a, 32 + (krand() & 63), -(krand() & 2047), actor, 5);
k->s->pal = krand() & 7;
if (k) k->s->pal = krand() & 7;
}
}