UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix reading/writing float variant-based props (#1536)

Browse Source 
When variant support was added for props, the validation checks in the
float related functions weren't updated to allow them.

Tested with the plugin from the forum thread with a spawned
`math_counter`.

Fixes #1501
This commit is contained in:
Asher Baker 2021-07-17 20:53:43 +01:00 committed by GitHub
parent 5b7c9c5845
commit 86af9601bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/smn_entities.cpp
View File

@ -1132,7 +1132,7 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
auto *pVariant = (variant_t *)((intptr_t)pEntity + offset); \ auto *pVariant = (variant_t *)((intptr_t)pEntity + offset); \
if (pVariant->fieldType != type) \ if (pVariant->fieldType != type) \
{ \ { \
return pContext->ThrowNativeError("Variant value for %s is not %s (%d)", \ return pContext->ThrowNativeError("Variant value for %s is not a %s (%d)", \
prop, \ prop, \
typeName, \ typeName, \
pVariant->fieldType); \ pVariant->fieldType); \
@ -1572,13 +1572,15 @@ static cell_t GetEntPropFloat(IPluginContext *pContext, const cell_t *params)
FIND_PROP_DATA(td); FIND_PROP_DATA(td);
if (td->fieldType != FIELD_FLOAT if (td->fieldType != FIELD_FLOAT
&& td->fieldType != FIELD_TIME) && td->fieldType != FIELD_TIME
&& (td->fieldType != FIELD_CUSTOM || (td->flags & FTYPEDESC_OUTPUT) != FTYPEDESC_OUTPUT))
{ {
return pContext->ThrowNativeError("Data field %s is not a float (%d != [%d,%d])", return pContext->ThrowNativeError("Data field %s is not a float (%d != [%d,%d,%d])",
prop, prop,
td->fieldType, td->fieldType,
FIELD_FLOAT, FIELD_FLOAT,
FIELD_TIME); FIELD_TIME,
FIELD_CUSTOM);
} }
CHECK_SET_PROP_DATA_OFFSET(); CHECK_SET_PROP_DATA_OFFSET();
@ -1633,13 +1635,15 @@ static cell_t SetEntPropFloat(IPluginContext *pContext, const cell_t *params)
FIND_PROP_DATA(td); FIND_PROP_DATA(td);
if (td->fieldType != FIELD_FLOAT if (td->fieldType != FIELD_FLOAT
&& td->fieldType != FIELD_TIME) && td->fieldType != FIELD_TIME
&& (td->fieldType != FIELD_CUSTOM || (td->flags & FTYPEDESC_OUTPUT) != FTYPEDESC_OUTPUT))
{ {
return pContext->ThrowNativeError("Data field %s is not a float (%d != [%d,%d])", return pContext->ThrowNativeError("Data field %s is not a float (%d != [%d,%d,%d])",
prop, prop,
td->fieldType, td->fieldType,
FIELD_FLOAT, FIELD_FLOAT,
FIELD_TIME); FIELD_TIME,
FIELD_CUSTOM);
} }
CHECK_SET_PROP_DATA_OFFSET(); CHECK_SET_PROP_DATA_OFFSET();