From 3cfc45c4e87bf7c98e98b0e2a9323f2d0f4a7b62 Mon Sep 17 00:00:00 2001 From: Matt Woodrow Date: Sat, 5 Sep 2009 19:36:12 +1200 Subject: [PATCH] Fixed TR_GetEntityIndex returning -1 for world ent hits (Logical entities bcompat break) --- extensions/sdktools/msvc9/sdktools.vcproj | 7 ++++--- extensions/sdktools/trnatives.cpp | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/extensions/sdktools/msvc9/sdktools.vcproj b/extensions/sdktools/msvc9/sdktools.vcproj index e2f4c2a0..0799b19c 100644 --- a/extensions/sdktools/msvc9/sdktools.vcproj +++ b/extensions/sdktools/msvc9/sdktools.vcproj @@ -537,7 +537,7 @@ AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5" Optimization="0" AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;"$(HL2SDKL4D)\common";"$(HL2SDKL4D)\public";"$(HL2SDKL4D)\public\engine";"$(HL2SDKL4D)\public\game\server";"$(HL2SDKL4D)\public\mathlib";"$(HL2SDKL4D)\public\tier0";"$(HL2SDKL4D)\public\tier1";"$(MMSOURCE17)\core";"$(MMSOURCE17)\core\sourcehook"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -617,10 +617,10 @@ /> ThrowNativeError("Invalid Handle %x (error %d)", params[1], err); } + if (tr->m_pEnt == NULL) + { + return 0; + } + return gamehelpers->EntityToBCompatRef(tr->m_pEnt); }