Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix crossbow bolts firing at the wrong angle while underwater #208

Closed
wants to merge 1 commit into from
Closed

Fix crossbow bolts firing at the wrong angle while underwater #208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions dlls/crossbow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,18 @@ class CCrossbowBolt : public CBaseEntity
int m_iTrail;

public:
static CCrossbowBolt* BoltCreate();
static CCrossbowBolt* BoltCreate(Vector vecOrigin, Vector vecAngles, CBaseEntity* pOwner);
};
LINK_ENTITY_TO_CLASS(crossbow_bolt, CCrossbowBolt);

CCrossbowBolt* CCrossbowBolt::BoltCreate()
CCrossbowBolt* CCrossbowBolt::BoltCreate(Vector vecOrigin, Vector vecAngles, CBaseEntity* pOwner)
{
// Create a new entity with CCrossbowBolt private data
CCrossbowBolt* pBolt = GetClassPtr((CCrossbowBolt*)NULL);
pBolt->pev->classname = MAKE_STRING("bolt");
pBolt->pev->origin = vecOrigin;
pBolt->pev->angles = vecAngles;
pBolt->pev->owner = pOwner->edict();
pBolt->Spawn();

return pBolt;
Expand Down Expand Up @@ -385,10 +388,7 @@ void CCrossbow::FireBolt()
Vector vecDir = gpGlobals->v_forward;

#ifndef CLIENT_DLL
CCrossbowBolt* pBolt = CCrossbowBolt::BoltCreate();
pBolt->pev->origin = vecSrc;
pBolt->pev->angles = anglesAim;
pBolt->pev->owner = m_pPlayer->edict();
CCrossbowBolt* pBolt = CCrossbowBolt::BoltCreate(vecSrc, anglesAim, m_pPlayer);

if (m_pPlayer->pev->waterlevel == 3)
{
Expand Down