[Scummvm-cvs-logs] scummvm master -> 7f3443c424ab71da4bcdf5186f4ea720c7ed6eb6

sev- sev at scummvm.org
Sun Dec 22 00:44:58 CET 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7f3443c424 FULLPIPE: Implement BigPicture::draw()


Commit: 7f3443c424ab71da4bcdf5186f4ea720c7ed6eb6
    https://github.com/scummvm/scummvm/commit/7f3443c424ab71da4bcdf5186f4ea720c7ed6eb6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-21T15:44:08-08:00

Commit Message:
FULLPIPE: Implement BigPicture::draw()

Changed paths:
    engines/fullpipe/gfx.cpp
    engines/fullpipe/gfx.h



diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 9aa4f21..4b0125e 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -1178,6 +1178,34 @@ bool BigPicture::load(MfcArchive &file) {
 	return true;
 }
 
+void BigPicture::draw(int x, int y, int style, int angle) {
+	if (_bitmap)
+		init();
+
+	if (_bitmap) {
+		_bitmap->_flags &= 0xFEFFFFFF;
+
+		int nx = _x;
+		int ny = _y;
+
+		if (x != -1)
+			nx = x;
+
+		if (y != -1)
+			ny = y;
+
+		if (_alpha < 0xFF) {
+			//vrtSetAlphaBlendMode(g_vrtDrawHandle, 1, v9);
+		}
+
+		_bitmap->putDib(nx, ny, 0);
+
+		if (_alpha < 0xFF) {
+			//vrtSetAlphaBlendMode(g_vrtDrawHandle, 0, 255);
+		}
+	}
+}
+
 Shadows::Shadows() {
 	_staticAniObjectId = 0;
 	_movementId = 0;
diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h
index 9d5c45d..72495bf 100644
--- a/engines/fullpipe/gfx.h
+++ b/engines/fullpipe/gfx.h
@@ -94,7 +94,7 @@ class Picture : public MemoryObject {
 	void init();
 	void getDibInfo();
 	Bitmap *getPixelData();
-	void draw(int x, int y, int style, int angle);
+	virtual void draw(int x, int y, int style, int angle);
 	void drawRotated(int x, int y, int angle);
 
 	byte getAlpha() { return (byte)_alpha; }
@@ -116,6 +116,7 @@ class BigPicture : public Picture {
   public:
 	BigPicture() {}
 	virtual bool load(MfcArchive &file);
+	virtual void draw(int x, int y, int style, int angle);
 };
 
 class GameObject : public CObject {






More information about the Scummvm-git-logs mailing list