zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 20:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- renamed variable to match its main purpose.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-09 22:08:53 +02:00
parent 8137718133
commit 5365066c05
5 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/exhumed/src/gun.cpp
View file

@ -814,8 +814,8 @@ loc_flag:
BuildSnake(nPlayer, nHeight);
nQuake[nPlayer] = 2.;
PlayerList[nPlayer].nDamage.X -= bcos(pPlayerActor->int_ang(), 9);
PlayerList[nPlayer].nDamage.Y -= bsin(pPlayerActor->int_ang(), 9);
PlayerList[nPlayer].nThrust.X -= bcos(pPlayerActor->int_ang(), 9);
PlayerList[nPlayer].nThrust.Y -= bsin(pPlayerActor->int_ang(), 9);
break;
}
case kWeaponRing:

8
source/games/exhumed/src/move.cpp
View file

@ -430,12 +430,12 @@ Collision movesprite(DExhumedActor* pActor, int dx, int dy, int dz, int ceildist
if (varB || varA)
{
PlayerList[nPlayer].nDamage.X = varB;
PlayerList[nPlayer].nDamage.Y = varA;
PlayerList[nPlayer].nThrust.X = varB;
PlayerList[nPlayer].nThrust.Y = varA;
}
dx += PlayerList[nPlayer].nDamage.X;
dy += PlayerList[nPlayer].nDamage.Y;
dx += PlayerList[nPlayer].nThrust.X;
dy += PlayerList[nPlayer].nThrust.Y;
}
else
{

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

@ -369,8 +369,8 @@ void RestartPlayer(int nPlayer)
nTemperature[nPlayer] = 0;
plr->nDamage.Y = 0;
plr->nDamage.X = 0;
plr->nThrust.Y = 0;
plr->nThrust.X = 0;
plr->nDestVertPan = plr->horizon.ohoriz = plr->horizon.horiz = q16horiz(0);
plr->nBreathTimer = 90;
@ -895,8 +895,8 @@ void AIPlayer::Tick(RunListEvent* ev)
if (bUnderwater)
{
PlayerList[nPlayer].nDamage.X /= 2;
PlayerList[nPlayer].nDamage.Y /= 2;
PlayerList[nPlayer].nThrust.X /= 2;
PlayerList[nPlayer].nThrust.Y /= 2;
}
// Trigger Ramses?
@ -941,8 +941,8 @@ void AIPlayer::Tick(RunListEvent* ev)
if (bTouchFloor)
{
// Damage stuff..
PlayerList[nPlayer].nDamage.X /= 2;
PlayerList[nPlayer].nDamage.Y /= 2;
PlayerList[nPlayer].nThrust.X /= 2;
PlayerList[nPlayer].nThrust.Y /= 2;
if (nPlayer == nLocalPlayer)
{
@ -2510,8 +2510,8 @@ sectdone:
if (!PlayerList[nPlayer].nHealth)
{
PlayerList[nPlayer].nDamage.Y = 0;
PlayerList[nPlayer].nDamage.X = 0;
PlayerList[nPlayer].nThrust.Y = 0;
PlayerList[nPlayer].nThrust.X = 0;
if (PlayerList[nPlayer].eyelevel >= -11)
{
@ -2604,8 +2604,8 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, Player& w, Player*
("dx", w.nPlayerD.X)
("dy", w.nPlayerD.Y)
("pistolclip", w.nPistolClip)
("xdamage", w.nDamage.X)
("ydamage", w.nDamage.Y)
("thrustx", w.nThrust.X)
("thrusty", w.nThrust.Y)
("dopplesprite", w.pDoppleSprite)
("oldweapon", w.nPlayerOldWeapon)
("clip", w.nPlayerClip)

2
source/games/exhumed/src/player.h
View file

@ -92,7 +92,7 @@ struct Player
int16_t nPlayerScore;
int16_t nPlayerColor;
int16_t nPistolClip;
vec2_t nPlayerD, nDamage;
vec2_t nPlayerD, nThrust;
int16_t nPlayerOldWeapon;
int16_t nPlayerClip;
int16_t nPlayerPushSound;

4
source/games/exhumed/src/rex.cpp
View file

@ -336,8 +336,8 @@ void AIRex::Tick(RunListEvent* ev)
if (pHitActor->spr.statnum == 100)
{
auto nPlayer = GetPlayerFromActor(nMov.actor());
PlayerList[nPlayer].nDamage.X += (int(vel.X * worldtoint) << 4);
PlayerList[nPlayer].nDamage.Y += (int(vel.Y * worldtoint) << 4);
PlayerList[nPlayer].nThrust.X += (int(vel.X * worldtoint) << 4);
PlayerList[nPlayer].nThrust.Y += (int(vel.Y * worldtoint) << 4);
pHitActor->vel.Z = -14;
}
else