diff options
author | Max Horn | 2003-03-13 02:10:48 +0000 |
---|---|---|
committer | Max Horn | 2003-03-13 02:10:48 +0000 |
commit | 4f2a48ac4dc0f58ca3d09f03662bc8cfcaf4968c (patch) | |
tree | 6700aee1b2ff263a249e13edaa7301519bdcde72 /scumm/smush | |
parent | f6b03c0aba8867201612b2036c3a05e1ecfc8773 (diff) | |
download | scummvm-rg350-4f2a48ac4dc0f58ca3d09f03662bc8cfcaf4968c.tar.gz scummvm-rg350-4f2a48ac4dc0f58ca3d09f03662bc8cfcaf4968c.tar.bz2 scummvm-rg350-4f2a48ac4dc0f58ca3d09f03662bc8cfcaf4968c.zip |
cleanup
svn-id: r6809
Diffstat (limited to 'scumm/smush')
-rw-r--r-- | scumm/smush/brenderer.h | 4 | ||||
-rw-r--r-- | scumm/smush/frenderer.cpp | 2 | ||||
-rw-r--r-- | scumm/smush/frenderer.h | 2 | ||||
-rw-r--r-- | scumm/smush/scumm_renderer.cpp | 2 | ||||
-rw-r--r-- | scumm/smush/scumm_renderer.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/scumm/smush/brenderer.h b/scumm/smush/brenderer.h index 0db860297a..9fd616552e 100644 --- a/scumm/smush/brenderer.h +++ b/scumm/smush/brenderer.h @@ -42,7 +42,7 @@ protected: int32 _height; //!< The current frame's height const char *_fname; //!< The filename of the animation being played protected: - virtual void save(int32 frame = -1) = 0; + virtual void save() = 0; protected: const char *getFilename() const { return _fname; }; //!< accessor for animation filename @@ -71,7 +71,7 @@ public: */ class NullRenderer : public BaseRenderer { protected: - void save(int32 frame = -1) {}; + void save() {}; public: NullRenderer() {}; virtual ~NullRenderer() {}; diff --git a/scumm/smush/frenderer.cpp b/scumm/smush/frenderer.cpp index 761d504f74..212ad8f7c0 100644 --- a/scumm/smush/frenderer.cpp +++ b/scumm/smush/frenderer.cpp @@ -41,7 +41,7 @@ FontRenderer::~FontRenderer() { } } -void FontRenderer::save(int32 frame) { +void FontRenderer::save() { _chars[_nbChars].width = _width; _chars[_nbChars].height = _height; int size = _width * _height; diff --git a/scumm/smush/frenderer.h b/scumm/smush/frenderer.h index 8d31a1e87e..93f3b95400 100644 --- a/scumm/smush/frenderer.h +++ b/scumm/smush/frenderer.h @@ -66,7 +66,7 @@ public: virtual ~FontRenderer(); virtual bool wait(int32 ms) { return true; }; protected: - virtual void save(int32 frame = -1); + virtual void save(); /*! @brief get the width of a character. @param c the character we want the width from. diff --git a/scumm/smush/scumm_renderer.cpp b/scumm/smush/scumm_renderer.cpp index 998b60ed22..88fc955883 100644 --- a/scumm/smush/scumm_renderer.cpp +++ b/scumm/smush/scumm_renderer.cpp @@ -293,7 +293,7 @@ bool ScummRenderer::setPalette(const Palette &pal) { return BaseRenderer::setPalette(pal); // For compatibility with possible subclass... } -void ScummRenderer::save(int32 frame) { +void ScummRenderer::save() { int width = MIN(_width, _scumm->_realWidth); int height = MIN(_height, _scumm->_realHeight); diff --git a/scumm/smush/scumm_renderer.h b/scumm/smush/scumm_renderer.h index 4f43051e0e..1432cd8af8 100644 --- a/scumm/smush/scumm_renderer.h +++ b/scumm/smush/scumm_renderer.h @@ -57,7 +57,7 @@ protected: virtual void clean(); virtual bool startDecode(const char *fname, int32 version, int32 nbframes); virtual bool setPalette(const Palette & pal); - virtual void save(int32 frame = -1); + virtual void save(); virtual Mixer *getMixer(); virtual bool prematureClose(); }; |