[Scummvm-cvs-logs] SF.net SVN: scummvm:[44694] scummvm/trunk/engines/sci/gui/gui_picture.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Tue Oct 6 15:30:20 CEST 2009


Revision: 44694
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44694&view=rev
Author:   m_kiewitz
Date:     2009-10-06 13:30:20 +0000 (Tue, 06 Oct 2009)

Log Message:
-----------
SCI/newgui: removed warnings from vector drawing

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_picture.cpp

Modified: scummvm/trunk/engines/sci/gui/gui_picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-06 12:33:36 UTC (rev 44693)
+++ scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-06 13:30:20 UTC (rev 44694)
@@ -351,7 +351,6 @@
 			vectorGetAbsCoords(data, curPos, oldx, oldy);
 			while (vectorIsNonOpcode(data[curPos])) {
 				vectorGetRelCoords(data, curPos, oldx, oldy, x, y);
-				//warning("line %d %d -> %d %d", oldy, oldx, y, x);
 				_gfx->Draw_Line(oldx, oldy, x, y, pic_color, pic_priority, pic_control);
 				oldx = x; oldy = y;
 			}
@@ -360,7 +359,6 @@
 			vectorGetAbsCoords(data, curPos, oldx, oldy);
 			while (vectorIsNonOpcode(data[curPos])) {
 				vectorGetRelCoordsMed(data, curPos, oldx, oldy, x, y);
-				//warning("line %d %d -> %d %d", oldy, oldx, y, x);
 				_gfx->Draw_Line(oldx, oldy, x, y, pic_color, pic_priority, pic_control);
 				oldx = x; oldy = y;
 			}
@@ -369,7 +367,6 @@
 			vectorGetAbsCoords(data, curPos, oldx, oldy);
 			while (vectorIsNonOpcode(data[curPos])) {
 				vectorGetAbsCoords(data, curPos, x, y);
-				//warning("line %d %d -> %d %d", oldy, oldx, y, x);
 				_gfx->Draw_Line(oldx, oldy, x, y, pic_color, pic_priority, pic_control);
 				oldx = x; oldy = y;
 			}
@@ -378,7 +375,6 @@
 		case PIC_OP_FILL: //fill
 			while (vectorIsNonOpcode(data[curPos])) {
 				vectorGetAbsCoords(data, curPos, x, y);
-				//warning("fill %d %d", y, x);
 				_gfx->Pic_Fill(x, y, pic_color, pic_priority, pic_control);
 			}
 			break;
@@ -389,24 +385,20 @@
 		case PIC_OP_SHORT_PATTERNS:
 			vectorGetPatternTexture(data, curPos, pattern_Code, pattern_Texture);
 			vectorGetAbsCoords(data, curPos, x, y);
-			//warning("pattern %d %d", y, x);
 			_gfx->Draw_Pattern(x, y, pic_color, pic_priority, pic_control, pattern_Code, pattern_Texture);
 			while (vectorIsNonOpcode(data[curPos])) {
 				vectorGetPatternTexture(data, curPos, pattern_Code, pattern_Texture);
 				vectorGetRelCoords(data, curPos, x, y, x, y);
-				//warning("pattern %d %d", y, x);
 				_gfx->Draw_Pattern(x, y, pic_color, pic_priority, pic_control, pattern_Code, pattern_Texture);
 			}
 			break;
 		case PIC_OP_MEDIUM_PATTERNS:
 			vectorGetPatternTexture(data, curPos, pattern_Code, pattern_Texture);
 			vectorGetAbsCoords(data, curPos, x, y);
-			//warning("pattern %d %d", y, x);
 			_gfx->Draw_Pattern(x, y, pic_color, pic_priority, pic_control, pattern_Code, pattern_Texture);
 			while (vectorIsNonOpcode(data[curPos])) {
 				vectorGetPatternTexture(data, curPos, pattern_Code, pattern_Texture);
 				vectorGetRelCoordsMed(data, curPos, x, y, x, y);
-				//warning("pattern %d %d", y, x);
 				_gfx->Draw_Pattern(x, y, pic_color, pic_priority, pic_control, pattern_Code, pattern_Texture);
 			}
 			break;
@@ -414,8 +406,7 @@
 			while (vectorIsNonOpcode(data[curPos])) {
 				vectorGetPatternTexture(data, curPos, pattern_Code, pattern_Texture);
 				vectorGetAbsCoords(data, curPos, x, y);
-				//warning("pattern %d %d", y, x);
-				//_gfx->Draw_Pattern(x, y, pic_color, pic_priority, pic_control, pattern_Code, pattern_Texture);
+				_gfx->Draw_Pattern(x, y, pic_color, pic_priority, pic_control, pattern_Code, pattern_Texture);
 			}
 			break;
 
@@ -466,7 +457,6 @@
 					error("Unsupported sci1 extended pic-operation %X", pic_op);
 				}
 			} else {
-				//warning("OPX SCI1 %X at %d", data[curPos], curPos);
 				switch (pic_op = data[curPos++]) {
 				case PIC_OPX_VGA_SET_PALETTE_ENTRIES:
 					while (vectorIsNonOpcode(data[curPos])) {


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




More information about the Scummvm-git-logs mailing list