diff --git a/src/modules/font/GlyphData.cpp b/src/modules/font/GlyphData.cpp index 64734a77e..8054d7c6e 100644 --- a/src/modules/font/GlyphData.cpp +++ b/src/modules/font/GlyphData.cpp @@ -83,6 +83,11 @@ int GlyphData::getWidth() const return metrics.width; } +unsigned int GlyphData::getGlyph() const +{ + return glyph; +} + int GlyphData::getAdvance() const { return metrics.advance; diff --git a/src/modules/font/GlyphData.h b/src/modules/font/GlyphData.h index 7ec8ddce7..acfd6a5b8 100644 --- a/src/modules/font/GlyphData.h +++ b/src/modules/font/GlyphData.h @@ -73,6 +73,11 @@ public: **/ virtual int getWidth() const; + /** + * Gets the glyph itself. + **/ + unsigned int getGlyph() const; + /** * Gets the advance (the space the glyph takes up) of the glyph. **/ diff --git a/src/modules/physics/box2d/Joint.cpp b/src/modules/physics/box2d/Joint.cpp index 4dcf94696..539a0bc19 100644 --- a/src/modules/physics/box2d/Joint.cpp +++ b/src/modules/physics/box2d/Joint.cpp @@ -40,16 +40,16 @@ namespace box2d { 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) { } diff --git a/src/modules/thread/Thread.cpp b/src/modules/thread/Thread.cpp index 3885a829e..7b913efc7 100644 --- a/src/modules/thread/Thread.cpp +++ b/src/modules/thread/Thread.cpp @@ -69,7 +69,7 @@ void Thread::ThreadThread::main() } 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); diff --git a/src/modules/timer/sdl/Timer.h b/src/modules/timer/sdl/Timer.h index ad814a9b6..c4d138d55 100644 --- a/src/modules/timer/sdl/Timer.h +++ b/src/modules/timer/sdl/Timer.h @@ -62,9 +62,6 @@ public: private: - // Timing vars for benchmarking. - Uint32 time_init; - // Frame delta vars. Uint32 currTime; Uint32 prevTime;