[Scummvm-cvs-logs] CVS: scummvm/scumm/smush blitter.h,1.5,1.6 codec47.cpp,1.6,1.7 codec47.h,1.4,1.5 player.cpp,1.26,1.27 player.h,1.7,1.8
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sun Dec 29 09:56:03 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv17276
Modified Files:
blitter.h codec47.cpp codec47.h player.cpp player.h
Log Message:
changed a little structure for codec47
Index: blitter.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/blitter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- blitter.h 31 Aug 2002 13:29:09 -0000 1.5
+++ blitter.h 29 Dec 2002 17:55:16 -0000 1.6
@@ -77,6 +77,7 @@
void putBlock(byte *); //!< This method allows to blit one block directly from a buffer
void putBlock(uint32, uint32, uint32, uint32); //!< This method allows to blit one block from a 4 int32 value
void blockCopy(int32); //!< This method allows to copy one block from another separated by the given offset
+ byte * getPtr() { return _ptr; }
};
#endif
Index: codec47.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- codec47.cpp 29 Dec 2002 16:58:37 -0000 1.6
+++ codec47.cpp 29 Dec 2002 17:55:16 -0000 1.7
@@ -24,7 +24,25 @@
#include "chunk.h"
#include "blitter.h"
-bool DumpDecoder::decode(Blitter & dst, Chunk & src) {
+bool Codec47Decoder::initSize(const Point & p, const Rect & r) {
+ Decoder::initSize(p, r);
+ clean();
+ int32 frame_size = getRect().width() * getRect().height();
+
+ return true;
+}
+
+Codec47Decoder::Codec47Decoder() {
+}
+
+void Codec47Decoder::clean() {
+}
+
+Codec47Decoder::~Codec47Decoder() {
+ clean();
+}
+
+bool Codec47Decoder::decode(Blitter & dst, Chunk & src) {
return true;
}
Index: codec47.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- codec47.h 22 Sep 2002 00:20:23 -0000 1.4
+++ codec47.h 29 Dec 2002 17:55:16 -0000 1.5
@@ -26,12 +26,16 @@
#include "decoder.h"
-/*! @brief ::decoder for debugging purpose.
+class Codec47Decoder : public Decoder {
+private:
+
+public:
+ bool initSize(const Point &, const Rect &);
+ Codec47Decoder();
+ void clean();
+ virtual ~Codec47Decoder();
-*/
-class DumpDecoder : public Decoder {
public:
- virtual ~DumpDecoder() {}
bool decode(Blitter &, Chunk &);
};
Index: player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/player.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- player.cpp 29 Dec 2002 17:22:45 -0000 1.26
+++ player.cpp 29 Dec 2002 17:55:16 -0000 1.27
@@ -487,8 +487,8 @@
_codec1.initSize(_frameSize, r);
_codec37.initSize(_frameSize, r);
+ _codec47.initSize(_frameSize, r);
_codec44.initSize(_frameSize, r);
- _codecd.initSize(_frameSize, r);
_alreadyInit = true;
}
@@ -527,7 +527,7 @@
break;
case 47:
initSize(r, false, true);
- decodeCodec(b, r, _codecd);
+ decodeCodec(b, r, _codec47);
break;
case 21:
case 44:
Index: player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/player.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- player.h 15 Sep 2002 19:28:34 -0000 1.7
+++ player.h 29 Dec 2002 17:55:16 -0000 1.8
@@ -56,8 +56,8 @@
FontRenderer * _fr[4]; //!< pointers to the fonts for the animation
Codec1Decoder _codec1; //!< the ::decoder for codec 1 and 3
Codec37Decoder _codec37; //!< the ::decoder for codec 37
+ Codec47Decoder _codec47; //!< the ::decoder for codec 47
Codec44Decoder _codec44; //!< the ::decoder for codec 21 and 44
- DumpDecoder _codecd; //!< the ::decoder for codec 21 and 44
Point _frameSize; //!< the current frame size of the animation
int32 _frame; //!< the current frame number of the animation
bool _outputSound; //!< should we handle sound ?
More information about the Scummvm-git-logs
mailing list