[Scummvm-cvs-logs] SF.net SVN: scummvm:[49352] scummvm/trunk/engines/m4
wjpalenstijn at users.sourceforge.net
wjpalenstijn at users.sourceforge.net
Mon May 31 14:38:15 CEST 2010
Revision: 49352
http://scummvm.svn.sourceforge.net/scummvm/?rev=49352&view=rev
Author: wjpalenstijn
Date: 2010-05-31 12:38:15 +0000 (Mon, 31 May 2010)
Log Message:
-----------
Fix warning, whitespace
Modified Paths:
--------------
scummvm/trunk/engines/m4/animation.h
scummvm/trunk/engines/m4/compression.h
scummvm/trunk/engines/m4/m4_views.cpp
scummvm/trunk/engines/m4/mads_views.cpp
scummvm/trunk/engines/m4/mads_views.h
Modified: scummvm/trunk/engines/m4/animation.h
===================================================================
--- scummvm/trunk/engines/m4/animation.h 2010-05-31 12:36:42 UTC (rev 49351)
+++ scummvm/trunk/engines/m4/animation.h 2010-05-31 12:38:15 UTC (rev 49352)
@@ -90,7 +90,7 @@
Common::String _soundName;
Common::Array<int> _spriteListIndexes;
- int _currentFrame, _oldFrameEntry;
+ int _currentFrame, _oldFrameEntry;
bool _resetFlag;
int _unk1;
bool _skipLoad;
@@ -106,12 +106,12 @@
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);
};
Modified: scummvm/trunk/engines/m4/compression.h
===================================================================
--- scummvm/trunk/engines/m4/compression.h 2010-05-31 12:36:42 UTC (rev 49351)
+++ scummvm/trunk/engines/m4/compression.h 2010-05-31 12:38:15 UTC (rev 49352)
@@ -66,8 +66,8 @@
class FabDecompressor {
private:
- int _bitsLeft;
- uint32 _bitBuffer;
+ int _bitsLeft;
+ uint32 _bitBuffer;
const byte *_srcData, *_srcP;
int _srcSize;
Modified: scummvm/trunk/engines/m4/m4_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_views.cpp 2010-05-31 12:36:42 UTC (rev 49351)
+++ scummvm/trunk/engines/m4/m4_views.cpp 2010-05-31 12:38:15 UTC (rev 49352)
@@ -34,7 +34,7 @@
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;
Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp 2010-05-31 12:36:42 UTC (rev 49351)
+++ scummvm/trunk/engines/m4/mads_views.cpp 2010-05-31 12:38:15 UTC (rev 49352)
@@ -1146,6 +1146,9 @@
Animation::Animation(MadsM4Engine *vm): _vm(vm) {
}
+Animation::~Animation() {
+}
+
void Animation::loadFullScreen(const Common::String &filename) {
_vm->_palette->deleteAllRanges();
load(filename);
Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h 2010-05-31 12:36:42 UTC (rev 49351)
+++ scummvm/trunk/engines/m4/mads_views.h 2010-05-31 12:38:15 UTC (rev 49352)
@@ -371,12 +371,13 @@
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;
};
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