mirror of
https://github.com/DrBeef/Raze.git
synced 2025-02-21 11:11:16 +00:00
- cleanup.
This commit is contained in:
Christoph Oelckers
parent
7012a77685
commit
e94785e571
3 changed files with 32 additions and 35 deletions
|
|
@ -336,7 +336,7 @@ int DoActorPickClosePlayer(DSWActor* actor)
|
|||
{
|
||||
pp = &Player[pnum];
|
||||
|
||||
if (sp->owner == pp->PlayerSprite)
|
||||
if (GetOwner(actor) == pp->Actor())
|
||||
continue;
|
||||
|
||||
u->targetActor = pp->Actor();
|
||||
|
|
@ -354,7 +354,7 @@ int DoActorPickClosePlayer(DSWActor* actor)
|
|||
// Zombies don't target their masters!
|
||||
if (TEST(u->Flags2, SPR2_DONT_TARGET_OWNER))
|
||||
{
|
||||
if (sp->owner == pp->PlayerSprite)
|
||||
if (GetOwner(actor) == pp->Actor())
|
||||
continue;
|
||||
|
||||
if (!PlayerTakeDamage(pp, actor))
|
||||
|
|
@ -384,7 +384,7 @@ int DoActorPickClosePlayer(DSWActor* actor)
|
|||
// Zombies don't target their masters!
|
||||
if (TEST(u->Flags2, SPR2_DONT_TARGET_OWNER))
|
||||
{
|
||||
if (sp->owner == pp->PlayerSprite)
|
||||
if (GetOwner(actor) == pp->Actor())
|
||||
continue;
|
||||
|
||||
if (!PlayerTakeDamage(pp, actor))
|
||||
|
|
@ -769,7 +769,7 @@ int DoActorDecide(DSWActor* actor)
|
|||
if (actor_action == InitActorAttack && u->ID == ZOMBIE_RUN_R0 && u->targetActor->u()->PlayerP)
|
||||
{
|
||||
// Don't let zombies shoot at master
|
||||
if (sp->owner == u->targetActor->GetSpriteIndex())
|
||||
if (GetOwner(actor) == u->targetActor)
|
||||
return 0;
|
||||
|
||||
// if this player cannot take damage from this zombie(weapon) return out
|
||||
|
|
@ -1252,7 +1252,7 @@ int InitActorAttack(DSWActor* actor)
|
|||
if (u->ID == ZOMBIE_RUN_R0 && u->targetActor->hasU() && u->targetActor->u()->PlayerP)
|
||||
{
|
||||
// Don't let zombies shoot at master
|
||||
if (sp->owner == u->targetActor->GetSpriteIndex())
|
||||
if (GetOwner(actor) == u->targetActor)
|
||||
return 0;
|
||||
|
||||
// if this player cannot take damage from this zombie(weapon) return out
|
||||
|
|
|
|||
|
|
@ -1372,8 +1372,9 @@ int PlayerInitChemBomb(PLAYERp pp)
|
|||
// pp->horizon.horizoff.asbuild() + pp->horizon.horiz.asbuild());
|
||||
// MONO_PRINT(ds);
|
||||
|
||||
oclipdist = pp->SpriteP->clipdist;
|
||||
pp->SpriteP->clipdist = 0;
|
||||
auto psp = &pp->Actor()->s();
|
||||
oclipdist = psp->clipdist;
|
||||
psp->clipdist = 0;
|
||||
wp->clipdist = 0;
|
||||
|
||||
// wp->ang = NORM_ANGLE(wp->ang - 512);
|
||||
|
|
@ -1382,7 +1383,7 @@ int PlayerInitChemBomb(PLAYERp pp)
|
|||
|
||||
MissileSetPos(actorNew->GetSpriteIndex(), DoChemBomb, 1000);
|
||||
|
||||
pp->SpriteP->clipdist = uint8_t(oclipdist);
|
||||
psp->clipdist = uint8_t(oclipdist);
|
||||
wp->clipdist = 80L >> 2;
|
||||
|
||||
wu->xchange = MOVEx(wp->xvel, wp->ang);
|
||||
|
|
@ -1792,13 +1793,14 @@ int PlayerInitCaltrops(PLAYERp pp)
|
|||
|
||||
wp->zvel = -pp->horizon.horiz.asq16() >> 9;
|
||||
|
||||
oclipdist = pp->SpriteP->clipdist;
|
||||
pp->SpriteP->clipdist = 0;
|
||||
auto psp = &pp->Actor()->s();
|
||||
oclipdist = psp->clipdist;
|
||||
psp->clipdist = 0;
|
||||
wp->clipdist = 0;
|
||||
|
||||
MissileSetPos(spawnedActor->GetSpriteIndex(), DoCaltrops, 1000);
|
||||
|
||||
pp->SpriteP->clipdist = uint8_t(oclipdist);
|
||||
psp->clipdist = uint8_t(oclipdist);
|
||||
wp->clipdist = 80L >> 2;
|
||||
|
||||
wu->xchange = MOVEx(wp->xvel, wp->ang);
|
||||
|
|
@ -2096,7 +2098,7 @@ int DoCarryFlag(DSWActor* actor)
|
|||
USERp fu = fown->u();
|
||||
|
||||
|
||||
// if no owner then die
|
||||
// if no Owner then die
|
||||
if (u->attachActor != nullptr)
|
||||
{
|
||||
SPRITEp ap = &u->attachActor->s();
|
||||
|
|
@ -2256,7 +2258,7 @@ int DoCarryFlagNoDet(DSWActor* actor)
|
|||
if (u->flagOwnerActor != nullptr)
|
||||
fu->WaitTics = 30 * 120; // Keep setting respawn tics so it won't respawn
|
||||
|
||||
// if no owner then die
|
||||
// if no Owner then die
|
||||
if (u->attachActor != nullptr)
|
||||
{
|
||||
SPRITEp ap = &u->attachActor->s();
|
||||
|
|
|
|||
|
|
@ -5750,7 +5750,7 @@ bool PlayerTakeDamage(PLAYERp pp, DSWActor* weapActor)
|
|||
// ZOMBIE special case for single play
|
||||
if (wu->ID == ZOMBIE_RUN_R0)
|
||||
{
|
||||
// if weapons owner the player
|
||||
// if weapons Owner the player
|
||||
if (wp->owner == pp->PlayerSprite)
|
||||
return false;
|
||||
}
|
||||
|
|
@ -5768,7 +5768,7 @@ bool PlayerTakeDamage(PLAYERp pp, DSWActor* weapActor)
|
|||
if (wu->PlayerP == pp)
|
||||
return true;
|
||||
|
||||
// if the weapons owner is YOURSELF take damage
|
||||
// if the weapons Owner is YOURSELF take damage
|
||||
if (wp->owner >= 0 && User[wp->owner].Data() && User[wp->owner]->PlayerP && User[wp->owner]->PlayerP == pp)
|
||||
return true;
|
||||
|
||||
|
|
@ -5776,7 +5776,7 @@ bool PlayerTakeDamage(PLAYERp pp, DSWActor* weapActor)
|
|||
if (wu->PlayerP)
|
||||
return false;
|
||||
|
||||
// if the weapons owner is a player
|
||||
// if the weapons Owner is a player
|
||||
if (wp->owner >= 0 && User[wp->owner].Data() && User[wp->owner]->PlayerP)
|
||||
return false;
|
||||
}
|
||||
|
|
@ -5790,7 +5790,7 @@ bool PlayerTakeDamage(PLAYERp pp, DSWActor* weapActor)
|
|||
if (wu->PlayerP == pp)
|
||||
return true;
|
||||
|
||||
// if the weapons owner is YOURSELF take damage
|
||||
// if the weapons Owner is YOURSELF take damage
|
||||
if (wp->owner >= 0 && User[wp->owner].Data() && User[wp->owner]->PlayerP && User[wp->owner]->PlayerP == pp)
|
||||
return true;
|
||||
|
||||
|
|
@ -5801,7 +5801,7 @@ bool PlayerTakeDamage(PLAYERp pp, DSWActor* weapActor)
|
|||
return false;
|
||||
}
|
||||
|
||||
// if the weapons owner is a player
|
||||
// if the weapons Owner is a player
|
||||
if (wp->owner >= 0 && User[wp->owner].Data() && User[wp->owner]->PlayerP)
|
||||
{
|
||||
// if both on the same team then no damage
|
||||
|
|
@ -9317,10 +9317,6 @@ DoMineRangeTest(short Weapon, short range)
|
|||
sp = &sprite[i];
|
||||
u = User[i].Data();
|
||||
|
||||
// don't detect the owner or the owners bottom half
|
||||
//if (wp->owner == i || (u->PlayerP && (wp->owner == u->PlayerP->PlayerSprite)))
|
||||
// continue;
|
||||
|
||||
DISTANCE(sp->x, sp->y, wp->x, wp->y, dist, tx, ty, tmin);
|
||||
if (dist > range)
|
||||
continue;
|
||||
|
|
@ -10416,7 +10412,6 @@ DoUziBullet(DSWActor* actor)
|
|||
wp->shade = -40;
|
||||
wp->xrepeat = UZI_SPARK_REPEAT;
|
||||
wp->yrepeat = UZI_SPARK_REPEAT;
|
||||
//wp->owner = sp->owner;
|
||||
SetOwner(sp->owner, j);
|
||||
wp->ang = sp->ang;
|
||||
SET(wp->cstat, CSTAT_SPRITE_YCENTER);
|
||||
|
|
@ -10830,7 +10825,7 @@ int SpawnBreakFlames(DSWActor* actor)
|
|||
np->yrepeat = 16;
|
||||
nu->Counter = 48; // max flame size
|
||||
|
||||
//SetOwner(sp->owner, New);
|
||||
|
||||
np->shade = -40;
|
||||
if (u)
|
||||
np->pal = nu->spal = u->spal;
|
||||
|
|
@ -10879,7 +10874,7 @@ SpawnBreakStaticFlames(int16_t SpriteNum)
|
|||
np->yrepeat = 32;
|
||||
//nu->Counter = 48; // max flame size
|
||||
|
||||
//SetOwner(sp->owner, New);
|
||||
|
||||
np->shade = -40;
|
||||
np->pal = nu->spal = u->spal;
|
||||
//SET(np->cstat, CSTAT_SPRITE_YCENTER);
|
||||
|
|
@ -16444,7 +16439,7 @@ InitEnemyStar(DSWActor* actor)
|
|||
|
||||
wu = User[w].Data();
|
||||
|
||||
//wp->owner = SpriteNum;
|
||||
|
||||
SetOwner(SpriteNum, w);
|
||||
wp->yrepeat = 16;
|
||||
wp->xrepeat = 16;
|
||||
|
|
@ -16535,7 +16530,7 @@ InitEnemyCrossbow(DSWActor* actor)
|
|||
|
||||
wu = User[w].Data();
|
||||
|
||||
//wp->owner = SpriteNum;
|
||||
|
||||
SetOwner(SpriteNum, w);
|
||||
wp->xrepeat = 16;
|
||||
wp->yrepeat = 26;
|
||||
|
|
@ -16634,7 +16629,7 @@ InitSkelSpell(DSWActor* actor)
|
|||
wp = &sprite[w];
|
||||
wu = User[w].Data();
|
||||
|
||||
//wp->owner = SpriteNum;
|
||||
|
||||
SetOwner(SpriteNum, w);
|
||||
wp->xrepeat -= 20;
|
||||
wp->yrepeat -= 20;
|
||||
|
|
@ -16689,7 +16684,7 @@ InitCoolgFire(DSWActor* actor)
|
|||
wp = &sprite[w];
|
||||
wu = User[w].Data();
|
||||
|
||||
//wp->owner = SpriteNum;
|
||||
|
||||
SetOwner(SpriteNum, w);
|
||||
wp->hitag = LUMINOUS;
|
||||
wp->yrepeat = 18;
|
||||
|
|
@ -16765,7 +16760,7 @@ InitCoolgDrip(DSWActor* actor)
|
|||
wp = &sprite[w];
|
||||
wu = User[w].Data();
|
||||
|
||||
//wp->owner = SpriteNum;
|
||||
|
||||
SetOwner(actor, &swActors[w]);
|
||||
wp->yrepeat = wp->xrepeat = 20;
|
||||
wp->shade = -5;
|
||||
|
|
@ -16813,7 +16808,7 @@ GenerateDrips(DSWActor* actor)
|
|||
wp = &sprite[w];
|
||||
wu = User[w].Data();
|
||||
|
||||
//wp->owner = SpriteNum;
|
||||
|
||||
SetOwner(SpriteNum, w);
|
||||
wp->yrepeat = wp->xrepeat = 20;
|
||||
wp->shade = -10;
|
||||
|
|
@ -16897,7 +16892,7 @@ InitFireballTrap(DSWActor* actor)
|
|||
wp = &sprite[w];
|
||||
wu = User[w].Data();
|
||||
|
||||
//wp->owner = SpriteNum;
|
||||
|
||||
wp->hitag = LUMINOUS; //Always full brightness
|
||||
SetOwner(SpriteNum, w);
|
||||
wp->xrepeat -= 20;
|
||||
|
|
@ -16937,7 +16932,7 @@ InitBoltTrap(DSWActor* actor)
|
|||
wp = &sprite[w];
|
||||
wu = User[w].Data();
|
||||
|
||||
//wp->owner = SpriteNum;
|
||||
|
||||
SetOwner(SpriteNum, w);
|
||||
wp->yrepeat = 32;
|
||||
wp->xrepeat = 32;
|
||||
|
|
@ -16977,7 +16972,7 @@ InitSpearTrap(short SpriteNum)
|
|||
wp = &sprite[w];
|
||||
wu = User[w].Data();
|
||||
|
||||
//wp->owner = SpriteNum;
|
||||
|
||||
SetOwner(SpriteNum, w);
|
||||
wp->xrepeat = 16;
|
||||
wp->yrepeat = 26;
|
||||
|
|
@ -19317,7 +19312,7 @@ InitEnemyFireball(DSWActor* actor)
|
|||
wp->xrepeat = 20;
|
||||
wp->yrepeat = 20;
|
||||
wp->shade = -40;
|
||||
//wp->owner = SpriteNum;
|
||||
|
||||
SetOwner(SpriteNum, w);
|
||||
wp->zvel = 0;
|
||||
wp->clipdist = 16>>2;
|
||||
|
|
|
|||
Loading…
Reference in a new issue