Using g_utils.cpp from fakk

This commit is contained in:
smallmodel 2023-08-15 01:27:35 +02:00
parent 0eedc4e2f8
commit c4738966fe
No known key found for this signature in database
GPG key ID: A96F163ED4891440
52 changed files with 2635 additions and 2730 deletions

View file

@ -1227,7 +1227,7 @@ qboolean Player::CondKnockDown(Conditional& condition)
qboolean Player::CondPainType(Conditional& condition)
{
if (pain_type == MOD_NameToNum(condition.getParm(1))) {
if (pain_type == MOD_string_to_int(condition.getParm(1))) {
return qtrue;
} else {
return qfalse;
@ -1588,7 +1588,7 @@ qboolean Player::CondCheckHeight(Conditional& condition)
qboolean Player::CondViewInWater(Conditional& condition)
{
return (gi.PointContents(m_vViewPos, 0) & MASK_WATER) != 0;
return (gi.pointcontents(m_vViewPos, 0) & MASK_WATER) != 0;
}
qboolean Player::CondDuckedViewInWater(Conditional& condition)
@ -1596,7 +1596,7 @@ qboolean Player::CondDuckedViewInWater(Conditional& condition)
Vector vPos = origin;
vPos[2] += 48.0f;
return (gi.PointContents(vPos, 0) & MASK_WATER) != 0;
return (gi.pointcontents(vPos, 0) & MASK_WATER) != 0;
}
qboolean Player::CondCheckMovementSpeed(Conditional& condition)