aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2010-05-31 12:38:15 +0000
committerWillem Jan Palenstijn2010-05-31 12:38:15 +0000
commit2bebba8c947ed6862a915d074804fc819ffd1472 (patch)
tree1cd755693633204d20936148230661d3bed6c5ef
parentba11596572c32c3282f03c643dc23f6050210a08 (diff)
downloadscummvm-rg350-2bebba8c947ed6862a915d074804fc819ffd1472.tar.gz
scummvm-rg350-2bebba8c947ed6862a915d074804fc819ffd1472.tar.bz2
scummvm-rg350-2bebba8c947ed6862a915d074804fc819ffd1472.zip
Fix warning, whitespace
svn-id: r49352
-rw-r--r--engines/m4/animation.h12
-rw-r--r--engines/m4/compression.h4
-rw-r--r--engines/m4/m4_views.cpp2
-rw-r--r--engines/m4/mads_views.cpp3
-rw-r--r--engines/m4/mads_views.h7
5 files changed, 16 insertions, 12 deletions
diff --git a/engines/m4/animation.h b/engines/m4/animation.h
index 41ad40ef9a..a5f3ea3085 100644
--- a/engines/m4/animation.h
+++ b/engines/m4/animation.h
@@ -90,7 +90,7 @@ private:
Common::String _soundName;
Common::Array<int> _spriteListIndexes;
- int _currentFrame, _oldFrameEntry;
+ int _currentFrame, _oldFrameEntry;
bool _resetFlag;
int _unk1;
bool _skipLoad;
@@ -106,12 +106,12 @@ private:
bool proc1(SpriteAsset &spriteSet, const Common::Point &pt, int frameNumber);
public:
MadsAnimation(MadsM4Engine *vm, MadsView *view);
- virtual ~MadsAnimation();
+ virtual ~MadsAnimation();
- virtual void load(const Common::String &filename);
- virtual void start();
- virtual bool update();
- virtual void stop();
+ virtual void load(const Common::String &filename);
+ virtual void start();
+ virtual bool update();
+ virtual void stop();
virtual void setCurrentFrame(int frameNumber);
};
diff --git a/engines/m4/compression.h b/engines/m4/compression.h
index 74fed357ff..00e3d1f927 100644
--- a/engines/m4/compression.h
+++ b/engines/m4/compression.h
@@ -66,8 +66,8 @@ public:
class FabDecompressor {
private:
- int _bitsLeft;
- uint32 _bitBuffer;
+ int _bitsLeft;
+ uint32 _bitBuffer;
const byte *_srcData, *_srcP;
int _srcSize;
diff --git a/engines/m4/m4_views.cpp b/engines/m4/m4_views.cpp
index 3d633cef0d..f4345787df 100644
--- a/engines/m4/m4_views.cpp
+++ b/engines/m4/m4_views.cpp
@@ -34,7 +34,7 @@ namespace M4 {
GUIInventory::GUIInventory(View *owner, MadsM4Engine *vm, const Common::Rect &bounds, int horizCells,
int vertCells, int cellWidth, int cellHeight, int tag): GUIRect(owner, bounds, tag) {
- _vm = vm;
+ _vm = vm;
_cellCount.x = horizCells;
_cellCount.y = vertCells;
_cellSize.x = cellWidth;
diff --git a/engines/m4/mads_views.cpp b/engines/m4/mads_views.cpp
index e66b1d8d41..f4f43c48f1 100644
--- a/engines/m4/mads_views.cpp
+++ b/engines/m4/mads_views.cpp
@@ -1146,6 +1146,9 @@ void MadsSequenceList::setAnimRange(int seqIndex, int startVal, int endVal) {
Animation::Animation(MadsM4Engine *vm): _vm(vm) {
}
+Animation::~Animation() {
+}
+
void Animation::loadFullScreen(const Common::String &filename) {
_vm->_palette->deleteAllRanges();
load(filename);
diff --git a/engines/m4/mads_views.h b/engines/m4/mads_views.h
index 6d6d576263..6f264312d1 100644
--- a/engines/m4/mads_views.h
+++ b/engines/m4/mads_views.h
@@ -371,12 +371,13 @@ protected:
MadsM4Engine *_vm;
public:
Animation(MadsM4Engine *vm);
+ virtual ~Animation();
void loadFullScreen(const Common::String &filename);
virtual void load(const Common::String &filename) = 0;
- virtual void start() = 0;
- virtual bool update() = 0;
- virtual void stop() = 0;
+ virtual void start() = 0;
+ virtual bool update() = 0;
+ virtual void stop() = 0;
virtual void setCurrentFrame(int frameNumber) = 0;
};