Various fixes

Author: benjl

src/core/modules/entities/entities.h

@@ -102,7 +102,7 @@ class TakeDamageInfoBaseWrapper: public CTakeDamageInfo
 
 	void set_inflictor(unsigned int uiInflictor)
 	{
-		m_hInflictor = ExcBaseHandleFromIndex(uiInflictor);
+		m_hInflictor = CHandle<CBaseEntity>(ExcBaseEntityFromIndex(uiInflictor));
 	}
 
 	unsigned int get_attacker()
@@ -144,7 +144,7 @@ class TakeDamageInfoBaseWrapper: public CTakeDamageInfo
 			m_CSGOAttacker.m_iUserId = -1;
 		}
 #else
-		m_hAttacker = ExcBaseHandleFromIndex(uiAttacker);
+		m_hAttacker = CHandle<CBaseEntity>(ExcBaseEntityFromIndex(uiAttacker));
 #endif
 	}
 
@@ -172,7 +172,7 @@ class TakeDamageInfoBaseWrapper: public CTakeDamageInfo
 
 	void set_weapon(unsigned int uiWeapon)
 	{
-		m_hWeapon = ExcBaseHandleFromIndex(uiWeapon);
+		m_hWeapon = CHandle<CBaseEntity>(ExcBaseEntityFromIndex(uiWeapon));
 	}
 
 	void set_base_damage(float flBaseDamage)

src/core/modules/keyvalues/keyvalues_wrap.cpp

@@ -32,35 +32,35 @@
 
 
 
-// Really hacky way to access the private member function RecursiveCopyKeyValues.
-// It's done by replacing the declaration of RecursiveCopyKeyValues with a dummy
+// Really hacky way to access the private member function CopyKeyValuesFromRecursive.
+// It's done by replacing the declaration of CopyKeyValuesFromRecursive with a dummy
 // method, a friend function declaration and the actual declaration that got
 // replaced.
 // This is done, so we don't need to patch KeyValues.h. #define private public
 // doesn't work here, because of undefined symbols (KeyValues.cpp compiles the
 // function as a private symbol name, and keyvalues_wrap.cpp would try to look up
 // the function using its public symbol name).
 /*
-	void RecursiveCopyKeyValues( KeyValues& src );
+	void CopyKeyValuesFromRecursive( KeyValues& src );
 
 	REPLACED BY:
 
 	void JustFinishTheDeclaration() {} 
-	friend void RecursiveCopyKeyValuesHack(KeyValues* pThis, KeyValues& src); 
-	void RecursiveCopyKeyValues( KeyValues& src );
+	friend void CopyKeyValuesFromRecursiveHack(KeyValues* pThis, KeyValues& src); 
+	void CopyKeyValuesFromRecursive( KeyValues& src );
 */
-#define RecursiveCopyKeyValues \
+#define CopyKeyValuesFromRecursive \
 	JustFinishTheDeclaration() {} \
-	friend void RecursiveCopyKeyValuesHack(KeyValues* pThis, KeyValues& src); \
-	void RecursiveCopyKeyValues
+	friend void CopyKeyValuesFromRecursiveHack(KeyValues* pThis, KeyValues& src); \
+	void CopyKeyValuesFromRecursive
 
 #include "tier1/KeyValues.h"
 
 // Now, remove the replacement, so the friend function can call the member function.
-#define RecursiveCopyKeyValues RecursiveCopyKeyValues
-void RecursiveCopyKeyValuesHack(KeyValues* pThis, KeyValues& src)
+#define CopyKeyValuesFromRecursive CopyKeyValuesFromRecursive
+void CopyKeyValuesFromRecursiveHack(KeyValues* pThis, KeyValues& src)
 {
-	pThis->RecursiveCopyKeyValues(src);
+	pThis->CopyKeyValuesFromRecursive(src);
 }
 
 
@@ -191,7 +191,7 @@ void export_keyvalues(scope _keyvalues)
 
 		.add_property("next_key",
 			make_function(
-				&KeyValues::GetNextKey,
+				GET_METHOD(KeyValues *, KeyValues, GetNextKey),
 				reference_existing_object_policy()
 			),
 			&KeyValues::SetNextKey,
@@ -344,7 +344,7 @@ void export_keyvalues(scope _keyvalues)
 		)
 
 		.def("recursive_copy",
-			&RecursiveCopyKeyValuesHack,
+			&CopyKeyValuesFromRecursiveHack,
 			"Recursively copy the given KeyValues into this KeyValues instance."
 		)
 

src/core/modules/steam/orangebox/steam_wrap.h

@@ -35,7 +35,6 @@ void export_engine_specific_steamid(scope _steam, T SteamID)
 template<class T>
 void export_engine_specific_account_type(scope _steam, T AccountType)
 {
-	AccountType.value("P2P_SUPER_SEEDER", k_EAccountTypeP2PSuperSeeder);
 }
 
 #endif // _STEAM_WRAP_ORANGEBOX_H

src/makefiles/linux/linux.base.cmake

@@ -54,8 +54,8 @@ If(SOURCE_ENGINE MATCHES "bms")
 Else()
     Set(SOURCEPYTHON_LINK_LIBRARIES
         "${SOURCEPYTHON_LINK_LIBRARIES}"
-        ${SOURCESDK_LIB}/linux/mathlib_i486.a
-        ${SOURCESDK_LIB}/linux/tier1_i486.a
+        ${SOURCESDK_LIB}/public/linux/mathlib_i486.a
+        ${SOURCESDK_LIB}/public/linux/tier1_i486.a
     )
 EndIf()
 
