teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-01 05:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- renamed exp-> in weapon.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-24 19:23:39 +01:00
parent 4395de8fb1
commit b5261b9fe1
1 changed files with 170 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

343
source/games/sw/src/weapon.cpp
View file

@ -9989,15 +9989,14 @@ int SpawnCoolieExp(DSWActor* actor)
auto actorNew = SpawnActor(STAT_MISSILE, BOLT_EXP, s_BoltExp, actor->spr.sector(), auto actorNew = SpawnActor(STAT_MISSILE, BOLT_EXP, s_BoltExp, actor->spr.sector(),
nx, ny, zh, actor->spr.ang, 0); nx, ny, zh, actor->spr.ang, 0);
exp = &actorNew->s();
eu = actorNew->u(); eu = actorNew->u();
exp->hitag = LUMINOUS; //Always full brightness actorNew->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(actor, actorNew); SetOwner(actor, actorNew);
exp->shade = -40; actorNew->spr.shade = -40;
exp->pal = eu->spal = u->spal; actorNew->spr.pal = eu->spal = u->spal;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(actorNew->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(actorNew->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
eu->Radius = DamageData[DMG_BOLT_EXP].radius; eu->Radius = DamageData[DMG_BOLT_EXP].radius;
DoExpDamageTest(actorNew); DoExpDamageTest(actorNew);
@ -10208,18 +10207,17 @@ void SpawnFireballExp(DSWActor* actor)
auto actorNew = SpawnActor(STAT_MISSILE, FIREBALL_EXP, s_FireballExp, actor->spr.sector(), auto actorNew = SpawnActor(STAT_MISSILE, FIREBALL_EXP, s_FireballExp, actor->spr.sector(),
actor->spr.pos.X, actor->spr.pos.Y, actor->spr.pos.Z, actor->spr.ang, 0); actor->spr.pos.X, actor->spr.pos.Y, actor->spr.pos.Z, actor->spr.ang, 0);
exp = &actorNew->s();
eu = actorNew->u(); eu = actorNew->u();
exp->hitag = LUMINOUS; //Always full brightness actorNew->spr.hitag = LUMINOUS; //Always full brightness
exp->xrepeat = 52; actorNew->spr.xrepeat = 52;
exp->yrepeat = 52; actorNew->spr.yrepeat = 52;
SetOwner(GetOwner(actor), actorNew); SetOwner(GetOwner(actor), actorNew);
exp->shade = -40; actorNew->spr.shade = -40;
exp->pal = eu->spal = u->spal; actorNew->spr.pal = eu->spal = u->spal;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(actorNew->spr.cstat, CSTAT_SPRITE_YCENTER);
SET(eu->Flags, TEST(u->Flags,SPR_UNDERWATER)); SET(eu->Flags, TEST(u->Flags,SPR_UNDERWATER));
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(actorNew->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
// //
// All this stuff assures that explosions do not go into floors & // All this stuff assures that explosions do not go into floors &
@ -10247,17 +10245,16 @@ void SpawnGoroFireballExp(DSWActor* actor)
auto actorNew = SpawnActor(STAT_MISSILE, 0, s_FireballExp, actor->spr.sector(), auto actorNew = SpawnActor(STAT_MISSILE, 0, s_FireballExp, actor->spr.sector(),
actor->spr.pos.X, actor->spr.pos.Y, actor->spr.pos.Z, actor->spr.ang, 0); actor->spr.pos.X, actor->spr.pos.Y, actor->spr.pos.Z, actor->spr.ang, 0);
exp = &actorNew->s();
eu = actorNew->u(); eu = actorNew->u();
exp->hitag = LUMINOUS; //Always full brightness actorNew->spr.hitag = LUMINOUS; //Always full brightness
exp->xrepeat = 16; actorNew->spr.xrepeat = 16;
exp->yrepeat = 16; actorNew->spr.yrepeat = 16;
SetOwner(GetOwner(actor), actorNew); SetOwner(GetOwner(actor), actorNew);
exp->shade = -40; actorNew->spr.shade = -40;
exp->pal = eu->spal = u->spal; actorNew->spr.pal = eu->spal = u->spal;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(actorNew->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(actorNew->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
// //
// All this stuff assures that explosions do not go into floors & // All this stuff assures that explosions do not go into floors &
@ -10285,15 +10282,15 @@ void SpawnBoltExp(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(GetOwner(actor), expActor); SetOwner(GetOwner(actor), expActor);
exp->shade = -40; expActor->spr.shade = -40;
exp->xrepeat = 76; expActor->spr.xrepeat = 76;
exp->yrepeat = 76; expActor->spr.yrepeat = 76;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
if (RANDOM_P2(1024) > 512) if (RANDOM_P2(1024) > 512)
SET(exp->cstat, CSTAT_SPRITE_XFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_XFLIP);
eu->Radius = DamageData[DMG_BOLT_EXP].radius; eu->Radius = DamageData[DMG_BOLT_EXP].radius;
SpawnExpZadjust(actor, expActor, Z(40), Z(40)); SpawnExpZadjust(actor, expActor, Z(40), Z(40));
@ -10301,7 +10298,7 @@ void SpawnBoltExp(DSWActor* actor)
DoExpDamageTest(expActor); DoExpDamageTest(expActor);
SetExpQuake(actor); // !JIM! made rocket launcher shake things SetExpQuake(actor); // !JIM! made rocket launcher shake things
SpawnVis(nullptr, exp->sector(), exp->pos.X, exp->pos.Y, exp->pos.Z, 16); SpawnVis(nullptr, expActor->spr.sector(), expActor->spr.pos.X, expActor->spr.pos.Y, expActor->spr.pos.Z, 16);
} }
int SpawnBunnyExp(DSWActor* actor) int SpawnBunnyExp(DSWActor* actor)
@ -10342,20 +10339,20 @@ void SpawnTankShellExp(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(GetOwner(actor), expActor); SetOwner(GetOwner(actor), expActor);
exp->shade = -40; expActor->spr.shade = -40;
exp->xrepeat = 64+32; expActor->spr.xrepeat = 64+32;
exp->yrepeat = 64+32; expActor->spr.yrepeat = 64+32;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
if (RANDOM_P2(1024) > 512) if (RANDOM_P2(1024) > 512)
SET(exp->cstat, CSTAT_SPRITE_XFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_XFLIP);
eu->Radius = DamageData[DMG_TANK_SHELL_EXP].radius; eu->Radius = DamageData[DMG_TANK_SHELL_EXP].radius;
SpawnExpZadjust(actor, expActor, Z(40), Z(40)); SpawnExpZadjust(actor, expActor, Z(40), Z(40));
DoExpDamageTest(expActor); DoExpDamageTest(expActor);
SpawnVis(nullptr, exp->sector(), exp->pos.X, exp->pos.Y, exp->pos.Z, 16); SpawnVis(nullptr, expActor->spr.sector(), expActor->spr.pos.X, expActor->spr.pos.Y, expActor->spr.pos.Z, 16);
} }
@ -10372,16 +10369,16 @@ void SpawnNuclearSecondaryExp(DSWActor* actor, short ang)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(GetOwner(actor), expActor); SetOwner(GetOwner(actor), expActor);
exp->shade = -128; expActor->spr.shade = -128;
exp->xrepeat = 218; expActor->spr.xrepeat = 218;
exp->yrepeat = 152; expActor->spr.yrepeat = 152;
exp->clipdist = actor->spr.clipdist; expActor->spr.clipdist = actor->spr.clipdist;
eu->ceiling_dist = Z(16); eu->ceiling_dist = Z(16);
eu->floor_dist = Z(16); eu->floor_dist = Z(16);
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
//ang = RANDOM_P2(2048); //ang = RANDOM_P2(2048);
int32_t const vel = (2048+128) + RandomRange(2048); int32_t const vel = (2048+128) + RandomRange(2048);
@ -10391,7 +10388,7 @@ void SpawnNuclearSecondaryExp(DSWActor* actor, short ang)
eu->coll = move_missile(expActor, eu->xchange, eu->ychange, 0, eu->coll = move_missile(expActor, eu->xchange, eu->ychange, 0,
eu->ceiling_dist, eu->floor_dist, CLIPMASK_MISSILE, MISSILEMOVETICS); eu->ceiling_dist, eu->floor_dist, CLIPMASK_MISSILE, MISSILEMOVETICS);
if (FindDistance3D(exp->pos.X - actor->spr.pos.X, exp->pos.Y - actor->spr.pos.Y, exp->pos.Z - actor->spr.pos.Z) < 1024) if (FindDistance3D(expActor->spr.pos.X - actor->spr.pos.X, expActor->spr.pos.Y - actor->spr.pos.Y, expActor->spr.pos.Z - actor->spr.pos.Z) < 1024)
{ {
KillActor(expActor); KillActor(expActor);
return; return;
@ -10436,15 +10433,15 @@ void SpawnNuclearExp(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(own, expActor); SetOwner(own, expActor);
exp->shade = -128; expActor->spr.shade = -128;
exp->xrepeat = 255; expActor->spr.xrepeat = 255;
exp->yrepeat = 255; expActor->spr.yrepeat = 255;
exp->clipdist = actor->spr.clipdist; expActor->spr.clipdist = actor->spr.clipdist;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
eu->spal = exp->pal = PALETTE_PLAYER1; // Set nuke puff to gray eu->spal = expActor->spr.pal = PALETTE_PLAYER1; // Set nuke puff to gray
InitChemBomb(expActor); InitChemBomb(expActor);
@ -10456,13 +10453,13 @@ void SpawnNuclearExp(DSWActor* actor)
eu = expActor->u(); eu = expActor->u();
SetOwner(own, expActor); SetOwner(own, expActor);
exp->shade = -128; expActor->spr.shade = -128;
exp->xrepeat = 218; expActor->spr.xrepeat = 218;
exp->yrepeat = 152; expActor->spr.yrepeat = 152;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
if (RANDOM_P2(1024) > 512) if (RANDOM_P2(1024) > 512)
SET(exp->cstat, CSTAT_SPRITE_XFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_XFLIP);
eu->Radius = NUKE_RADIUS; eu->Radius = NUKE_RADIUS;
@ -10507,16 +10504,16 @@ void SpawnTracerExp(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(GetOwner(actor), expActor); SetOwner(GetOwner(actor), expActor);
exp->shade = -40; expActor->spr.shade = -40;
exp->xrepeat = 4; expActor->spr.xrepeat = 4;
exp->yrepeat = 4; expActor->spr.yrepeat = 4;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
if (RANDOM_P2(1024) > 512) if (RANDOM_P2(1024) > 512)
SET(exp->cstat, CSTAT_SPRITE_XFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_XFLIP);
if (u->ID == BOLT_THINMAN_R1) if (u->ID == BOLT_THINMAN_R1)
{ {
@ -10542,17 +10539,17 @@ void SpawnMicroExp(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(GetOwner(actor), expActor); SetOwner(GetOwner(actor), expActor);
exp->shade = -40; expActor->spr.shade = -40;
exp->xrepeat = 32; expActor->spr.xrepeat = 32;
exp->yrepeat = 32; expActor->spr.yrepeat = 32;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
if (RANDOM_P2(1024) > 512) if (RANDOM_P2(1024) > 512)
SET(exp->cstat, CSTAT_SPRITE_XFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_XFLIP);
if (RANDOM_P2(1024) > 512) if (RANDOM_P2(1024) > 512)
SET(exp->cstat, CSTAT_SPRITE_YFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_YFLIP);
eu->Radius = DamageData[DMG_BOLT_EXP].radius; eu->Radius = DamageData[DMG_BOLT_EXP].radius;
// //
@ -10561,7 +10558,7 @@ void SpawnMicroExp(DSWActor* actor)
// //
SpawnExpZadjust(actor, expActor, Z(20), Z(20)); SpawnExpZadjust(actor, expActor, Z(20), Z(20));
SpawnVis(nullptr, exp->sector(), exp->pos.X, exp->pos.Y, exp->pos.Z, 16); SpawnVis(nullptr, expActor->spr.sector(), expActor->spr.pos.X, expActor->spr.pos.Y, expActor->spr.pos.Z, 16);
} }
void AddSpriteToSectorObject(DSWActor* actor, SECTOR_OBJECTp sop) void AddSpriteToSectorObject(DSWActor* actor, SECTOR_OBJECTp sop)
@ -10609,26 +10606,26 @@ void SpawnBigGunFlames(DSWActor* actor, DSWActor* Operator, SECTOR_OBJECTp sop,
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(Operator, expActor); SetOwner(Operator, expActor);
exp->shade = -40; expActor->spr.shade = -40;
if (smallflames) if (smallflames)
{ {
exp->xrepeat = 12; expActor->spr.xrepeat = 12;
exp->yrepeat = 12; expActor->spr.yrepeat = 12;
} }
else else
{ {
exp->xrepeat = 34; expActor->spr.xrepeat = 34;
exp->yrepeat = 34; expActor->spr.yrepeat = 34;
} }
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
if (RANDOM_P2(1024) > 512) if (RANDOM_P2(1024) > 512)
SET(exp->cstat, CSTAT_SPRITE_XFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_XFLIP);
if (RANDOM_P2(1024) > 512) if (RANDOM_P2(1024) > 512)
SET(exp->cstat, CSTAT_SPRITE_YFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_YFLIP);
// place all sprites on list // place all sprites on list
for (sn = 0; sn < SIZ(sop->so_actors); sn++) for (sn = 0; sn < SIZ(sop->so_actors); sn++)
@ -10647,14 +10644,14 @@ void SpawnBigGunFlames(DSWActor* actor, DSWActor* Operator, SECTOR_OBJECTp sop,
if (TEST(u->Flags, SPR_ON_SO_SECTOR)) if (TEST(u->Flags, SPR_ON_SO_SECTOR))
{ {
// move with sector its on // move with sector its on
exp->pos.Z = actor->spr.sector()->floorz - u->sz; expActor->spr.pos.Z = actor->spr.sector()->floorz - u->sz;
exp->backupz(); expActor->spr.backupz();
} }
else else
{ {
// move with the mid sector // move with the mid sector
exp->pos.Z = sop->mid_sector->floorz - u->sz; expActor->spr.pos.Z = sop->mid_sector->floorz - u->sz;
exp->backupz(); expActor->spr.backupz();
} }
eu->sx = u->sx; eu->sx = u->sx;
@ -10675,16 +10672,16 @@ void SpawnGrenadeSecondaryExp(DSWActor* actor, int ang)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(GetOwner(actor), expActor); SetOwner(GetOwner(actor), expActor);
exp->shade = -40; expActor->spr.shade = -40;
exp->xrepeat = 32; expActor->spr.xrepeat = 32;
exp->yrepeat = 32; expActor->spr.yrepeat = 32;
exp->clipdist = actor->spr.clipdist; expActor->spr.clipdist = actor->spr.clipdist;
eu->ceiling_dist = Z(16); eu->ceiling_dist = Z(16);
eu->floor_dist = Z(16); eu->floor_dist = Z(16);
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
//ang = RANDOM_P2(2048); //ang = RANDOM_P2(2048);
vel = (1024+512) + RandomRange(1024); vel = (1024+512) + RandomRange(1024);
@ -10694,14 +10691,14 @@ void SpawnGrenadeSecondaryExp(DSWActor* actor, int ang)
eu->coll = move_missile(expActor, eu->xchange, eu->ychange, 0, eu->coll = move_missile(expActor, eu->xchange, eu->ychange, 0,
eu->ceiling_dist, eu->floor_dist, CLIPMASK_MISSILE, MISSILEMOVETICS); eu->ceiling_dist, eu->floor_dist, CLIPMASK_MISSILE, MISSILEMOVETICS);
if (FindDistance3D(exp->pos.X - actor->spr.pos.X, exp->pos.Y - actor->spr.pos.Y, exp->pos.Z - actor->spr.pos.Z) < 1024) if (FindDistance3D(expActor->spr.pos.X - actor->spr.pos.X, expActor->spr.pos.Y - actor->spr.pos.Y, expActor->spr.pos.Z - actor->spr.pos.Z) < 1024)
{ {
KillActor(expActor); KillActor(expActor);
return; return;
} }
SpawnExpZadjust(actor, expActor, Z(50), Z(10)); SpawnExpZadjust(actor, expActor, Z(50), Z(10));
exp->backuppos(); expActor->spr.backuppos();
} }
int SpawnGrenadeSmallExp(DSWActor* actor) int SpawnGrenadeSmallExp(DSWActor* actor)
@ -10750,14 +10747,14 @@ void SpawnGrenadeExp(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(GetOwner(actor), expActor); SetOwner(GetOwner(actor), expActor);
exp->shade = -40; expActor->spr.shade = -40;
exp->xrepeat = 64 + 32; expActor->spr.xrepeat = 64 + 32;
exp->yrepeat = 64 + 32; expActor->spr.yrepeat = 64 + 32;
exp->clipdist = actor->spr.clipdist; expActor->spr.clipdist = actor->spr.clipdist;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
eu->Radius = DamageData[DMG_GRENADE_EXP].radius; eu->Radius = DamageData[DMG_GRENADE_EXP].radius;
// //
@ -10770,7 +10767,7 @@ void SpawnGrenadeExp(DSWActor* actor)
DoExpDamageTest(expActor); DoExpDamageTest(expActor);
SetExpQuake(expActor); SetExpQuake(expActor);
SpawnVis(nullptr, exp->sector(), exp->pos.X, exp->pos.Y, exp->pos.Z, 0); SpawnVis(nullptr, expActor->spr.sector(), expActor->spr.pos.X, expActor->spr.pos.Y, expActor->spr.pos.Z, 0);
} }
void SpawnExpZadjust(DSWActor* actor, DSWActor* expActor, int upper_zsize, int lower_zsize) void SpawnExpZadjust(DSWActor* actor, DSWActor* expActor, int upper_zsize, int lower_zsize)
@ -10784,40 +10781,40 @@ void SpawnExpZadjust(DSWActor* actor, DSWActor* expActor, int upper_zsize, int l
if (u) if (u)
{ {
tos_z = exp->pos.Z - upper_zsize; tos_z = expActor->spr.pos.Z - upper_zsize;
bos_z = exp->pos.Z + lower_zsize; bos_z = expActor->spr.pos.Z + lower_zsize;
if (tos_z <= u->hiz + Z(4)) if (tos_z <= u->hiz + Z(4))
{ {
exp->pos.Z = u->hiz + upper_zsize; expActor->spr.pos.Z = u->hiz + upper_zsize;
SET(exp->cstat, CSTAT_SPRITE_YFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_YFLIP);
} }
else if (bos_z > u->loz) else if (bos_z > u->loz)
{ {
exp->pos.Z = u->loz - lower_zsize; expActor->spr.pos.Z = u->loz - lower_zsize;
} }
} }
else else
{ {
int cz,fz; int cz,fz;
getzsofslopeptr(exp->sector(), exp->pos.X, exp->pos.Y, &cz, &fz); getzsofslopeptr(expActor->spr.sector(), expActor->spr.pos.X, expActor->spr.pos.Y, &cz, &fz);
tos_z = exp->pos.Z - upper_zsize; tos_z = expActor->spr.pos.Z - upper_zsize;
bos_z = exp->pos.Z + lower_zsize; bos_z = expActor->spr.pos.Z + lower_zsize;
if (tos_z <= cz + Z(4)) if (tos_z <= cz + Z(4))
{ {
exp->pos.Z = cz + upper_zsize; expActor->spr.pos.Z = cz + upper_zsize;
SET(exp->cstat, CSTAT_SPRITE_YFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_YFLIP);
} }
else if (bos_z > fz) else if (bos_z > fz)
{ {
exp->pos.Z = fz - lower_zsize; expActor->spr.pos.Z = fz - lower_zsize;
} }
} }
exp->backupz(); expActor->spr.backupz();
} }
void SpawnMineExp(DSWActor* actor) void SpawnMineExp(DSWActor* actor)
@ -10839,13 +10836,13 @@ void SpawnMineExp(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(GetOwner(actor), expActor); SetOwner(GetOwner(actor), expActor);
exp->shade = -40; expActor->spr.shade = -40;
exp->xrepeat = 64 + 44; expActor->spr.xrepeat = 64 + 44;
exp->yrepeat = 64 + 44; expActor->spr.yrepeat = 64 + 44;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
eu->Radius = DamageData[DMG_MINE_EXP].radius; eu->Radius = DamageData[DMG_MINE_EXP].radius;
// //
@ -10854,7 +10851,7 @@ void SpawnMineExp(DSWActor* actor)
// //
SpawnExpZadjust(actor, expActor, Z(100), Z(20)); SpawnExpZadjust(actor, expActor, Z(100), Z(20));
SpawnVis(nullptr, exp->sector(), exp->pos.X, exp->pos.Y, exp->pos.Z, 16); SpawnVis(nullptr, expActor->spr.sector(), expActor->spr.pos.X, expActor->spr.pos.Y, expActor->spr.pos.Z, 16);
SetExpQuake(expActor); SetExpQuake(expActor);
} }
@ -10895,17 +10892,17 @@ DSWActor* SpawnSectorExp(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
exp->shade = -40; expActor->spr.shade = -40;
exp->xrepeat = 90; // was 40,40 expActor->spr.xrepeat = 90; // was 40,40
exp->yrepeat = 90; expActor->spr.yrepeat = 90;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
eu->Radius = DamageData[DMG_SECTOR_EXP].radius; eu->Radius = DamageData[DMG_SECTOR_EXP].radius;
DoExpDamageTest(expActor); DoExpDamageTest(expActor);
SetExpQuake(expActor); SetExpQuake(expActor);
SpawnVis(nullptr, exp->sector(), exp->pos.X, exp->pos.Y, exp->pos.Z, 16); SpawnVis(nullptr, expActor->spr.sector(), expActor->spr.pos.X, expActor->spr.pos.Y, expActor->spr.pos.Z, 16);
return expActor; return expActor;
} }
@ -10924,12 +10921,12 @@ DSWActor* SpawnLargeExp(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
exp->shade = -40; expActor->spr.shade = -40;
exp->xrepeat = 90; // was 40,40 expActor->spr.xrepeat = 90; // was 40,40
exp->yrepeat = 90; expActor->spr.yrepeat = 90;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
eu->Radius = DamageData[DMG_SECTOR_EXP].radius; eu->Radius = DamageData[DMG_SECTOR_EXP].radius;
SpawnExpZadjust(actor, expActor, Z(50), Z(50)); SpawnExpZadjust(actor, expActor, Z(50), Z(50));
@ -10937,7 +10934,7 @@ DSWActor* SpawnLargeExp(DSWActor* actor)
// Should not cause other sectors to explode // Should not cause other sectors to explode
DoExpDamageTest(expActor); DoExpDamageTest(expActor);
SetExpQuake(expActor); SetExpQuake(expActor);
SpawnVis(nullptr, exp->sector(), exp->pos.X, exp->pos.Y, exp->pos.Z, 16); SpawnVis(nullptr, expActor->spr.sector(), expActor->spr.pos.X, expActor->spr.pos.Y, expActor->spr.pos.Z, 16);
return expActor; return expActor;
} }
@ -10968,23 +10965,23 @@ void SpawnMeteorExp(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
exp->shade = -40; expActor->spr.shade = -40;
if (actor->spr.yrepeat < 64) if (actor->spr.yrepeat < 64)
{ {
// small // small
exp->xrepeat = 64; expActor->spr.xrepeat = 64;
exp->yrepeat = 64; expActor->spr.yrepeat = 64;
} }
else else
{ {
// large - boss // large - boss
exp->xrepeat = 80; expActor->spr.xrepeat = 80;
exp->yrepeat = 80; expActor->spr.yrepeat = 80;
} }
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
eu->Radius = DamageData[DMG_BASIC_EXP].radius; eu->Radius = DamageData[DMG_BASIC_EXP].radius;
} }
@ -11001,14 +10998,14 @@ void SpawnLittleExp(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
exp->shade = -127; expActor->spr.shade = -127;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
eu->Radius = DamageData[DMG_BASIC_EXP].radius; eu->Radius = DamageData[DMG_BASIC_EXP].radius;
DoExpDamageTest(expActor); DoExpDamageTest(expActor);
SpawnVis(nullptr, exp->sector(), exp->pos.X, exp->pos.Y, exp->pos.Z, 16); SpawnVis(nullptr, expActor->spr.sector(), expActor->spr.pos.X, expActor->spr.pos.Y, expActor->spr.pos.Z, 16);
} }
int DoFireball(DSWActor* actor) int DoFireball(DSWActor* actor)
@ -11251,27 +11248,27 @@ int DoNapalm(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(actor, expActor); SetOwner(actor, expActor);
exp->shade = -40; expActor->spr.shade = -40;
exp->cstat = actor->spr.cstat; expActor->spr.cstat = actor->spr.cstat;
exp->xrepeat = 48; expActor->spr.xrepeat = 48;
exp->yrepeat = 64; expActor->spr.yrepeat = 64;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
if (RANDOM_P2(1024) < 512) if (RANDOM_P2(1024) < 512)
SET(exp->cstat, CSTAT_SPRITE_XFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_XFLIP);
RESET(exp->cstat, CSTAT_SPRITE_TRANSLUCENT); RESET(expActor->spr.cstat, CSTAT_SPRITE_TRANSLUCENT);
eu->Radius = 1500; eu->Radius = 1500;
DoFindGroundPoint(expActor); DoFindGroundPoint(expActor);
MissileWaterAdjust(expActor); MissileWaterAdjust(expActor);
exp->pos.Z = eu->loz; expActor->spr.pos.Z = eu->loz;
exp->backupz(); expActor->spr.backupz();
if (TEST(u->Flags, SPR_UNDERWATER)) if (TEST(u->Flags, SPR_UNDERWATER))
SET(eu->Flags, SPR_UNDERWATER); SET(eu->Flags, SPR_UNDERWATER);
ASSERT(exp->picnum == 3072); ASSERT(expActor->spr.picnum == 3072);
ASSERT(eu->Tics == 0); ASSERT(eu->Tics == 0);
} }
@ -14849,20 +14846,20 @@ int SpawnDemonFist(DSWActor* actor)
exp = &expActor->s(); exp = &expActor->s();
eu = expActor->u(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness expActor->spr.hitag = LUMINOUS; //Always full brightness
exp->shade = -40; expActor->spr.shade = -40;
exp->xrepeat = 32; expActor->spr.xrepeat = 32;
exp->yrepeat = 32; expActor->spr.yrepeat = 32;
eu->spal = exp->pal = 25; eu->spal = expActor->spr.pal = 25;
SET(exp->cstat, CSTAT_SPRITE_YCENTER); SET(expActor->spr.cstat, CSTAT_SPRITE_YCENTER);
RESET(exp->cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); RESET(expActor->spr.cstat, CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
eu->Radius = DamageData[DMG_BASIC_EXP].radius; eu->Radius = DamageData[DMG_BASIC_EXP].radius;
if (RANDOM_P2(1024<<8)>>8 > 600) if (RANDOM_P2(1024<<8)>>8 > 600)
SET(exp->cstat, CSTAT_SPRITE_XFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_XFLIP);
if (RANDOM_P2(1024<<8)>>8 > 600) if (RANDOM_P2(1024<<8)>>8 > 600)
SET(exp->cstat, CSTAT_SPRITE_YFLIP); SET(expActor->spr.cstat, CSTAT_SPRITE_YFLIP);
return 0; return 0;
} }