Commits

Alex Szpakowski  committed bf4433e

Silenced some compiler warnings

  • Participants
  • Parent commits 1caf939

Comments (0)

Files changed (5)

File src/modules/font/GlyphData.cpp

 	return metrics.width;
 }
 
+unsigned int GlyphData::getGlyph() const
+{
+	return glyph;
+}
+
 int GlyphData::getAdvance() const
 {
 	return metrics.advance;

File src/modules/font/GlyphData.h

 	virtual int getWidth() const;
 
 	/**
+	 * Gets the glyph itself.
+	 **/
+	unsigned int getGlyph() const;
+
+	/**
 	 * Gets the advance (the space the glyph takes up) of the glyph.
 	 **/
 	int getAdvance() const;

File src/modules/physics/box2d/Joint.cpp

 {
 
 Joint::Joint(Body *body1)
-	: body1(body1)
+	: world(body1->world)
+	, body1(body1)
 	, body2(0)
-	, world(body1->world)
 {
 }
 
 Joint::Joint(Body *body1, Body *body2)
-	: body1(body1)
+	: world(body1->world)
+	, body1(body1)
 	, body2(body2)
-	, world(body1->world)
 {
 }
 

File src/modules/thread/Thread.cpp

 }
 
 ThreadData::ThreadData(const char *name, size_t len, const char *code, void *mutex, void *cond)
-	: len(len), mutex(mutex), cond(cond)
+	: mutex(mutex), cond(cond), len(len)
 {
 	this->name = new char[len+1];
 	memset(this->name, 0, len+1);

File src/modules/timer/sdl/Timer.h

 
 private:
 
-	// Timing vars for benchmarking.
-	Uint32 time_init;
-
 	// Frame delta vars.
 	Uint32 currTime;
 	Uint32 prevTime;