diff options
| author | Nicola Mettifogo | 2008-07-30 06:25:17 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2008-07-30 06:25:17 +0000 |
| commit | 8bdbbaf413d61cacbe62d11195842c93be786a18 (patch) | |
| tree | e4e17fb22f2c357368dadf5bbb8c6722e3fd7c28 /engines/parallaction | |
| parent | ca8a4eff265debb0aed9b038cc454be20cbe16e7 (diff) | |
| download | scummvm-rg350-8bdbbaf413d61cacbe62d11195842c93be786a18.tar.gz scummvm-rg350-8bdbbaf413d61cacbe62d11195842c93be786a18.tar.bz2 scummvm-rg350-8bdbbaf413d61cacbe62d11195842c93be786a18.zip | |
Reordered initialization lists to silence warning.
svn-id: r33432
Diffstat (limited to 'engines/parallaction')
| -rw-r--r-- | engines/parallaction/balloons.cpp | 5 | ||||
| -rw-r--r-- | engines/parallaction/gfxbase.cpp | 2 | ||||
| -rw-r--r-- | engines/parallaction/graphics.h | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/engines/parallaction/balloons.cpp b/engines/parallaction/balloons.cpp index c7a5fee919..81b32adb15 100644 --- a/engines/parallaction/balloons.cpp +++ b/engines/parallaction/balloons.cpp @@ -359,11 +359,12 @@ class BalloonManager_br : public BalloonManager { uint _numBalloons; - Frames *_leftBalloon; - Frames *_rightBalloon; Disk *_disk; Gfx *_gfx; + Frames *_leftBalloon; + Frames *_rightBalloon; + void cacheAnims(); void getStringExtent(Font *font, const char *text, uint16 maxwidth, int16* width, int16* height); void drawWrappedText(Font *font, Graphics::Surface* surf, char *text, byte color, int16 wrapwidth); diff --git a/engines/parallaction/gfxbase.cpp b/engines/parallaction/gfxbase.cpp index 7c02205e69..aa02253cb1 100644 --- a/engines/parallaction/gfxbase.cpp +++ b/engines/parallaction/gfxbase.cpp @@ -32,7 +32,7 @@ namespace Parallaction { -GfxObj::GfxObj(uint objType, Frames *frames, const char* name) : type(objType), _frames(frames), x(0), y(0), z(0), frame(0), layer(3), _flags(kGfxObjNormal), _keep(true) { +GfxObj::GfxObj(uint objType, Frames *frames, const char* name) : _frames(frames), _keep(true), x(0), y(0), z(0), _flags(kGfxObjNormal), type(objType), frame(0), layer(3) { if (name) { _name = strdup(name); } else { diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h index 90669daab8..52b7a4b870 100644 --- a/engines/parallaction/graphics.h +++ b/engines/parallaction/graphics.h @@ -472,6 +472,9 @@ typedef Common::HashMap<Common::String, int32, Common::IgnoreCase_Hash, Common:: class Gfx { +protected: + Parallaction* _vm; + public: Disk *_disk; VarMap _vars; @@ -550,7 +553,6 @@ public: byte *_unpackedBitmap; protected: - Parallaction* _vm; bool _halfbrite; bool _skipBackground; |