Skip to content

Commit 5536977

Browse files
committed
Code review change 2
Use C++ style var copy, use V_* for atoi atof
1 parent f8c2bf1 commit 5536977

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

src/game/shared/neo/neo_crosshair.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void ResetCrosshairToDefault(CrosshairInfo *xhairInfo,
209209
crh->colorOutline = COLOR_BLACK;
210210
for (int i = 1; i < CROSSHAIR_WEP__TOTAL; ++i)
211211
{
212-
V_memcpy(&(xhairInfo->wep[i]), crh, sizeof(CrosshairWepInfo));
212+
xhairInfo->wep[i] = *crh;
213213
}
214214
if (paeHipfireOpts)
215215
{

src/game/shared/neo/neo_serial.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ static SerialVariant DeserialVariant(char (&szMutStr)[NEO_XHAIR_SEQMAX], const i
3535
int *idx, const ESerialVariantType eType, const SerialVariant varDefault, int *piSkipIdx,
3636
const SerialVariant varMin, const SerialVariant varMax)
3737
{
38-
SerialVariant var = {};
39-
V_memcpy(&var, &varDefault, sizeof(SerialVariant));
38+
SerialVariant var = varDefault;
4039
if (*piSkipIdx > 0)
4140
{
4241
--(*piSkipIdx);
@@ -61,23 +60,23 @@ static SerialVariant DeserialVariant(char (&szMutStr)[NEO_XHAIR_SEQMAX], const i
6160
{
6261
case SERIALVARIANTTYPE_INT:
6362
{
64-
const int iInitVal = atoi(pszCurSegment);
63+
const int iInitVal = V_atoi(pszCurSegment);
6564
var.iVal = (varMin.iVal < varMax.iVal) ? clamp(iInitVal, varMin.iVal, varMax.iVal) : iInitVal;
6665
} break;
6766
case SERIALVARIANTTYPE_BOOL:
6867
{
69-
var.bVal = (atoi(pszCurSegment) != 0);
68+
var.bVal = (V_atoi(pszCurSegment) != 0);
7069
} break;
7170
case SERIALVARIANTTYPE_FLOAT:
7271
{
73-
const float flInitVal = static_cast<float>(atof(pszCurSegment));
72+
const float flInitVal = static_cast<float>(V_atof(pszCurSegment));
7473
var.flVal = (varMin.flVal < varMax.flVal) ? clamp(flInitVal, varMin.flVal, varMax.flVal) : flInitVal;
7574
} break;
7675
}
7776
}
7877
else if (endCh == CH_XH_SEGSKIP) // Run-length encoding skip
7978
{
80-
const int iSkipLen = atoi(pszCurSegment);
79+
const int iSkipLen = V_atoi(pszCurSegment);
8180
if (iSkipLen > 1)
8281
{
8382
*piSkipIdx = iSkipLen - 1;

0 commit comments

Comments
 (0)