[Scummvm-cvs-logs] SF.net SVN: scummvm:[44593] scummvm/trunk/engines/sci/gui32

[m_kiewitz at users.sourceforge.net]

Revision: 44593
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44593&view=rev
Author:   m_kiewitz
Date:     2009-10-04 10:42:18 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
SCI/oldgui: onControl code moved

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui32/gui32.cpp
    scummvm/trunk/engines/sci/gui32/gui32.h

Modified: scummvm/trunk/engines/sci/gui32/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-10-04 09:38:57 UTC (rev 44592)
+++ scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-10-04 10:42:18 UTC (rev 44593)
@@ -711,6 +711,33 @@
 	warning("STUB");
 }
 
+int16 SciGUI32::onControl(byte screenMask, Common::Rect rect) {
+	gfx_map_mask_t map = (gfx_map_mask_t)screenMask;
+	rect_t gfxrect = gfx_rect(rect.left, rect.top + 10, rect.width(), rect.height());
+
+	return gfxop_scan_bitmask(s->gfx_state, gfxrect, map);
+// old code
+//	int xstart, ystart;
+//	int xlen = 1, ylen = 1;
+//
+//	if (argc == 2 || argc == 4)
+//		map = GFX_MASK_CONTROL;
+//	else {
+//		arg = 1;
+//		map = (gfx_map_mask_t) argv[0].toSint16();
+//	}
+//
+//	ystart = argv[arg + 1].toSint16();
+//	xstart = argv[arg].toSint16();
+//
+//	if (argc > 3) {
+//		ylen = argv[arg + 3].toSint16() - ystart;
+//		xlen = argv[arg + 2].toSint16() - xstart;
+//	}
+//
+//	return make_reg(0, gfxop_scan_bitmask(s->gfx_state, gfx_rect(xstart, ystart + 10, xlen, ylen), map));
+}
+
 void SciGUI32::moveCursor(int16 x, int16 y) {
 	Common::Point newPos;
 

Modified: scummvm/trunk/engines/sci/gui32/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-04 09:38:57 UTC (rev 44592)
+++ scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-04 10:42:18 UTC (rev 44593)
@@ -67,6 +67,8 @@
 	virtual int16 paletteFind(int r, int g, int b);
 	void paletteAnimate(int fromColor, int toColor, int speed);
 
+	int16 onControl(byte screenMask, Common::Rect rect);
+
 	void moveCursor(int16 x, int16 y);
 
 private:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.