@@ -66,10 +66,8 @@ If(SOURCE_ENGINE MATCHES "orangebox" OR SOURCE_ENGINE MATCHES "l4d2" OR SOURCE_E
     # Orangebox has all the tier libraries.
     Set(SOURCEPYTHON_LINK_LIBRARIES
         "${SOURCEPYTHON_LINK_LIBRARIES}"
-         ${SOURCESDK_LIB}/linux/tier2_i486.a
-         ${SOURCESDK_LIB}/linux/tier3_i486.a
-         ${SOURCESDK_LIB}/linux/libtier0_srv.so
-         ${SOURCESDK_LIB}/linux/libvstdlib_srv.so
+         ${SOURCESDK_LIB}/public/linux/libtier0_srv.so
+         ${SOURCESDK_LIB}/public/linux/libvstdlib_srv.so
     )
 EndIf()
 
@@ -113,7 +111,7 @@ Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-conversion-null -Wno-write-strings"
 Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -Wno-reorder")
 
 # Others
-Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse -msse -m32 -fno-strict-aliasing")
+Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse -msse -msse2 -m32 -fno-strict-aliasing")
 Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fno-threadsafe-statics -v -fvisibility=hidden")
 
 

src/patches/tf2/game/shared/imovehelper.h

@@ -0,0 +1,119 @@
+//========= Copyright Valve Corporation, All rights reserved. ============//
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================//
+
+#ifndef IMOVEHELPER_H
+#define IMOVEHELPER_H
+
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+//-----------------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------------
+
+enum PLAYER_ANIM;
+class IPhysicsSurfaceProps;
+class Vector;
+struct model_t;
+struct cmodel_t;
+struct vcollide_t;
+class CGameTrace;
+enum soundlevel_t;
+class CBasePlayer;
+
+//-----------------------------------------------------------------------------
+// Purpose: Identifies how submerged in water a player is.
+//-----------------------------------------------------------------------------
+
+enum
+{
+	WL_NotInWater=0,
+	WL_Feet,
+	WL_Waist,
+	WL_Eyes
+};
+
+
+//-----------------------------------------------------------------------------
+// An entity identifier that works in both game + client dlls
+//-----------------------------------------------------------------------------
+
+typedef CBaseHandle EntityHandle_t;
+
+
+#define INVALID_ENTITY_HANDLE INVALID_EHANDLE
+
+//-----------------------------------------------------------------------------
+// Functions the engine provides to IGameMovement to assist in its movement.
+//-----------------------------------------------------------------------------
+
+abstract_class IMoveHelper
+{
+public:
+	// Call this to set the singleton
+	static IMoveHelper* GetSingleton( ) { return sm_pSingleton; }
+	
+	// Methods associated with a particular entity
+	virtual	char const*		GetName( EntityHandle_t handle ) const = 0;
+
+	// Adds the trace result to touch list, if contact is not already in list.
+	virtual void	ResetTouchList( void ) = 0;
+	virtual bool	AddToTouched( const CGameTrace& tr, const Vector& impactvelocity ) = 0;
+	virtual void	ProcessImpacts( void ) = 0;
+	
+	// Numbered line printf
+	virtual void	Con_NPrintf( int idx, PRINTF_FORMAT_STRING char const* fmt, ... ) = 0;
+
+	// These have separate server vs client impementations
+	virtual void	StartSound( const Vector& origin, int channel, char const* sample, float volume, soundlevel_t soundlevel, int fFlags, int pitch ) = 0;
+	virtual void	StartSound( const Vector& origin, const char *soundname ) = 0; 
+	virtual void	PlaybackEventFull( int flags, int clientindex, unsigned short eventindex, float delay, Vector& origin, Vector& angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 ) = 0;
+
+	// Apply falling damage to m_pHostPlayer based on m_pHostPlayer->m_flFallVelocity.
+	virtual bool	PlayerFallingDamage( void ) = 0;
+
+	// Apply falling damage to m_pHostPlayer based on m_pHostPlayer->m_flFallVelocity.
+	virtual void	PlayerSetAnimation( PLAYER_ANIM playerAnim ) = 0;
+
+	virtual IPhysicsSurfaceProps *GetSurfaceProps( void ) = 0;
+
+	virtual bool IsWorldEntity( const CBaseHandle &handle ) = 0;
+
+	// sets the entity being moved
+	virtual void	SetHost( CBasePlayer *host ) = 0;
+
+protected:
+	// Inherited classes can call this to set the singleton
+	static void SetSingleton( IMoveHelper* pMoveHelper ) { sm_pSingleton = pMoveHelper; }
+
+	// Clients shouldn't call delete directly
+	virtual			~IMoveHelper() {}
+
+	// The global instance
+	static IMoveHelper* sm_pSingleton;
+};
+
+//-----------------------------------------------------------------------------
+// Add this to the CPP file that implements the IMoveHelper
+//-----------------------------------------------------------------------------
+
+#define IMPLEMENT_MOVEHELPER()	\
+	IMoveHelper* IMoveHelper::sm_pSingleton = 0
+
+//-----------------------------------------------------------------------------
+// Call this to set the singleton
+//-----------------------------------------------------------------------------
+
+inline IMoveHelper* MoveHelper( )
+{
+	return IMoveHelper::GetSingleton();
+}
+
+
+#endif // IMOVEHELPER_H