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

[m_kiewitz at users.sourceforge.net]

Revision: 47888
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47888&view=rev
Author:   m_kiewitz
Date:     2010-02-04 20:43:00 +0000 (Thu, 04 Feb 2010)

Log Message:
-----------
SCI: making pathfinding debug support also work in sci32 (though it just shows the path for 2.5 seconds there)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kpathing.cpp
    scummvm/trunk/engines/sci/graphics/paint.cpp
    scummvm/trunk/engines/sci/graphics/paint.h
    scummvm/trunk/engines/sci/graphics/paint32.cpp
    scummvm/trunk/engines/sci/graphics/paint32.h
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/engine/kpathing.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kpathing.cpp	2010-02-04 20:18:01 UTC (rev 47887)
+++ scummvm/trunk/engines/sci/engine/kpathing.cpp	2010-02-04 20:43:00 UTC (rev 47888)
@@ -29,6 +29,7 @@
 #include "sci/engine/kernel.h"
 #include "sci/graphics/paint16.h"
 #include "sci/graphics/palette.h"
+#include "sci/graphics/screen.h"
 
 #include "common/list.h"
 
@@ -307,7 +308,7 @@
 	p2.y = CLIP<int16>(p2.y, 0, height - 1);
 
 	assert(type >= 0 && type <= 3);
-	s->_gfxPaint16->kernelGraphDrawLine(p1, p2, poly_colors[type], 255, 255);
+	s->_gfxPaint->kernelGraphDrawLine(p1, p2, poly_colors[type], 255, 255);
 }
 
 static void draw_point(EngineState *s, Common::Point p, int start, int width, int height) {
@@ -328,7 +329,8 @@
 	rect.right = CLIP<int16>(rect.right, 0, width - 1);
 
 	assert(start >= 0 && start <= 1);
-	s->_gfxPaint16->kernelGraphFrameBox(rect, point_colors[start]);
+	if (s->_gfxPaint16)
+		s->_gfxPaint16->kernelGraphFrameBox(rect, point_colors[start]);
 }
 
 static void draw_polygon(EngineState *s, reg_t polygon, int width, int height) {
@@ -1405,8 +1407,6 @@
 		}
 
 		if (Common::isDebugChannelEnabled(kDebugLevelAvoidPath)) {
-			assert(s->_gui);
-
 			debug("[avoidpath] Pathfinding input:");
 			draw_point(s, start, 1, width, height);
 			draw_point(s, end, 0, width, height);
@@ -1417,7 +1417,10 @@
 			}
 
 			// Update the whole screen
-			s->_gfxPaint16->kernelGraphUpdateBox(Common::Rect(0, 0, width - 1, height - 1), width > 320);
+			s->_gfxScreen->copyToScreen();
+			g_system->updateScreen();
+			if (!s->_gfxPaint16)
+				g_system->delayMillis(2500);
 		}
 
 		PathfindingState *p = convert_polygon_set(s, poly_list, start, end, width, height, opt);

Modified: scummvm/trunk/engines/sci/graphics/paint.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/paint.cpp	2010-02-04 20:18:01 UTC (rev 47887)
+++ scummvm/trunk/engines/sci/graphics/paint.cpp	2010-02-04 20:43:00 UTC (rev 47888)
@@ -46,4 +46,7 @@
 void GfxPaint::kernelDrawCel(GuiResourceId viewId, int16 loopNo, int16 celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, bool hiresMode, reg_t upscaledHiresHandle) {
 }
 
+void GfxPaint::kernelGraphDrawLine(Common::Point startPoint, Common::Point endPoint, int16 color, int16 priority, int16 control) {
+}
+
 } // End of namespace Sci

Modified: scummvm/trunk/engines/sci/graphics/paint.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/paint.h	2010-02-04 20:18:01 UTC (rev 47887)
+++ scummvm/trunk/engines/sci/graphics/paint.h	2010-02-04 20:43:00 UTC (rev 47888)
@@ -39,6 +39,7 @@
 
 	virtual void kernelDrawPicture(GuiResourceId pictureId, int16 animationNr, bool animationBlackoutFlag, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo);
 	virtual void kernelDrawCel(GuiResourceId viewId, int16 loopNo, int16 celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, bool hiresMode, reg_t upscaledHiresHandle);
+	virtual void kernelGraphDrawLine(Common::Point startPoint, Common::Point endPoint, int16 color, int16 priority, int16 control);
 
 private:
 };

Modified: scummvm/trunk/engines/sci/graphics/paint32.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/paint32.cpp	2010-02-04 20:18:01 UTC (rev 47887)
+++ scummvm/trunk/engines/sci/graphics/paint32.cpp	2010-02-04 20:43:00 UTC (rev 47888)
@@ -74,4 +74,8 @@
 	_screen->copyRectToScreen(celRect);
 }
 
+void GfxPaint32::kernelGraphDrawLine(Common::Point startPoint, Common::Point endPoint, int16 color, int16 priority, int16 control) {
+	_screen->drawLine(startPoint.x, startPoint.y, endPoint.x, endPoint.y, color, priority, control);
+}
+
 } // End of namespace Sci

Modified: scummvm/trunk/engines/sci/graphics/paint32.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/paint32.h	2010-02-04 20:18:01 UTC (rev 47887)
+++ scummvm/trunk/engines/sci/graphics/paint32.h	2010-02-04 20:43:00 UTC (rev 47888)
@@ -44,6 +44,7 @@
 
 	void kernelDrawPicture(GuiResourceId pictureId, int16 animationNr, bool animationBlackoutFlag, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo);
 	void kernelDrawCel(GuiResourceId viewId, int16 loopNo, int16 celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, bool hiresMode, reg_t upscaledHiresHandle);
+	void kernelGraphDrawLine(Common::Point startPoint, Common::Point endPoint, int16 color, int16 priority, int16 control);
 
 private:
 	ResourceManager *_resMan;

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-02-04 20:18:01 UTC (rev 47887)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-02-04 20:43:00 UTC (rev 47888)
@@ -176,6 +176,7 @@
 		_gamestate->_gfxAnimate = 0;
 		_gamestate->_gfxControls = 0;
 		_gamestate->_gfxMenu = 0;
+		_gamestate->_gfxPaint16 = 0;
 		_gamestate->_gfxPorts = 0;
 		_gamestate->_gui = 0;
 		_gamestate->_gui32 = new SciGui32(_gamestate, screen, palette, cache, cursor);


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