ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1) Removed warning about order of initialisation in moving_physics.

Browse Source 
2) Compatibility fixes (e.g. VC6.0): remove initialization of static member 
   variables inside the class declaration.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1391 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2008-01-13 23:51:09 +00:00
parent 2c42105449
commit 4d38013a5a
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/highscores.hpp
View File

@ -36,7 +36,7 @@ public:
HST_RACE_FASTEST_LAP, HST_RACE_FASTEST_LAP,
HST_RACE_OVERALL_TIME}; HST_RACE_OVERALL_TIME};
private: private:
static const int HIGHSCORE_LEN = 3; // It's a top 3 list enum {HIGHSCORE_LEN = 3}; // It's a top 3 list
std::string m_track; std::string m_track;
HighscoreType m_highscore_type; HighscoreType m_highscore_type;
int m_number_of_karts; int m_number_of_karts;

2
src/moving_physics.cpp
View File

@ -28,7 +28,7 @@
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
MovingPhysics::MovingPhysics(const std::string data) MovingPhysics::MovingPhysics(const std::string data)
: Callback(), ssgTransform() : ssgTransform(), Callback()
{ {
m_shape = NULL; m_shape = NULL;
m_body = NULL; m_body = NULL;

6
src/track.cpp
View File

@ -42,7 +42,11 @@
# define snprintf _snprintf # define snprintf _snprintf
#endif #endif
float const Track::NOHIT=-99999.9f; const float Track::NOHIT = -99999.9f;
const int Track::QUAD_TRI_NONE = -1;
const int Track::QUAD_TRI_FIRST = 1;
const int Track::QUAD_TRI_SECOND = 2;
const int Track::UNKNOWN_SECTOR = -1;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
Track::Track( std::string filename_, float w, float h, bool stretch ) Track::Track( std::string filename_, float w, float h, bool stretch )

8
src/track.hpp
View File

@ -58,11 +58,11 @@ public:
//An enum is not used for the QUAD_TRI_* constants because of limitations //An enum is not used for the QUAD_TRI_* constants because of limitations
//of the conversion between enums and ints. //of the conversion between enums and ints.
static const int QUAD_TRI_NONE = -1; static const int QUAD_TRI_NONE;
static const int QUAD_TRI_FIRST = 1; static const int QUAD_TRI_FIRST;
static const int QUAD_TRI_SECOND = 2; static const int QUAD_TRI_SECOND;
static const int UNKNOWN_SECTOR = -1; static const int UNKNOWN_SECTOR;
struct SegmentTriangle struct SegmentTriangle
{ {