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

- DoPickTarget.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-01 17:54:18 +01:00
parent f4d813b0c7
commit 8336f689dd
5 changed files with 86 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1044,20 +1044,19 @@ void PrintSpriteInfo(PLAYERp pp)
//if (SpriteInfo && !LocationInfo)
{
short hit_sprite = DoPickTarget(pp->SpriteP, 32, 2);
auto actor = &swActors[hit_sprite];
auto actor = DoPickTarget(pp->Actor(), 32, 2);
sp = &actor->s();
u = actor->u();
sp->hitag = 9997; // Special tag to make the actor glow red for one frame
if (hit_sprite == -1)
if (actor == nullptr)
{
Printf("SPRITENUM: NONE TARGETED\n");
return;
}
else
Printf("SPRITENUM:%d\n", hit_sprite);
Printf("SPRITENUM:%d\n", actor->GetIndex());
if (u)
{

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

@ -1972,7 +1972,7 @@ void EnemyDefaults(DSWActor* actor, ACTOR_ACTION_SETp action, PERSONALITYp perso
void getzrangepoint(int x, int y, int z, short sectnum, int32_t* ceilz, int32_t* ceilhit, int32_t* florz, int32_t* florhit);
int move_sprite(int spritenum, int xchange, int ychange, int zchange, int ceildist, int flordist, uint32_t cliptype, int numtics);
int move_missile(int spritenum, int xchange, int ychange, int zchange, int ceildist, int flordist, uint32_t cliptype, int numtics);
int DoPickTarget(SPRITEp sp, uint32_t max_delta_ang, int skip_targets);
DSWActor* DoPickTarget(DSWActor*, uint32_t max_delta_ang, int skip_targets);
void change_sprite_stat(short, short);
void change_actor_stat(DSWActor* actor, int stat);

20
source/games/sw/src/player.cpp
View file

@ -1130,17 +1130,17 @@ bool
FAFcansee(int32_t xs, int32_t ys, int32_t zs, int16_t sects,
int32_t xe, int32_t ye, int32_t ze, int16_t secte);
int DoPickTarget(SPRITEp sp, uint32_t max_delta_ang, int skip_targets)
DSWActor* DoPickTarget(DSWActor* actor, uint32_t max_delta_ang, int skip_targets)
{
const int PICK_DIST = 40000;
int i;
auto sp = &actor->s();
short angle2, delta_ang;
int dist, zh;
SPRITEp ep;
USERp eu;
int16_t* shp;
USERp u = User[sp - sprite].Data();
USERp u = actor->u();
int ezh, ezhl, ezhm;
unsigned ndx;
TARGET_SORTp ts;
@ -1154,14 +1154,14 @@ int DoPickTarget(SPRITEp sp, uint32_t max_delta_ang, int skip_targets)
for (shp = StatDamageList; shp < &StatDamageList[SIZ(StatDamageList)]; shp++)
{
StatIterator it(*shp);
while ((i = it.NextIndex()) >= 0)
SWStatIterator it(*shp);
while (auto itActor = it.Next())
{
ep = &sprite[i];
eu = User[i].Data();
ep = &itActor->s();
eu = itActor->u();
// don't pick yourself
if (i == (sp - sprite))
if (actor == itActor)
continue;
if (skip_targets != 2) // Used for spriteinfo mode
@ -1232,7 +1232,7 @@ int DoPickTarget(SPRITEp sp, uint32_t max_delta_ang, int skip_targets)
}
ts = &TargetSort[ndx];
ts->sprite_num = i;
ts->sprite_num = itActor->GetSpriteIndex();
ts->dang = delta_ang;
ts->dist = dist;
// gives a value between 0 and 65535
@ -1251,7 +1251,7 @@ int DoPickTarget(SPRITEp sp, uint32_t max_delta_ang, int skip_targets)
if (TargetSortCount > 1)
qsort(&TargetSort, TargetSortCount, sizeof(TARGET_SORT), CompareTarget);
return TargetSort[0].sprite_num;
return TargetSort[0].sprite_num == -1? nullptr : &swActors[TargetSort[0].sprite_num];
}
void DoPlayerResetMovement(PLAYERp pp)

5
source/games/sw/src/swactor.h
View file

@ -37,6 +37,11 @@ public:
return User[index].Data();
}
int GetIndex()
{
return s().time;
}
int GetSpriteIndex() const
{
return index;

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

@ -8199,7 +8199,7 @@ int PickEnemyTarget(SPRITEp sp, short aware_range)
{
TARGET_SORTp ts;
DoPickTarget(sp, aware_range, false);
DoPickTarget(&swActors[sp - sprite], aware_range, false);
for (ts = TargetSort; ts < &TargetSort[TargetSortCount]; ts++)
{
@ -8218,8 +8218,9 @@ int PickEnemyTarget(SPRITEp sp, short aware_range)
int
MissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/*, int16_t dang_shift, int16_t turn_limit, int16_t z_limit*/)
{
SPRITEp sp = &sprite[Weapon];
USERp u = User[Weapon].Data();
auto actor = &swActors[Weapon];
SPRITEp sp = &actor->s();
USERp u = actor->u();
int zh;
short ang2tgt, delta_ang;
@ -8233,10 +8234,12 @@ MissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/*, int16_t d
{
if (u->WaitTics > delay_tics)
{
short hit_sprite;
DSWActor* hitActor;
int hit_target;
if (TEST(u->Flags2, SPR2_DONT_TARGET_OWNER))
{
int hit_sprite;
if ((hit_sprite = PickEnemyTarget(sp, aware_range)) != -1)
{
USERp hu = User[hit_sprite].Data();
@ -8246,11 +8249,11 @@ MissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/*, int16_t d
SET(hu->Flags, SPR_ATTACKED);
}
}
else if ((hit_sprite = DoPickTarget(sp, aware_range, false)) != -1)
else if ((hitActor = DoPickTarget(actor, aware_range, false)) != nullptr)
{
USERp hu = User[hit_sprite].Data();
USERp hu = actor->u();
u->WpnGoal = hit_sprite;
u->WpnGoal = hitActor->GetSpriteIndex();
SET(hu->Flags, SPR_TARGETED);
SET(hu->Flags, SPR_ATTACKED);
}
@ -8301,8 +8304,9 @@ MissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/*, int16_t d
int
ComboMissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/*, int16_t dang_shift, int16_t turn_limit, int16_t z_limit*/)
{
SPRITEp sp = &sprite[Weapon];
USERp u = User[Weapon].Data();
auto actor = &swActors[Weapon];
SPRITEp sp = &actor->s();
USERp u = actor->u();
int dist;
int zh;
@ -8317,13 +8321,13 @@ ComboMissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/*, int1
{
if (u->WaitTics > delay_tics)
{
short hit_sprite;
DSWActor* hitActor;
if ((hit_sprite = DoPickTarget(sp, aware_range, false)) != -1)
if ((hitActor = DoPickTarget(actor, aware_range, false)) != nullptr)
{
USERp hu = User[hit_sprite].Data();
USERp hu = actor->u();
u->WpnGoal = hit_sprite;
u->WpnGoal = hitActor->GetSpriteIndex();
SET(hu->Flags, SPR_TARGETED);
SET(hu->Flags, SPR_ATTACKED);
}
@ -8369,8 +8373,9 @@ ComboMissileSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range/*, int1
int
VectorMissileSeek(int16_t Weapon, int16_t delay_tics, int16_t turn_speed, int16_t aware_range1, int16_t aware_range2)
{
SPRITEp sp = &sprite[Weapon];
USERp u = User[Weapon].Data();
auto actor = &swActors[Weapon];
SPRITEp sp = &actor->s();
USERp u = actor->u();
int dist;
int zh;
@ -8407,19 +8412,19 @@ VectorMissileSeek(int16_t Weapon, int16_t delay_tics, int16_t turn_speed, int16_
}
else
{
if ((hit_sprite = DoPickTarget(sp, aware_range1, false)) != -1)
{
USERp hu = User[hit_sprite].Data();
DSWActor* hitActor;
u->WpnGoal = hit_sprite;
if ((hitActor = DoPickTarget(actor, aware_range1, false)) != nullptr)
{
USERp hu = actor->u();
u->WpnGoal = hitActor->GetSpriteIndex();
SET(hu->Flags, SPR_TARGETED);
SET(hu->Flags, SPR_ATTACKED);
}
else if ((hit_sprite = DoPickTarget(sp, aware_range2, false)) != -1)
else if ((hitActor = DoPickTarget(actor, aware_range2, false)) != nullptr)
{
USERp hu = User[hit_sprite].Data();
u->WpnGoal = hit_sprite;
USERp hu = actor->u();
u->WpnGoal = hitActor->GetSpriteIndex();
SET(hu->Flags, SPR_TARGETED);
SET(hu->Flags, SPR_ATTACKED);
}
@ -8462,8 +8467,9 @@ VectorMissileSeek(int16_t Weapon, int16_t delay_tics, int16_t turn_speed, int16_
int
VectorWormSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range1, int16_t aware_range2)
{
SPRITEp sp = &sprite[Weapon];
USERp u = User[Weapon].Data();
auto actor = &swActors[Weapon];
SPRITEp sp = &actor->s();
USERp u = actor->u();
int dist;
int zh;
@ -8477,21 +8483,18 @@ VectorWormSeek(int16_t Weapon, int16_t delay_tics, int16_t aware_range1, int16_t
{
if (u->WaitTics > delay_tics)
{
short hit_sprite;
if ((hit_sprite = DoPickTarget(sp, aware_range1, false)) != -1)
DSWActor* hitActor;
if ((hitActor = DoPickTarget(actor, aware_range1, false)) != nullptr)
{
USERp hu = User[hit_sprite].Data();
u->WpnGoal = hit_sprite;
USERp hu = actor->u();
u->WpnGoal = hitActor->GetSpriteIndex();
SET(hu->Flags, SPR_TARGETED);
SET(hu->Flags, SPR_ATTACKED);
}
else if ((hit_sprite = DoPickTarget(sp, aware_range2, false)) != -1)
else if ((hitActor = DoPickTarget(actor, aware_range2, false)) != nullptr)
{
USERp hu = User[hit_sprite].Data();
u->WpnGoal = hit_sprite;
USERp hu = actor->u();
u->WpnGoal = hitActor->GetSpriteIndex();
SET(hu->Flags, SPR_TARGETED);
SET(hu->Flags, SPR_ATTACKED);
}
@ -13902,13 +13905,12 @@ InitMiniSumoClap(short SpriteNum)
return 0;
}
int
WeaponAutoAim(SPRITEp sp, short Missile, short ang, bool test)
int WeaponAutoAim(SPRITEp sp, short Missile, short ang, bool test)
{
auto actor = &swActors[sp - sprite];
USERp u = actor->u();
USERp wu = User[Missile].Data();
USERp u = User[sp - sprite].Data();
SPRITEp wp = &sprite[Missile];
short hit_sprite = -1;
int dist;
int zh;
@ -13929,12 +13931,13 @@ WeaponAutoAim(SPRITEp sp, short Missile, short ang, bool test)
}
}
if ((hit_sprite = DoPickTarget(sp, ang, test)) != -1)
DSWActor* hitActor;
if ((hitActor = DoPickTarget(actor, ang, test)) != nullptr)
{
SPRITEp hp = &sprite[hit_sprite];
USERp hu = User[hit_sprite].Data();
SPRITEp hp = &hitActor->s();
USERp hu = hitActor->u();
wu->WpnGoal = hit_sprite;
wu->WpnGoal = hitActor->GetSpriteIndex();
SET(hu->Flags, SPR_TARGETED);
SET(hu->Flags, SPR_ATTACKED);
@ -13967,18 +13970,20 @@ WeaponAutoAim(SPRITEp sp, short Missile, short ang, bool test)
wp->zvel = (wp->xvel * (zh - wp->z)) / dist;
#endif
}
return hitActor->GetSpriteIndex();
}
return hit_sprite;
return -1;
}
int
WeaponAutoAimZvel(SPRITEp sp, short Missile, int *zvel, short ang, bool test)
{
auto actor = &swActors[sp - sprite];
USERp u = actor->u();
USERp wu = User[Missile].Data();
USERp u = User[sp - sprite].Data();
SPRITEp wp = &sprite[Missile];
short hit_sprite = -1;
int dist;
int zh;
@ -13999,12 +14004,13 @@ WeaponAutoAimZvel(SPRITEp sp, short Missile, int *zvel, short ang, bool test)
}
}
if ((hit_sprite = DoPickTarget(sp, ang, test)) != -1)
DSWActor* hitActor;
if ((hitActor = DoPickTarget(actor, ang, test)) != nullptr)
{
SPRITEp hp = &sprite[hit_sprite];
USERp hu = User[hit_sprite].Data();
SPRITEp hp = &hitActor->s();
USERp hu = hitActor->u();
wu->WpnGoal = hit_sprite;
wu->WpnGoal = hitActor->GetSpriteIndex();
SET(hu->Flags, SPR_TARGETED);
SET(hu->Flags, SPR_ATTACKED);
@ -14037,9 +14043,10 @@ WeaponAutoAimZvel(SPRITEp sp, short Missile, int *zvel, short ang, bool test)
wp->zvel = (wp->xvel * (zh - wp->z)) / dist;
#endif
}
return hitActor->GetSpriteIndex();
}
return hit_sprite;
return -1;
}
@ -14065,7 +14072,6 @@ AimHitscanToTarget(SPRITEp sp, int *z, short *ang, int z_ratio)
SET(hu->Flags, SPR_TARGETED);
SET(hu->Flags, SPR_ATTACKED);
// Global set by DoPickTarget
*ang = getangle(hp->x - sp->x, hp->y - sp->y);
// find the distance to the target
@ -14103,8 +14109,8 @@ AimHitscanToTarget(SPRITEp sp, int *z, short *ang, int z_ratio)
int
WeaponAutoAimHitscan(SPRITEp sp, int *z, short *ang, bool test)
{
USERp u = User[sp - sprite].Data();
short hit_sprite = -1;
auto actor = &swActors[sp - sprite];
USERp u = actor->u();
int dist;
int zh;
int xvect;
@ -14118,16 +14124,15 @@ WeaponAutoAimHitscan(SPRITEp sp, int *z, short *ang, bool test)
}
}
if ((hit_sprite = DoPickTarget(sp, *ang, test)) != -1)
DSWActor* hitActor;
if ((hitActor = DoPickTarget(actor, *ang, test)) != nullptr)
{
SPRITEp hp = &sprite[hit_sprite];
USERp hu = User[hit_sprite].Data();
SPRITEp hp = &hitActor->s();
USERp hu = hitActor->u();
SET(hu->Flags, SPR_TARGETED);
SET(hu->Flags, SPR_ATTACKED);
// Global set by DoPickTarget
//*ang = target_ang;
*ang = NORM_ANGLE(getangle(hp->x - sp->x, hp->y - sp->y));
// find the distance to the target
@ -14151,7 +14156,7 @@ WeaponAutoAimHitscan(SPRITEp sp, int *z, short *ang, bool test)
}
}
return hit_sprite;
return hitActor == nullptr? -1 : hitActor->GetSpriteIndex();
}
void
@ -14164,8 +14169,6 @@ WeaponHitscanShootFeet(SPRITEp sp, SPRITEp hp, int *zvect)
int z;
short ang;
// Global set by DoPickTarget
//*ang = target_ang;
ang = NORM_ANGLE(getangle(hp->x - sp->x, hp->y - sp->y));
// find the distance to the target
@ -15464,7 +15467,7 @@ InitMicro(PLAYERp pp)
#define MAX_MICRO 1
DoPickTarget(pp->SpriteP, 256, false);
DoPickTarget(pp->Actor(), 256, false);
if (TargetSortCount > MAX_MICRO)
TargetSortCount = MAX_MICRO;
@ -17838,7 +17841,7 @@ InitTurretMicro(short SpriteNum, PLAYERp pp)
#define MAX_TURRET_MICRO 10
DoPickTarget(pp->SpriteP, 256, false);
DoPickTarget(pp->Actor(), 256, false);
if (TargetSortCount > MAX_TURRET_MICRO)
TargetSortCount = MAX_TURRET_MICRO;