teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-22 11:41:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- wrap clipdist copy

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-09 18:22:20 +02:00
parent 51c059657b
commit 3fc592c505
5 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/core/coreactor.h
View file

@ -281,6 +281,11 @@ public:
spr. clipdist = val; spr. clipdist = val;
} }
void copy_clipdist(DCoreActor* other)
{
spr. clipdist = other->spr. clipdist;
}
}; };
// holds pointers to the game-side actors. // holds pointers to the game-side actors.

8
source/games/sw/src/jweapon.cpp
View file

@ -1190,7 +1190,7 @@ int SpawnRadiationCloud(DSWActor* actor)
actorNew->spr.shade = -40; actorNew->spr.shade = -40;
actorNew->spr.xrepeat = 32; actorNew->spr.xrepeat = 32;
actorNew->spr.yrepeat = 32; actorNew->spr.yrepeat = 32;
actorNew->spr.clipdist = actor->spr.clipdist; actorNew->copy_clipdist(actor);
actorNew->spr.cstat |= (CSTAT_SPRITE_YCENTER); actorNew->spr.cstat |= (CSTAT_SPRITE_YCENTER);
actorNew->spr.cstat &= ~(CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); actorNew->spr.cstat &= ~(CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
actorNew->user.spal = actorNew->spr.pal = PALETTE_PLAYER6; actorNew->user.spal = actorNew->spr.pal = PALETTE_PLAYER6;
@ -1695,7 +1695,7 @@ int InitCaltrops(DSWActor* actor)
actorNew->spr.xrepeat = 64; actorNew->spr.xrepeat = 64;
actorNew->spr.shade = -15; actorNew->spr.shade = -15;
// !FRANK - clipbox must be <= weapon otherwise can clip thru walls // !FRANK - clipbox must be <= weapon otherwise can clip thru walls
actorNew->spr.clipdist = actor->spr.clipdist; actorNew->copy_clipdist(actor);
actorNew->user.WeaponNum = actor->user.WeaponNum; actorNew->user.WeaponNum = actor->user.WeaponNum;
actorNew->user.Radius = 200; actorNew->user.Radius = 200;
actorNew->user.ceiling_dist = 3; actorNew->user.ceiling_dist = 3;
@ -1738,7 +1738,7 @@ int InitPhosphorus(DSWActor* actor)
if (actor->spr.clipdist > 0) if (actor->spr.clipdist > 0)
actorNew->spr.clipdist = actor->spr.clipdist-1; actorNew->spr.clipdist = actor->spr.clipdist-1;
else else
actorNew->spr.clipdist = actor->spr.clipdist; actorNew->copy_clipdist(actor);
actorNew->user.WeaponNum = actor->user.WeaponNum; actorNew->user.WeaponNum = actor->user.WeaponNum;
actorNew->user.Radius = 600; actorNew->user.Radius = 600;
actorNew->user.ceiling_dist = 3; actorNew->user.ceiling_dist = 3;
@ -1808,7 +1808,7 @@ int InitBloodSpray(DSWActor* actor, bool dogib, short velocity)
actorNew->spr.yrepeat = 64-RandomRange(35); actorNew->spr.yrepeat = 64-RandomRange(35);
actorNew->spr.xrepeat = 64-RandomRange(35); actorNew->spr.xrepeat = 64-RandomRange(35);
actorNew->spr.shade = -15; actorNew->spr.shade = -15;
actorNew->spr.clipdist = actor->spr.clipdist; actorNew->copy_clipdist(actor);
actorNew->user.WeaponNum = actor->user.WeaponNum; actorNew->user.WeaponNum = actor->user.WeaponNum;
actorNew->user.Radius = 600; actorNew->user.Radius = 600;
actorNew->user.ceiling_dist = 3; actorNew->user.ceiling_dist = 3;

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

@ -9663,7 +9663,7 @@ int SpawnExtraMicroMini(DSWActor* actor)
SetOwner(GetOwner(actor), actorNew); SetOwner(GetOwner(actor), actorNew);
actorNew->spr.yrepeat = actorNew->spr.xrepeat = actor->spr.xrepeat; actorNew->spr.yrepeat = actorNew->spr.xrepeat = actor->spr.xrepeat;
actorNew->spr.shade = actor->spr.shade; actorNew->spr.shade = actor->spr.shade;
actorNew->spr.clipdist = actor->spr.clipdist; actorNew->copy_clipdist(actor);
actorNew->user.RotNum = 5; actorNew->user.RotNum = 5;
NewStateGroup(actorNew, &sg_MicroMini[0]); NewStateGroup(actorNew, &sg_MicroMini[0]);
@ -10352,7 +10352,7 @@ void SpawnNuclearSecondaryExp(DSWActor* actor, DAngle ang)
expActor->spr.shade = -128; expActor->spr.shade = -128;
expActor->spr.xrepeat = 218; expActor->spr.xrepeat = 218;
expActor->spr.yrepeat = 152; expActor->spr.yrepeat = 152;
expActor->spr.clipdist = actor->spr.clipdist; expActor->copy_clipdist(actor);
expActor->user.ceiling_dist = (16); expActor->user.ceiling_dist = (16);
expActor->user.floor_dist = (16); expActor->user.floor_dist = (16);
expActor->spr.cstat |= (CSTAT_SPRITE_YCENTER); expActor->spr.cstat |= (CSTAT_SPRITE_YCENTER);
@ -10415,7 +10415,7 @@ void SpawnNuclearExp(DSWActor* actor)
expActor->spr.shade = -128; expActor->spr.shade = -128;
expActor->spr.xrepeat = 255; expActor->spr.xrepeat = 255;
expActor->spr.yrepeat = 255; expActor->spr.yrepeat = 255;
expActor->spr.clipdist = actor->spr.clipdist; expActor->copy_clipdist(actor);
expActor->spr.cstat |= (CSTAT_SPRITE_YCENTER); expActor->spr.cstat |= (CSTAT_SPRITE_YCENTER);
expActor->spr.cstat &= ~(CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); expActor->spr.cstat &= ~(CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
expActor->user.spal = expActor->spr.pal = PALETTE_PLAYER1; // Set nuke puff to gray expActor->user.spal = expActor->spr.pal = PALETTE_PLAYER1; // Set nuke puff to gray
@ -10646,7 +10646,7 @@ void SpawnGrenadeSecondaryExp(DSWActor* actor, DAngle ang)
expActor->spr.shade = -40; expActor->spr.shade = -40;
expActor->spr.xrepeat = 32; expActor->spr.xrepeat = 32;
expActor->spr.yrepeat = 32; expActor->spr.yrepeat = 32;
expActor->spr.clipdist = actor->spr.clipdist; expActor->copy_clipdist(actor);
expActor->user.ceiling_dist = (16); expActor->user.ceiling_dist = (16);
expActor->user.floor_dist = (16); expActor->user.floor_dist = (16);
expActor->spr.cstat |= (CSTAT_SPRITE_YCENTER); expActor->spr.cstat |= (CSTAT_SPRITE_YCENTER);
@ -10721,7 +10721,7 @@ void SpawnGrenadeExp(DSWActor* actor)
expActor->spr.shade = -40; expActor->spr.shade = -40;
expActor->spr.xrepeat = 64 + 32; expActor->spr.xrepeat = 64 + 32;
expActor->spr.yrepeat = 64 + 32; expActor->spr.yrepeat = 64 + 32;
expActor->spr.clipdist = actor->spr.clipdist; expActor->copy_clipdist(actor);
expActor->spr.cstat |= (CSTAT_SPRITE_YCENTER); expActor->spr.cstat |= (CSTAT_SPRITE_YCENTER);
expActor->spr.cstat &= ~(CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN); expActor->spr.cstat &= ~(CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
expActor->user.Radius = DamageData[DMG_GRENADE_EXP].radius; expActor->user.Radius = DamageData[DMG_GRENADE_EXP].radius;
@ -13107,7 +13107,7 @@ int InitStar(PLAYER* pp)
actorNew2->spr.shade = actorNew->spr.shade; actorNew2->spr.shade = actorNew->spr.shade;
actorNew2->spr.extra = actorNew->spr.extra; actorNew2->spr.extra = actorNew->spr.extra;
actorNew2->spr.clipdist = actorNew->spr.clipdist; actorNew2->copy_clipdist(actorNew);
actorNew2->user.WeaponNum = actorNew->user.WeaponNum; actorNew2->user.WeaponNum = actorNew->user.WeaponNum;
actorNew2->user.Radius = actorNew->user.Radius; actorNew2->user.Radius = actorNew->user.Radius;
actorNew2->user.ceiling_dist = actorNew->user.ceiling_dist; actorNew2->user.ceiling_dist = actorNew->user.ceiling_dist;