diff options
| author | Marisa-Chan | 2014-11-20 14:48:24 +0600 |
|---|---|---|
| committer | Marisa-Chan | 2014-11-20 14:48:24 +0600 |
| commit | 5b352da304931bafcfcddbe08461488335c7ad57 (patch) | |
| tree | 6d96693d9efdb59a16050d57c6003593d95a22a1 /engines/zvision/animation | |
| parent | d5f7a1dc03f2a38774ad1c8dd6741bb9c6fb9848 (diff) | |
| download | scummvm-rg350-5b352da304931bafcfcddbe08461488335c7ad57.tar.gz scummvm-rg350-5b352da304931bafcfcddbe08461488335c7ad57.tar.bz2 scummvm-rg350-5b352da304931bafcfcddbe08461488335c7ad57.zip | |
ZVISION: More CamelCase and a bit of comments cleanup
Diffstat (limited to 'engines/zvision/animation')
| -rw-r--r-- | engines/zvision/animation/meta_animation.cpp | 16 | ||||
| -rw-r--r-- | engines/zvision/animation/meta_animation.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/zvision/animation/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp index 1ea6df6481..2e549ec838 100644 --- a/engines/zvision/animation/meta_animation.cpp +++ b/engines/zvision/animation/meta_animation.cpp @@ -39,7 +39,7 @@ namespace ZVision { MetaAnimation::MetaAnimation(const Common::String &fileName, ZVision *engine) : _fileType(RLF), - _cur_frame(NULL) { + _curFrame(NULL) { Common::String tmpFileName = fileName; tmpFileName.toLowercase(); if (tmpFileName.hasSuffix(".rlf")) { @@ -102,11 +102,11 @@ void MetaAnimation::seekToFrame(int frameNumber) { const Graphics::Surface *MetaAnimation::decodeNextFrame() { if (_fileType == RLF) - _cur_frame = _animation.rlf->decodeNextFrame(); + _curFrame = _animation.rlf->decodeNextFrame(); else - _cur_frame = _animation.avi->decodeNextFrame(); + _curFrame = _animation.avi->decodeNextFrame(); - return _cur_frame; + return _curFrame; } const Graphics::Surface *MetaAnimation::getFrameData(uint frameNumber) { @@ -114,12 +114,12 @@ const Graphics::Surface *MetaAnimation::getFrameData(uint frameNumber) { frameNumber = frameCount() - 1; if (_fileType == RLF) { - _cur_frame = _animation.rlf->getFrameData(frameNumber); - return _cur_frame; + _curFrame = _animation.rlf->getFrameData(frameNumber); + return _curFrame; } else { _animation.avi->seekToFrame(frameNumber); - _cur_frame = _animation.avi->decodeNextFrame(); - return _cur_frame; + _curFrame = _animation.avi->decodeNextFrame(); + return _curFrame; } } diff --git a/engines/zvision/animation/meta_animation.h b/engines/zvision/animation/meta_animation.h index 2ea00310f9..4795a388e4 100644 --- a/engines/zvision/animation/meta_animation.h +++ b/engines/zvision/animation/meta_animation.h @@ -57,7 +57,7 @@ public: int32 start; int32 stop; int32 loop; - int32 _cur_frm; + int32 _curFrame; int32 _delay; Graphics::Surface *_scaled; }; @@ -77,7 +77,7 @@ private: FileType _fileType; int32 _frmDelay; - const Graphics::Surface *_cur_frame; + const Graphics::Surface *_curFrame; public: |