[Scummvm-cvs-logs] SF.net SVN: scummvm:[33432] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Wed Jul 30 08:25:18 CEST 2008
Revision: 33432
http://scummvm.svn.sourceforge.net/scummvm/?rev=33432&view=rev
Author: peres001
Date: 2008-07-30 06:25:17 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
Reordered initialization lists to silence warning.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/balloons.cpp
scummvm/trunk/engines/parallaction/gfxbase.cpp
scummvm/trunk/engines/parallaction/graphics.h
Modified: scummvm/trunk/engines/parallaction/balloons.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/balloons.cpp 2008-07-30 06:17:13 UTC (rev 33431)
+++ scummvm/trunk/engines/parallaction/balloons.cpp 2008-07-30 06:25:17 UTC (rev 33432)
@@ -359,11 +359,12 @@
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);
Modified: scummvm/trunk/engines/parallaction/gfxbase.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/gfxbase.cpp 2008-07-30 06:17:13 UTC (rev 33431)
+++ scummvm/trunk/engines/parallaction/gfxbase.cpp 2008-07-30 06:25:17 UTC (rev 33432)
@@ -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 {
Modified: scummvm/trunk/engines/parallaction/graphics.h
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.h 2008-07-30 06:17:13 UTC (rev 33431)
+++ scummvm/trunk/engines/parallaction/graphics.h 2008-07-30 06:25:17 UTC (rev 33432)
@@ -472,6 +472,9 @@
class Gfx {
+protected:
+ Parallaction* _vm;
+
public:
Disk *_disk;
VarMap _vars;
@@ -550,7 +553,6 @@
byte *_unpackedBitmap;
protected:
- Parallaction* _vm;
bool _halfbrite;
bool _skipBackground;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list