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

- leftover SpriteNum's in coolg.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-31 21:09:57 +01:00
parent cde4b1f19e
commit 7b778f692b
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/games/sw/src/coolg.cpp
View file

@ -619,7 +619,6 @@ int NullCoolg(DSWActor* actor)
int DoCoolgMatchPlayerZ(DSWActor* actor)
{
int SpriteNum = actor->GetSpriteIndex();
SPRITEp sp = &actor->s();
USER* u = actor->u();
int zdiff,zdist;
@ -630,8 +629,8 @@ int DoCoolgMatchPlayerZ(DSWActor* actor)
// If blocking bits get unset, just die
if (!TEST(sp->cstat,CSTAT_SPRITE_BLOCK) || !TEST(sp->cstat,CSTAT_SPRITE_BLOCK_HITSCAN))
{
InitBloodSpray(SpriteNum, true, 105);
InitBloodSpray(SpriteNum, true, 105);
InitBloodSpray(actor->GetSpriteIndex(), true, 105);
InitBloodSpray(actor->GetSpriteIndex(), true, 105);
UpdateSinglePlayKills(actor);
SetSuicide(actor);
}
@ -700,7 +699,6 @@ int DoCoolgMatchPlayerZ(DSWActor* actor)
int InitCoolgCircle(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
SPRITEp sp = &actor->s();
u->ActorActionFunc = DoCoolgCircle;
@ -733,7 +731,6 @@ int InitCoolgCircle(DSWActor* actor)
int DoCoolgCircle(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
SPRITEp sp = &actor->s();
int nx,ny,bound;
@ -776,7 +773,6 @@ int DoCoolgCircle(DSWActor* actor)
int DoCoolgDeath(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
SPRITEp sp = &actor->s();
int nx, ny;
@ -804,7 +800,7 @@ int DoCoolgDeath(DSWActor* actor)
nx = MulScale(sp->xvel, bcos(sp->ang), 14);
ny = MulScale(sp->xvel, bsin(sp->ang), 14);
SetCollision(u, move_sprite(SpriteNum, nx, ny, 0L, u->ceiling_dist, u->floor_dist, CLIPMASK_MISSILE, ACTORMOVETICS));
SetCollision(u, move_sprite(actor->GetSpriteIndex(), nx, ny, 0L, u->ceiling_dist, u->floor_dist, CLIPMASK_MISSILE, ACTORMOVETICS));
DoFindGroundPoint(actor);
// on the ground
@ -819,10 +815,10 @@ int DoCoolgDeath(DSWActor* actor)
return 0;
}
int DoCoolgMove(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
SPRITEp sp = &actor->s();
if ((u->ShellNum -= ACTORMOVETICS) <= 0)
@ -888,14 +884,14 @@ int DoCoolgMove(DSWActor* actor)
DoActorSlide(actor);
if (u->track >= 0)
ActorFollowTrack(SpriteNum, ACTORMOVETICS);
ActorFollowTrack(actor->GetSpriteIndex(), ACTORMOVETICS);
else
{
(*u->ActorActionFunc)(actor);
}
if (RANDOM_P2(1024) < 32 && !TEST(sp->cstat, CSTAT_SPRITE_INVISIBLE))
InitCoolgDrip(SpriteNum);
InitCoolgDrip(actor);
DoCoolgMatchPlayerZ(actor);

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

@ -16750,10 +16750,9 @@ int DoCoolgDrip(DSWActor* actor)
}
int
InitCoolgDrip(short SpriteNum)
InitCoolgDrip(DSWActor* actor)
{
auto actor = &swActors[SpriteNum];
SPRITEp sp = &sprite[SpriteNum], wp;
SPRITEp sp = &actor->s(), wp;
USERp wu;
int nx, ny, nz;
short w;
@ -16769,7 +16768,7 @@ InitCoolgDrip(short SpriteNum)
wu = User[w].Data();
//wp->owner = SpriteNum;
SetOwner(SpriteNum, w);
SetOwner(actor, &swActors[w]);
wp->yrepeat = wp->xrepeat = 20;
wp->shade = -5;
wp->zvel = 0;

2
source/games/sw/src/weapon.h
View file

@ -204,7 +204,7 @@ enum ShrapPos
int SetSuicide(DSWActor*);
void UpdateSinglePlayKills(DSWActor* actor);
int InitPlasmaFountain(SPRITEp wp, SPRITEp sp);
int InitCoolgDrip(short SpriteNum);
int InitCoolgDrip(DSWActor*);
int InitFireball(PLAYERp pp);
void InitSpellRing(PLAYERp pp);
void InitSpellNapalm(PLAYERp pp);