aboutsummaryrefslogtreecommitdiff
path: root/mp/src/game/shared
diff options
context:
space:
mode:
authorJoe Ludwig <[email protected]>2013-09-02 11:39:10 -0700
committerJoe Ludwig <[email protected]>2013-09-02 11:39:10 -0700
commita0c29e7dd67abb15c74c85f07741784877edfdcd (patch)
tree35bd6b4580afa14648895b0f321d33a712a5d0fa /mp/src/game/shared
parentAdded bloom shader and screenspace effect helpers as examples for the SDK. (diff)
downloadsource-sdk-2013-a0c29e7dd67abb15c74c85f07741784877edfdcd.tar.xz
source-sdk-2013-a0c29e7dd67abb15c74c85f07741784877edfdcd.zip
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.
Diffstat (limited to 'mp/src/game/shared')
-rw-r--r--mp/src/game/shared/GameStats.cpp2
-rw-r--r--mp/src/game/shared/playernet_vars.h4
-rw-r--r--mp/src/game/shared/shareddefs.h11
3 files changed, 9 insertions, 8 deletions
diff --git a/mp/src/game/shared/GameStats.cpp b/mp/src/game/shared/GameStats.cpp
index 3571827d..e81eaed6 100644
--- a/mp/src/game/shared/GameStats.cpp
+++ b/mp/src/game/shared/GameStats.cpp
@@ -3,10 +3,8 @@
// Purpose:
//
//=============================================================================
-
#include "cbase.h"
-
#include "igamesystem.h"
#include "gamestats.h"
#include "tier1/utlstring.h"
diff --git a/mp/src/game/shared/playernet_vars.h b/mp/src/game/shared/playernet_vars.h
index 9fdeec0f..abb49765 100644
--- a/mp/src/game/shared/playernet_vars.h
+++ b/mp/src/game/shared/playernet_vars.h
@@ -77,10 +77,10 @@ struct fogplayerparams_t
{
m_hCtrl.Set( NULL );
m_flTransitionTime = -1.0f;
- m_OldColor.r = m_OldColor.g = m_OldColor.g = m_OldColor.a = 0.0f;
+ m_OldColor.r = m_OldColor.g = m_OldColor.b = m_OldColor.a = 0;
m_flOldStart = 0.0f;
m_flOldEnd = 0.0f;
- m_NewColor.r = m_NewColor.g = m_NewColor.g = m_NewColor.a = 0.0f;
+ m_NewColor.r = m_NewColor.g = m_NewColor.b = m_NewColor.a = 0;
m_flNewStart = 0.0f;
m_flNewEnd = 0.0f;
}
diff --git a/mp/src/game/shared/shareddefs.h b/mp/src/game/shared/shareddefs.h
index 4dbab433..868ae046 100644
--- a/mp/src/game/shared/shareddefs.h
+++ b/mp/src/game/shared/shareddefs.h
@@ -919,14 +919,17 @@ enum
#define TF_VISION_FILTER_NONE 0
#define TF_VISION_FILTER_PYRO (1<<0) // 1
#define TF_VISION_FILTER_HALLOWEEN (1<<1) // 2
+#define TF_VISION_FILTER_ROME (1<<2) // 4
+// THIS ENUM SHOULD MATCH THE ORDER OF THE FLAGS ABOVE
enum
{
- MODEL_INDEX_OVERRIDE_DEFAULT = 0,
- MODEL_INDEX_OVERRIDE_PYRO,
- MODEL_INDEX_OVERRIDE_HALLOWEEN,
+ VISION_MODE_NONE = 0,
+ VISION_MODE_PYRO,
+ VISION_MODE_HALLOWEEN,
+ VISION_MODE_ROME,
- MAX_MODEL_INDEX_OVERRIDES
+ MAX_VISION_MODES
};
#endif // TF_DLL || TF_CLIENT_DLL