[Scummvm-cvs-logs] CVS: residual smush.cpp,1.23,1.24 smush.h,1.8,1.9

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13280

Modified Files:
	smush.cpp smush.h 
Log Message:
moved some stuff

Index: smush.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- smush.cpp	21 Feb 2004 22:00:13 -0000	1.23
+++ smush.cpp	22 Feb 2004 06:42:56 -0000	1.24
@@ -311,46 +311,6 @@
 	return true;
 }
 
-void Smush::stop() {
-	deinit();
-}
-
-void Smush::pause(bool pause) {
-	_videoPause = pause;
-}
-
-bool Smush::isPlaying() {
-	return !_videoPause;
-}
-
-bool Smush::isUpdateNeeded() {
-	return _updateNeeded;
-}
-
-int Smush::getX() {
-	return _x;
-}
-
-int Smush::getY() {
-	return _y;
-}
-
-int Smush::getWidth() {
-	return _width;
-}
-
-int Smush::getHeight() {
-	return _height;
-}
-
-byte *Smush::getDstPtr() {
-	return _buf;
-}
-
-void Smush::setUpdateNeeded() {
-	_updateNeeded = true;
-}
-
 FILE *File::fopenNoCase(const char *filename, const char *directory, const char *mode) {
 	FILE *file;
 	char buf[512];

Index: smush.h
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- smush.h	21 Feb 2004 22:00:13 -0000	1.8
+++ smush.h	22 Feb 2004 06:42:56 -0000	1.9
@@ -121,16 +121,16 @@
 	~Smush();
 
 	bool play(const char *filename, int x, int y);
-	void stop();
-	void pause(bool pause);
-	bool isPlaying();
-	bool isUpdateNeeded();
-	byte *getDstPtr();
-	int getX();
-	int getY();
-	int getWidth();
-	int getHeight();
-	void setUpdateNeeded();
+	void stop() { deinit(); }
+	void pause(bool pause) { _videoPause = pause; }
+	bool isPlaying() { return !_videoFinished; }
+	bool isUpdateNeeded() { return _updateNeeded; }
+	byte *getDstPtr() { return _buf; }
+	int getX() { return _x; }
+	int getY() { return _y; }
+	int getWidth() {return _width; }
+	int getHeight() { return _height; }
+	void setUpdateNeeded() { _updateNeeded = true; }
 
 private:
 	static void timerCallback(void *ptr);