From a0c29e7dd67abb15c74c85f07741784877edfdcd Mon Sep 17 00:00:00 2001 From: Joe Ludwig Date: Mon, 2 Sep 2013 11:39:10 -0700 Subject: General: * Fixed a variety of server browser issues with mods based on this SDK * Fixed many warnings on various platforms * Added source code for fgdlib and raytrace * Updated many source files with the latest shared source from TF2. OSX: * Added support for Xcode 4.6 * Switched OSX builds to use Xcode instead of makefiles * Moved libs from src/lib/osx32 to src/lib/public/osx32 or src/lib/common/osx32 to match windows better. Linux: * Moved libs from src/lib/linux32 to src/lib/public/linux32 or src/lib/common/linux32 to match windows better. --- mp/src/game/client/c_baseentity.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mp/src/game/client/c_baseentity.h') diff --git a/mp/src/game/client/c_baseentity.h b/mp/src/game/client/c_baseentity.h index 3ea4b7fd..e00513df 100644 --- a/mp/src/game/client/c_baseentity.h +++ b/mp/src/game/client/c_baseentity.h @@ -770,6 +770,10 @@ public: // A method to apply a decal to an entity virtual void AddDecal( const Vector& rayStart, const Vector& rayEnd, const Vector& decalCenter, int hitbox, int decalIndex, bool doTrace, trace_t& tr, int maxLODToDecal = ADDDECAL_TO_ALL_LODS ); + + virtual void AddColoredDecal( const Vector& rayStart, const Vector& rayEnd, + const Vector& decalCenter, int hitbox, int decalIndex, bool doTrace, trace_t& tr, Color cColor, int maxLODToDecal = ADDDECAL_TO_ALL_LODS ); + // A method to remove all decals from an entity void RemoveAllDecals( void ); @@ -1317,7 +1321,7 @@ public: short m_nModelIndex; #ifdef TF_CLIENT_DLL - int m_nModelIndexOverrides[MAX_MODEL_INDEX_OVERRIDES]; + int m_nModelIndexOverrides[MAX_VISION_MODES]; #endif char m_takedamage; @@ -1464,6 +1468,7 @@ private: // methods related to decal adding void AddStudioDecal( const Ray_t& ray, int hitbox, int decalIndex, bool doTrace, trace_t& tr, int maxLODToDecal = ADDDECAL_TO_ALL_LODS ); + void AddColoredStudioDecal( const Ray_t& ray, int hitbox, int decalIndex, bool doTrace, trace_t& tr, Color cColor, int maxLODToDecal ); void AddBrushModelDecal( const Ray_t& ray, const Vector& decalCenter, int decalIndex, bool doTrace, trace_t& tr ); void ComputePackedOffsets( void ); -- cgit v1.2.3