sm-exts/sm-ext-outputinfo
1
0
Fork 0
mirror of https://github.com/srcdslab/sm-ext-outputinfo.git synced 2025-12-06 18:08:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: entity name in native errors (#6)
Some checks failed
Build AlliedModders Extension / build-release-extension (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Rushaway 2025-03-22 23:07:40 +01:00 committed by GitHub
parent 6d701fe051
commit e98357009d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
product.version
View File

@ -1 +1 @@
1.1.1 1.1.2

26
src/extension.cpp
View File

@ -217,6 +217,23 @@ inline int GetDataMapOffset(CBaseEntity *pEnt, const char *pName, typedescriptio
#endif #endif
} }
const char* GetEntityName(CBaseEntity* pEntity)
{
static char buffer[256];
typedescription_t* td = nullptr;
int offset = GetDataMapOffset(pEntity, "m_iName", &td);
if (offset != -1) {
string_t name = *(string_t*)((uintptr_t)(pEntity) + offset);
if (name.ToCStr() && name.ToCStr()[0] != '\0')
return name.ToCStr();
}
snprintf(buffer, sizeof(buffer), "#%d", gamehelpers->EntityToReference(pEntity));
return buffer;
}
inline CBaseEntityOutput *GetOutput(CBaseEntity *pEntity, const char *pOutput, typedescription_t **ppTypeDesc=NULL) inline CBaseEntityOutput *GetOutput(CBaseEntity *pEntity, const char *pOutput, typedescription_t **ppTypeDesc=NULL)
{ {
typedescription_t *pTypeDesc = NULL; typedescription_t *pTypeDesc = NULL;
@ -398,7 +415,7 @@ cell_t GetOutputValue(IPluginContext *pContext, const cell_t *params)
case FIELD_BOOLEAN: case FIELD_BOOLEAN:
break; break;
default: default:
return pContext->ThrowNativeError("%s value is not an integer (%d)", pOutput, pEntityOutput->m_Value.fieldType); return pContext->ThrowNativeError("Entity '%s': %s value is not an integer (%d)", GetEntityName(pEntity), pOutput, pEntityOutput->m_Value.fieldType);
} }
return (cell_t)pEntityOutput->m_Value.iVal; return (cell_t)pEntityOutput->m_Value.iVal;
@ -423,7 +440,7 @@ cell_t GetOutputValueFloat(IPluginContext *pContext, const cell_t *params)
case FIELD_TIME: case FIELD_TIME:
break; break;
default: default:
return pContext->ThrowNativeError("%s value is not a float (%d)", pOutput, pEntityOutput->m_Value.fieldType); return pContext->ThrowNativeError("Entity '%s': %s value is not a float (%d)", GetEntityName(pEntity), pOutput, pEntityOutput->m_Value.fieldType);
} }
return sp_ftoc((cell_t)pEntityOutput->m_Value.flVal); return sp_ftoc((cell_t)pEntityOutput->m_Value.flVal);
@ -450,7 +467,8 @@ cell_t GetOutputValueString(IPluginContext *pContext, const cell_t *params)
case FIELD_SOUNDNAME: case FIELD_SOUNDNAME:
break; break;
default: default:
return pContext->ThrowNativeError("%s value is not a string (%d)", pOutput, pEntityOutput->m_Value.fieldType); return pContext->ThrowNativeError("Entity '%s': %s value is not a string (%d)", GetEntityName(pEntity), pOutput, pEntityOutput->m_Value.fieldType);
} }
size_t len; size_t len;
@ -478,7 +496,7 @@ cell_t GetOutputValueVector(IPluginContext *pContext, const cell_t *params)
case FIELD_TIME: case FIELD_TIME:
break; break;
default: default:
return pContext->ThrowNativeError("%s value is not a float (%d)", pOutput, pEntityOutput->m_Value.fieldType); return pContext->ThrowNativeError("Entity '%s': %s value is not a float (%d)", GetEntityName(pEntity), pOutput, pEntityOutput->m_Value.fieldType);
} }
cell_t *vec; cell_t *vec;