From b144620eeb97b77559f8842510c58a0a5f5008a1 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 27 Feb 2008 13:49:57 +0000 Subject: [PATCH] fixed amb1483 - GetEntPropString() rejected FIELD_MODELNAME/FIELD_SOUNDNAME --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401906 --- core/smn_entities.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/smn_entities.cpp b/core/smn_entities.cpp index cd3e4ea1..29b341bd 100644 --- a/core/smn_entities.cpp +++ b/core/smn_entities.cpp @@ -796,6 +796,8 @@ static cell_t FindDataMapOffs(IPluginContext *pContext, const cell_t *params) } break; } + case FIELD_MODELNAME: + case FIELD_SOUNDNAME: case FIELD_STRING: { *pSize = sizeof(string_t); @@ -1614,7 +1616,9 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params) FIND_PROP_DATA(td); if (td->fieldType != FIELD_CHARACTER - && td->fieldType != FIELD_STRING) + && td->fieldType != FIELD_STRING + && td->fieldType != FIELD_MODELNAME + && td->fieldType != FIELD_SOUNDNAME) { return pContext->ThrowNativeError("Data field %s is not a string (%d != %d)", prop, @@ -1622,7 +1626,7 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params) FIELD_CHARACTER); } - bIsStringIndex = (td->fieldType == FIELD_STRING); + bIsStringIndex = (td->fieldType != FIELD_CHARACTER); offset = td->fieldOffset[TD_OFFSET_NORMAL]; break;