Fixed TR_GetEntityIndex returning -1 for world ent hits (Logical entities bcompat break)
authorMatt Woodrow <pred@alliedmods.net>
Sat Sep 05 19:36:12 2009 +1200 (2009-09-05)
changeset 27941e7da6a19b3f
parent 2793 6bac9ee534a3
child 2795 c23fac848eac
Fixed TR_GetEntityIndex returning -1 for world ent hits (Logical entities bcompat break)
extensions/sdktools/msvc9/sdktools.vcproj
extensions/sdktools/trnatives.cpp
     1.1 --- a/extensions/sdktools/msvc9/sdktools.vcproj	Sun Aug 30 17:27:44 2009 -0700
     1.2 +++ b/extensions/sdktools/msvc9/sdktools.vcproj	Sat Sep 05 19:36:12 2009 +1200
     1.3 @@ -537,7 +537,7 @@
     1.4  				AdditionalOptions="/D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
     1.5  				Optimization="0"
     1.6  				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(HL2SDKL4D)\common&quot;;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\engine&quot;;&quot;$(HL2SDKL4D)\public\game\server&quot;;&quot;$(HL2SDKL4D)\public\mathlib&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
     1.7 - 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5"
     1.8 +				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5"
     1.9  				MinimalRebuild="true"
    1.10  				BasicRuntimeChecks="3"
    1.11  				RuntimeLibrary="1"
    1.12 @@ -617,10 +617,10 @@
    1.13  			/>
    1.14  			<Tool
    1.15  				Name="VCCLCompilerTool"
    1.16 - 				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
    1.17 +				AdditionalOptions="/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5"
    1.18  				FavorSizeOrSpeed="1"
    1.19  				AdditionalIncludeDirectories="..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;&quot;$(HL2SDKL4D)\common&quot;;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\engine&quot;;&quot;$(HL2SDKL4D)\public\game\server&quot;;&quot;$(HL2SDKL4D)\public\mathlib&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;;&quot;$(MMSOURCE17)\core&quot;;&quot;$(MMSOURCE17)\core\sourcehook&quot;"
    1.20 - 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5"
    1.21 +				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5"
    1.22  				RuntimeLibrary="0"
    1.23  				EnableEnhancedInstructionSet="0"
    1.24  				RuntimeTypeInfo="false"
    1.25 @@ -965,6 +965,7 @@
    1.26  			<Tool
    1.27  				Name="VCResourceCompilerTool"
    1.28  				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
    1.29 +				AdditionalIncludeDirectories="..\..\..\public"
    1.30  			/>
    1.31  			<Tool
    1.32  				Name="VCPreLinkEventTool"
     2.1 --- a/extensions/sdktools/trnatives.cpp	Sun Aug 30 17:27:44 2009 -0700
     2.2 +++ b/extensions/sdktools/trnatives.cpp	Sat Sep 05 19:36:12 2009 +1200
     2.3 @@ -504,6 +504,11 @@
     2.4  		return pContext->ThrowNativeError("Invalid Handle %x (error %d)", params[1], err);
     2.5  	}
     2.6  
     2.7 +	if (tr->m_pEnt == NULL)
     2.8 +	{
     2.9 +		return 0;
    2.10 +	}
    2.11 +
    2.12  	return gamehelpers->EntityToBCompatRef(tr->m_pEnt);
    2.13  }
    2.14