zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: Rename some weapon function variables to give us half a chance of refactoring it.

Browse source
This commit is contained in:
Mitchell Richters 2022-09-25 23:11:26 +10:00 committed by Christoph Oelckers
parent cea0e74299
commit 633fb01487
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
source/games/blood/src/actor.cpp
View file

@ -6352,12 +6352,12 @@ DBloodActor* actSpawnThing(sectortype* pSector, int x, int y, int z, int nThingT
//
//---------------------------------------------------------------------------
DBloodActor* actFireThing(DBloodActor* actor, int a2, int a3, int a4, int thingType, int a6)
DBloodActor* actFireThing(DBloodActor* actor, int xyoff, int zoff, int zvel, int thingType, int nSpeed)
{
assert(thingType >= kThingBase && thingType < kThingMax);
int x = actor->int_pos().X + MulScale(a2, Cos(actor->int_ang() + 512), 30);
int y = actor->int_pos().Y + MulScale(a2, Sin(actor->int_ang() + 512), 30);
int z = actor->int_pos().Z + a3;
int x = actor->int_pos().X + MulScale(xyoff, Cos(actor->int_ang() + 512), 30);
int y = actor->int_pos().Y + MulScale(xyoff, Sin(actor->int_ang() + 512), 30);
int z = actor->int_pos().Z + zoff;
x += MulScale(actor->native_clipdist(), Cos(actor->int_ang()), 28);
y += MulScale(actor->native_clipdist(), Sin(actor->int_ang()), 28);
if (HitScan(actor, z, x - actor->int_pos().X, y - actor->int_pos().Y, 0, CLIPMASK0, actor->native_clipdist()) != -1)
@ -6368,9 +6368,9 @@ DBloodActor* actFireThing(DBloodActor* actor, int a2, int a3, int a4, int thingT
auto fired = actSpawnThing(actor->sector(), x, y, z, thingType);
fired->SetOwner(actor);
fired->spr.angle = actor->spr.angle;
fired->set_int_bvel_x(MulScale(a6, Cos(fired->int_ang()), 30));
fired->set_int_bvel_y(MulScale(a6, Sin(fired->int_ang()), 30));
fired->set_int_bvel_z(MulScale(a6, a4, 14));
fired->set_int_bvel_x(MulScale(nSpeed, Cos(fired->int_ang()), 30));
fired->set_int_bvel_y(MulScale(nSpeed, Sin(fired->int_ang()), 30));
fired->set_int_bvel_z(MulScale(nSpeed, zvel, 14));
fired->vel += actor->vel * 0.5;
return fired;
}
@ -6462,15 +6462,15 @@ void actBuildMissile(DBloodActor* spawned, DBloodActor* actor)
//
//---------------------------------------------------------------------------
DBloodActor* actFireMissile(DBloodActor* actor, int a2, int a3, int a4, int a5, int a6, int nType)
DBloodActor* actFireMissile(DBloodActor* actor, int xyoff, int zoff, int dx, int dy, int dz, int nType)
{
assert(nType >= kMissileBase && nType < kMissileMax);
bool impact = false;
const MissileType* pMissileInfo = &missileInfo[nType - kMissileBase];
int x = actor->int_pos().X + MulScale(a2, Cos(actor->int_ang() + 512), 30);
int y = actor->int_pos().Y + MulScale(a2, Sin(actor->int_ang() + 512), 30);
int z = actor->int_pos().Z + a3;
int x = actor->int_pos().X + MulScale(xyoff, Cos(actor->int_ang() + 512), 30);
int y = actor->int_pos().Y + MulScale(xyoff, Sin(actor->int_ang() + 512), 30);
int z = actor->int_pos().Z + zoff;
int clipdist = pMissileInfo->clipDist + actor->native_clipdist();
x += MulScale(clipdist, Cos(actor->int_ang()), 28);
y += MulScale(clipdist, Sin(actor->int_ang()), 28);
@ -6502,9 +6502,9 @@ DBloodActor* actFireMissile(DBloodActor* actor, int a2, int a3, int a4, int a5,
spawned->spr.yrepeat = pMissileInfo->yrepeat;
spawned->spr.picnum = pMissileInfo->picnum;
spawned->set_int_ang((actor->int_ang() + pMissileInfo->angleOfs) & 2047);
spawned->set_int_bvel_x(MulScale(pMissileInfo->velocity, a4, 14));
spawned->set_int_bvel_y(MulScale(pMissileInfo->velocity, a5, 14));
spawned->set_int_bvel_z(MulScale(pMissileInfo->velocity, a6, 14));
spawned->set_int_bvel_x(MulScale(pMissileInfo->velocity, dx, 14));
spawned->set_int_bvel_y(MulScale(pMissileInfo->velocity, dy, 14));
spawned->set_int_bvel_z(MulScale(pMissileInfo->velocity, dz, 14));
spawned->SetOwner(actor);
spawned->spr.cstat |= CSTAT_SPRITE_BLOCK;
spawned->SetTarget(nullptr);

4
source/games/blood/src/actor.h
View file

@ -226,8 +226,8 @@ DBloodActor* actSpawnSprite(sectortype* pSector, const DVector3& pos, int nStat,
DBloodActor* actSpawnDude(DBloodActor* pSource, int nType, int a3, int a4);
DBloodActor * actSpawnSprite(DBloodActor *pSource, int nStat);
DBloodActor * actSpawnThing(sectortype* pSector, int x, int y, int z, int nThingType);
DBloodActor* actFireThing(DBloodActor* pSprite, int a2, int a3, int a4, int thingType, int a6);
DBloodActor* actFireMissile(DBloodActor *pSprite, int a2, int a3, int a4, int a5, int a6, int nType);
DBloodActor* actFireThing(DBloodActor* actor, int xyoff, int zoff, int zvel, int thingType, int nSpeed);
DBloodActor* actFireMissile(DBloodActor* actor, int xyoff, int zoff, int dx, int dy, int dz, int nType);
void actBurnSprite(DBloodActor* pSource, DBloodActor* pTarget, int nTime);

8
source/games/blood/src/player.cpp
View file

@ -1912,15 +1912,15 @@ void playerProcess(PLAYER* pPlayer)
//
//---------------------------------------------------------------------------
DBloodActor* playerFireMissile(PLAYER* pPlayer, int a2, int a3, int a4, int a5, int a6)
DBloodActor* playerFireMissile(PLAYER* pPlayer, int xyoff, int dx, int dy, int dz, int nType)
{
return actFireMissile(pPlayer->actor, a2, pPlayer->zWeapon * zworldtoint - pPlayer->actor->int_pos().Z, a3, a4, a5, a6);
return actFireMissile(pPlayer->actor, xyoff, pPlayer->zWeapon * zworldtoint - pPlayer->actor->int_pos().Z, dx, dy, dz, nType);
}
DBloodActor* playerFireThing(PLAYER* pPlayer, int a2, int a3, int thingType, int a5)
DBloodActor* playerFireThing(PLAYER* pPlayer, int xyoff, int zvel, int thingType, int nSpeed)
{
assert(thingType >= kThingBase && thingType < kThingMax);
return actFireThing(pPlayer->actor, a2, pPlayer->zWeapon * zworldtoint - pPlayer->actor->int_pos().Z, pPlayer->slope + a3, thingType, a5);
return actFireThing(pPlayer->actor, xyoff, pPlayer->zWeapon * zworldtoint - pPlayer->actor->int_pos().Z, pPlayer->slope + zvel, thingType, nSpeed);
}
//---------------------------------------------------------------------------

4
source/games/blood/src/player.h
View file

@ -236,8 +236,8 @@ void playerInit(int nPlayer, unsigned int a2);
void CheckPickUp(PLAYER* pPlayer);
void ProcessInput(PLAYER* pPlayer);
void playerProcess(PLAYER* pPlayer);
DBloodActor* playerFireMissile(PLAYER* pPlayer, int a2, int a3, int a4, int a5, int a6);
DBloodActor* playerFireThing(PLAYER* pPlayer, int a2, int a3, int thingType, int a5);
DBloodActor* playerFireMissile(PLAYER* pPlayer, int xyoff, int dx, int dy, int dz, int nType);
DBloodActor* playerFireThing(PLAYER* pPlayer, int xyoff, int zvel, int thingType, int nSpeed);
void playerFrag(PLAYER* pKiller, PLAYER* pVictim);
int playerDamageArmor(PLAYER* pPlayer, DAMAGE_TYPE nType, int nDamage);
int playerDamageSprite(DBloodActor* nSource, PLAYER* pPlayer, DAMAGE_TYPE nDamageType, int nDamage);