Fixed bug in entity output hooks (bug 3988, r=fyren).

This commit is contained in:
Matt Woodrow 2009-10-27 00:03:59 -07:00
parent 6b06733192
commit 73d70b6953
2 changed files with 3 additions and 2 deletions

View File

@ -884,6 +884,7 @@
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;" PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
AdditionalIncludeDirectories="..\..\..\public"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"

View File

@ -207,7 +207,7 @@ void EntityOutputManager::FireEventDetour(void *pOutput, CBaseEntity *pActivator
bool fastLookup = false; bool fastLookup = false;
// Fast lookup failed - check the slow way for hooks that havn't fired yet // Fast lookup failed - check the slow way for hooks that haven't fired yet
if ((fastLookup = EntityOutputs->Retrieve(sOutput, (void **)&pOutputName)) == false) if ((fastLookup = EntityOutputs->Retrieve(sOutput, (void **)&pOutputName)) == false)
{ {
const char *classname = GetEntityClassname(pCaller); const char *classname = GetEntityClassname(pCaller);
@ -450,5 +450,5 @@ const char *EntityOutputManager::GetEntityClassname(CBaseEntity *pEntity)
offset = pDesc->fieldOffset[TD_OFFSET_NORMAL]; offset = pDesc->fieldOffset[TD_OFFSET_NORMAL];
} }
return (const char *)(((unsigned char *)pEntity) + offset); return *(const char **)(((unsigned char *)pEntity) + offset);
} }