diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-05-17 12:31:35 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-05-17 12:31:35 +0400 |
| commit | 0f447ac5a822500257cfdd18068339ddcc2ca40c (patch) | |
| tree | e2f828b5f5a8bc68c53340b82cc6db67306f4964 /source/gameengine | |
| parent | 6f4272a200a95587eaef3857cb6e1eeda5958e18 (diff) | |
Fix for MSVC .NET, which can't handle static const declarations in classes.
Make it static, and define in SM_Object.cpp
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h | 4 | ||||
| -rw-r--r-- | source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h index 571e1cf71cc..db7f5f07603 100644 --- a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h +++ b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h @@ -267,9 +267,7 @@ public: private: // Tweak parameters - static const MT_Scalar ImpulseThreshold = -10.; - static const MT_Scalar FixThreshold = 0.01; - static const MT_Scalar FixVelocity = 0.01; + static MT_Scalar ImpulseThreshold; // return the actual linear_velocity of this object this // is the addition of m_combined_lin_vel and m_lin_vel. diff --git a/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp b/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp index b86d7ccdcdd..613212b642a 100644 --- a/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp +++ b/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp @@ -49,6 +49,7 @@ #include "MT_MinMax.h" +MT_Scalar SM_Object::ImpulseThreshold = -10.; SM_Object::SM_Object( DT_ShapeHandle shape, |