Shader linking i guess
This commit is contained in:
@@ -18,27 +18,12 @@ void C_MOBAPlayer::Spawn()
|
||||
void C_MOBAPlayer::Think( float fDelta )
|
||||
{
|
||||
|
||||
<<<<<<< HEAD
|
||||
C_MOBAPlayer *pEntity = (C_MOBAPlayer*)UTIL_GetLocalPlayer();
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
=======
|
||||
C_MOBAPlayer *pPlayerEntity = (C_MOBAPlayer*)UTIL_GetLocalPlayer();
|
||||
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> c251089 (different stuff in physics)
|
||||
>>>>>>> a2652ed (merges)
|
||||
m_vMovementVector.z = m_bIsForward - m_bIsBack;
|
||||
m_vMovementVector.x = m_bIsLeft - m_bIsRight;
|
||||
|
||||
if (pEntity == this)
|
||||
=======
|
||||
m_vMovementVector.z = m_bIsBack - m_bIsForward;
|
||||
m_vMovementVector.x = m_bIsRight - m_bIsLeft;
|
||||
|
||||
if (pPlayerEntity == this)
|
||||
>>>>>>> 83e8198 (different stuff in physics)
|
||||
{
|
||||
Vector vCameraPos;
|
||||
vCameraPos = GetAbsOrigin();
|
||||
|
||||
Reference in New Issue
Block a user