Skip to content

Commit 4300cdf

Browse files
committed
Fix trigger_motion resetting the entity's angular velocity when it's not intended
1 parent d55ac04 commit 4300cdf

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

dlls/triggers.cpp

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6011,21 +6011,24 @@ void CTriggerMotion::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYP
60116011

60126012
vecTemp = g_vecZero;
60136013

6014-
switch (m_iAVelMode)
6014+
if (!FStringNull(m_iszAVelocity))
60156015
{
6016-
case AVELMODE_SET:
6017-
UTIL_StringToRandomVector( vecTemp, STRING(m_iszAVelocity) );
6018-
if (debug)
6019-
Motion_PrintVectors("DEBUG: Set avelocity", pTarget->pev->avelocity, vecTemp);
6020-
pTarget->pev->avelocity = vecTemp;
6021-
break;
6022-
case AVELMODE_ADD:
6023-
UTIL_StringToRandomVector( vecTemp, STRING(m_iszAVelocity) );
6024-
vecOld = pTarget->pev->avelocity;
6025-
pTarget->pev->avelocity = vecOld + vecTemp;
6026-
if (debug)
6027-
Motion_PrintVectors("DEBUG: Set avelocity", vecOld, pTarget->pev->avelocity);
6028-
break;
6016+
switch (m_iAVelMode)
6017+
{
6018+
case AVELMODE_SET:
6019+
UTIL_StringToRandomVector( vecTemp, STRING(m_iszAVelocity) );
6020+
if (debug)
6021+
Motion_PrintVectors("DEBUG: Set avelocity", pTarget->pev->avelocity, vecTemp);
6022+
pTarget->pev->avelocity = vecTemp;
6023+
break;
6024+
case AVELMODE_ADD:
6025+
UTIL_StringToRandomVector( vecTemp, STRING(m_iszAVelocity) );
6026+
vecOld = pTarget->pev->avelocity;
6027+
pTarget->pev->avelocity = vecOld + vecTemp;
6028+
if (debug)
6029+
Motion_PrintVectors("DEBUG: Set avelocity", vecOld, pTarget->pev->avelocity);
6030+
break;
6031+
}
60296032
}
60306033
}
60316034

0 commit comments

Comments
 (0)