Fixed Linux compiler errors

- Exposed tracing functionality

Author: Ayuto

src/core/modules/engine/engine1/engine_wrap_python.h

@@ -24,9 +24,22 @@
 * Development Team grants this exception to all derivative works.
 */
 
+//---------------------------------------------------------------------------------
+// Includes
+//---------------------------------------------------------------------------------
 #include "eiface.h"
 #include "engine/IEngineSound.h"
+#include "engine/IEngineTrace.h"
 
+
+// Externals
+extern IEngineTrace* enginetrace;
+
+
+//---------------------------------------------------------------------------------
+// IVEngineServer
+//---------------------------------------------------------------------------------
+// Visitor function
 template<class T>
 void IVEngineServer_Visitor(T cls)
 {
@@ -70,11 +83,15 @@ void IVEngineServer_Visitor(T cls)
 	;
 }
 
+
+//---------------------------------------------------------------------------------
+// IEngineSound
+//---------------------------------------------------------------------------------
 inline void IEngineSound_EmitSound(IEngineSound* pEngineSound, IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
 		float flVolume, float flAttenuation, int iFlags = 0, int iPitch = PITCH_NORM, const Vector *pOrigin = NULL, const Vector *pDirection = NULL,
 		tuple origins = tuple(), bool bUpdatePositions = true, float soundtime = 0.0f, int speakerentity = -1)
 {
-	CUtlVector< Vector > pUtlVecOrigins = NULL;
+	CUtlVector< Vector > pUtlVecOrigins;
 	for(int i=0; i < len(origins); i++)
 	{
 		pUtlVecOrigins.AddToTail(extract<Vector>(origins[i]));
@@ -83,7 +100,17 @@ inline void IEngineSound_EmitSound(IEngineSound* pEngineSound, IRecipientFilter&
 	pEngineSound->EmitSound(filter, iEntIndex, iChannel, pSample, flVolume, flAttenuation, iFlags, iPitch, 0, pOrigin, pDirection, &pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity);
 }
 
+// Visitor function
 template<class T>
 void IEngineSound_Visitor(T cls)
 {
+}
+
+
+//---------------------------------------------------------------------------------
+// IEngineTrace
+//---------------------------------------------------------------------------------
+inline int GetPointContents(const Vector &vecAbsPosition, IHandleEntity** ppEntity)
+{
+	return enginetrace->GetPointContents(vecAbsPosition, ppEntity);
 }

src/core/modules/engine/engine3/engine_wrap_python.h

@@ -24,13 +24,27 @@
 * Development Team grants this exception to all derivative works.
 */
 
+//---------------------------------------------------------------------------------
+// Includes
+//---------------------------------------------------------------------------------
 #include "eiface.h"
 #include "ispsharedmemory.h"
 #include "modules/usermessage/usermessage.h"
 #include "engine/IEngineSound.h"
+#include "engine/IEngineTrace.h"
 
+
+// Externals
+extern IEngineTrace* enginetrace;
+
+
+//---------------------------------------------------------------------------------
+// IVEngineServer
+//---------------------------------------------------------------------------------
+// Overloads
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_single_player_shared_memory_space_overload, GetSinglePlayerSharedMemorySpace, 1, 2);
 
+// Visitor function
 template<class T>
 void IVEngineServer_Visitor(T cls)
 {
@@ -249,11 +263,15 @@ void IVEngineServer_Visitor(T cls)
 	;
 }
 
+
+//---------------------------------------------------------------------------------
+// IEngineSound
+//---------------------------------------------------------------------------------
 inline void IEngineSound_EmitSound(IEngineSound* pEngineSound, IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
 		float flVolume, float flAttenuation, int iFlags = 0, int iPitch = PITCH_NORM, const Vector *pOrigin = NULL, const Vector *pDirection = NULL,
 		tuple origins = tuple(), bool bUpdatePositions = true, float soundtime = 0.0f, int speakerentity = -1)
 {
-	CUtlVector< Vector > pUtlVecOrigins = NULL;
+	CUtlVector< Vector > pUtlVecOrigins;
 	for(int i=0; i < len(origins); i++)
 	{
 		pUtlVecOrigins.AddToTail(extract<Vector>(origins[i]));
@@ -262,6 +280,7 @@ inline void IEngineSound_EmitSound(IEngineSound* pEngineSound, IRecipientFilter&
 	pEngineSound->EmitSound(filter, iEntIndex, iChannel, pSample, -1, pSample, flVolume, flAttenuation, 0, iFlags, iPitch, pOrigin, pDirection, &pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity);
 }
 
+// Visitor function
 template<class T>
 void IEngineSound_Visitor(T cls)
 {
@@ -272,4 +291,21 @@ void IEngineSound_Visitor(T cls)
 			"Returns True if the given sample is looping."
 		)
 	;
+	
+	scope().attr("CONTENTS_BLOCKLIGHT") = CONTENTS_BLOCKLIGHT;
+
+	scope().attr("SURF_NOPAINT") = SURF_NOPAINT;
+
+	scope().attr("MASK_NPCFLUID") = MASK_NPCFLUID;
+	scope().attr("MASK_SHOT_BRUSHONLY") = MASK_SHOT_BRUSHONLY;
+	scope().attr("MASK_NPCWORLDSTATIC_FLUID") = MASK_NPCWORLDSTATIC_FLUID;
+}
+
+
+//---------------------------------------------------------------------------------
+// IEngineTrace
+//---------------------------------------------------------------------------------
+inline int GetPointContents(const Vector &vecAbsPosition, IHandleEntity** ppEntity)
+{
+	return enginetrace->GetPointContents(vecAbsPosition, MASK_ALL, ppEntity);
 }