|
30 | 30 | #include "GUI.h"
|
31 | 31 | #include "AllegroBitmap.h"
|
32 | 32 |
|
| 33 | +#include "PrimitiveMan.h" |
| 34 | + |
33 | 35 | #include "tracy/Tracy.hpp"
|
34 | 36 |
|
35 | 37 | namespace RTE {
|
@@ -1730,15 +1732,15 @@ void AHuman::UpdateCrouching() {
|
1730 | 1732 | Vector hitPosStart = (m_pHead->GetPos() + Vector(0.0F, m_SpriteRadius * 0.5F)).Floor();
|
1731 | 1733 | Vector hitPosPredictedStart = (m_pHead->GetPos() + Vector(toPredicted, m_SpriteRadius * 0.5F)).Floor();
|
1732 | 1734 | Vector hitPos, hitPosPredicted;
|
1733 |
| - g_SceneMan.CastStrengthRay(hitPosStart, Vector(0.0F, -desiredCrouchHeadRoom + m_SpriteRadius * -0.5F), 10.0F, hitPos, 0, g_MaterialGrass); |
1734 |
| - g_SceneMan.CastStrengthRay(hitPosPredictedStart, Vector(0.0F, -desiredCrouchHeadRoom + m_SpriteRadius * -0.5F), 10.0F, hitPosPredicted, 0, g_MaterialGrass); |
| 1735 | + g_SceneMan.CastStrengthRay(hitPosStart, Vector(0.0F, -desiredCrouchHeadRoom + m_SpriteRadius * -0.5F), 1.0F, hitPos, 0, g_MaterialGrass); |
| 1736 | + g_SceneMan.CastStrengthRay(hitPosPredictedStart, Vector(0.0F, -desiredCrouchHeadRoom + m_SpriteRadius * -0.5F), 1.0F, hitPosPredicted, 0, g_MaterialGrass); |
1735 | 1737 |
|
1736 | 1738 | // Don't do it if we're already hitting, we're probably in a weird spot
|
1737 |
| - if (hitPosStart == hitPos) { |
| 1739 | + if (hitPosStart.m_Y - hitPos.m_Y <= 2.0F) { |
1738 | 1740 | hitPos.m_X = 0.0F;
|
1739 | 1741 | }
|
1740 | 1742 |
|
1741 |
| - if (hitPosPredictedStart == hitPosPredicted) { |
| 1743 | + if (hitPosPredictedStart.m_Y - hitPosPredicted.m_Y <= 2.0F) { |
1742 | 1744 | hitPosPredicted.m_X = 0.0F;
|
1743 | 1745 | }
|
1744 | 1746 |
|
|
0 commit comments