Skip to content

Commit

Permalink
convarref misspelings
Browse files Browse the repository at this point in the history
  • Loading branch information
AdamTadeusz committed Sep 20, 2024
1 parent b73db31 commit 7518d34
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
18 changes: 9 additions & 9 deletions mp/src/game/client/neo/ui/neo_root_settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ void NeoSettingsRestore(NeoSettings *ns)
pGeneral->bAimHold = neo_aim_hold.GetBool();
pGeneral->bReloadEmpty = cl_autoreload_when_empty.GetBool();
pGeneral->bViewmodelRighthand = cl_righthand.GetBool();
pGeneral->bShowPlayerSprays = !(cvr->cl_player_spray_disable.GetBool()); // Inverse
pGeneral->bShowPlayerSprays = !(cvr->cl_playerspraydisable.GetBool()); // Inverse
pGeneral->bShowPos = cl_showpos.GetBool();
pGeneral->iShowFps = cl_showfps.GetInt();
{
const char *szDlFilter = cvr->cl_download_filter.GetString();
const char *szDlFilter = cvr->cl_downloadfilter.GetString();
pGeneral->iDlFilter = 0;
for (int i = 0; i < ARRAYSIZE(DLFILTER_STRMAP); ++i)
{
Expand All @@ -209,9 +209,9 @@ void NeoSettingsRestore(NeoSettings *ns)
{
NeoSettings::Mouse *pMouse = &ns->mouse;
pMouse->flSensitivity = sensitivity.GetFloat();
pMouse->bRawInput = cvr->m_raw_input.GetBool();
pMouse->bRawInput = cvr->m_rawinput.GetBool();
pMouse->bFilter = cvr->m_filter.GetBool();
pMouse->bReverse = (cvr->pitch.GetFloat() < 0.0f);
pMouse->bReverse = (cvr->m_pitch.GetFloat() < 0.0f);
pMouse->bCustomAccel = (cvr->m_customaccel.GetInt() == 3);
pMouse->flExponent = cvr->m_customaccel_exponent.GetFloat();
}
Expand Down Expand Up @@ -342,10 +342,10 @@ void NeoSettingsSave(const NeoSettings *ns)
neo_aim_hold.SetValue(pGeneral->bAimHold);
cl_autoreload_when_empty.SetValue(pGeneral->bReloadEmpty);
cl_righthand.SetValue(pGeneral->bViewmodelRighthand);
cvr->cl_player_spray_disable.SetValue(!pGeneral->bShowPlayerSprays); // Inverse
cvr->cl_playerspraydisable.SetValue(!pGeneral->bShowPlayerSprays); // Inverse
cl_showpos.SetValue(pGeneral->bShowPos);
cl_showfps.SetValue(pGeneral->iShowFps);
cvr->cl_download_filter.SetValue(DLFILTER_STRMAP[pGeneral->iDlFilter]);
cvr->cl_downloadfilter.SetValue(DLFILTER_STRMAP[pGeneral->iDlFilter]);
}
{
const NeoSettings::Keys *pKeys = &ns->keys;
Expand Down Expand Up @@ -378,10 +378,10 @@ void NeoSettingsSave(const NeoSettings *ns)
{
const NeoSettings::Mouse *pMouse = &ns->mouse;
sensitivity.SetValue(pMouse->flSensitivity);
cvr->m_raw_input.SetValue(pMouse->bRawInput);
cvr->m_rawinput.SetValue(pMouse->bRawInput);
cvr->m_filter.SetValue(pMouse->bFilter);
const float absPitch = abs(cvr->pitch.GetFloat());
cvr->pitch.SetValue(pMouse->bReverse ? -absPitch : absPitch);
const float absPitch = abs(cvr->m_pitch.GetFloat());
cvr->m_pitch.SetValue(pMouse->bReverse ? -absPitch : absPitch);
cvr->m_customaccel.SetValue(pMouse->bCustomAccel ? 3 : 0);
cvr->m_customaccel_exponent.SetValue(pMouse->flExponent);
}
Expand Down
8 changes: 4 additions & 4 deletions mp/src/game/client/neo/ui/neo_root_settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ struct NeoSettings
struct CVR
{
// Multiplayer
CONVARREF_DEF(cl_player_spray_disable);
CONVARREF_DEF(cl_download_filter);
CONVARREF_DEF(cl_playerspraydisable);
CONVARREF_DEF(cl_downloadfilter);

// Mouse
CONVARREF_DEF(m_filter);
CONVARREF_DEF(pitch);
CONVARREF_DEF(m_pitch);
CONVARREF_DEF(m_customaccel);
CONVARREF_DEF(m_customaccel_exponent);
CONVARREF_DEF(m_raw_input);
CONVARREF_DEF(m_rawinput);

// Audio
CONVARREF_DEF(volume);
Expand Down

0 comments on commit 7518d34

Please sign in to comment.