summaryrefslogtreecommitdiffstats
path: root/src/weapons/ShotInfo.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-12-26 13:22:02 +0100
committerSergeanur <s.anureev@yandex.ua>2020-12-26 13:22:02 +0100
commitc9c447e7a9f9616b111b9d6211ac072e7739ba4c (patch)
tree15b4054d867ea8f60b90550033ccf85cbfc86102 /src/weapons/ShotInfo.cpp
parentfix mblur stencil (diff)
downloadre3-c9c447e7a9f9616b111b9d6211ac072e7739ba4c.tar
re3-c9c447e7a9f9616b111b9d6211ac072e7739ba4c.tar.gz
re3-c9c447e7a9f9616b111b9d6211ac072e7739ba4c.tar.bz2
re3-c9c447e7a9f9616b111b9d6211ac072e7739ba4c.tar.lz
re3-c9c447e7a9f9616b111b9d6211ac072e7739ba4c.tar.xz
re3-c9c447e7a9f9616b111b9d6211ac072e7739ba4c.tar.zst
re3-c9c447e7a9f9616b111b9d6211ac072e7739ba4c.zip
Diffstat (limited to 'src/weapons/ShotInfo.cpp')
-rw-r--r--src/weapons/ShotInfo.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/weapons/ShotInfo.cpp b/src/weapons/ShotInfo.cpp
index ae7b9d2d..a03ed16f 100644
--- a/src/weapons/ShotInfo.cpp
+++ b/src/weapons/ShotInfo.cpp
@@ -78,7 +78,7 @@ CShotInfo::AddShot(CEntity *sourceEntity, eWeaponType weapon, CVector startPos,
gaShotInfo[slot].m_areaAffected.z += CShotInfo::ms_afRandTable[CGeneral::GetRandomNumber() % ARRAY_SIZE(ms_afRandTable)];
}
gaShotInfo[slot].m_areaAffected.Normalise();
- if (weaponInfo->m_bRandSpeed)
+ if (weaponInfo->IsFlagSet(WEAPONFLAG_RAND_SPEED))
gaShotInfo[slot].m_areaAffected *= CShotInfo::ms_afRandTable[CGeneral::GetRandomNumber() % ARRAY_SIZE(ms_afRandTable)] + weaponInfo->m_fSpeed;
else
gaShotInfo[slot].m_areaAffected *= weaponInfo->m_fSpeed;
@@ -119,10 +119,10 @@ CShotInfo::Update()
shot.m_inUse = false;
}
- if (weaponInfo->m_bSlowsDown)
+ if (weaponInfo->IsFlagSet(WEAPONFLAG_SLOWS_DOWN))
shot.m_areaAffected *= pow(0.96, CTimer::GetTimeStep()); // FRAMERATE
- if (weaponInfo->m_bExpands)
+ if (weaponInfo->IsFlagSet(WEAPONFLAG_EXPANDS))
shot.m_radius += 0.075f * CTimer::GetTimeStep();
shot.m_startPos += CTimer::GetTimeStep() * shot.m_areaAffected;