SCI: putting most kGraph functions into GfxPaint16

svn-id: r47887

2 files changed, 12 insertions, 12 deletions

diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index b49df0644b..27437bdcdd 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -271,27 +271,27 @@ reg_t kGraph(EngineState *s, int argc, reg_t *argv) {
 		if (!s->resMan->isVGA() && !s->resMan->isAmiga32color())
 			color &= 0x0F;
 
-		s->_gui->graphDrawLine(Common::Point(x, y), Common::Point(x1, y1), color, priority, control);
+		s->_gfxPaint16->kernelGraphDrawLine(Common::Point(x, y), Common::Point(x1, y1), color, priority, control);
 		break;
 
 	case K_GRAPH_SAVE_BOX:
 		rect = kGraphCreateRect(x, y, x1, y1);
 		screenMask = (argc > 5) ? argv[5].toUint16() : 0;
-		return s->_gui->graphSaveBox(rect, screenMask);
+		return s->_gfxPaint16->kernelGraphSaveBox(rect, screenMask);
 
 	case K_GRAPH_RESTORE_BOX:
 		// This may be called with a memoryhandle from SAVE_BOX or SAVE_UPSCALEDHIRES_BOX
-		s->_gui->graphRestoreBox(argv[1]);
+		s->_gfxPaint16->kernelGraphRestoreBox(argv[1]);
 		break;
 
 	case K_GRAPH_FILL_BOX_BACKGROUND:
 		rect = kGraphCreateRect(x, y, x1, y1);
-		s->_gui->graphFillBoxBackground(rect);
+		s->_gfxPaint16->kernelGraphFillBoxBackground(rect);
 		break;
 
 	case K_GRAPH_FILL_BOX_FOREGROUND:
 		rect = kGraphCreateRect(x, y, x1, y1);
-		s->_gui->graphFillBoxForeground(rect);
+		s->_gfxPaint16->kernelGraphFillBoxForeground(rect);
 		break;
 
 	case K_GRAPH_FILL_BOX_ANY:
@@ -301,14 +301,14 @@ reg_t kGraph(EngineState *s, int argc, reg_t *argv) {
 		colorMask = argv[5].toUint16();
 
 		rect = kGraphCreateRect(x, y, x1, y1);
-		s->_gui->graphFillBox(rect, colorMask, color, priority, control);
+		s->_gfxPaint16->kernelGraphFillBox(rect, colorMask, color, priority, control);
 		break;
 
 	case K_GRAPH_UPDATE_BOX: {
 		rect = kGraphCreateRect(x, y, x1, y1);
 		bool hiresMode = (argc > 6) ? true : false;
 		// argc == 7 on upscaled hires
-		s->_gui->graphUpdateBox(rect, hiresMode);
+		s->_gfxPaint16->kernelGraphUpdateBox(rect, hiresMode);
 		break;
 	}
 
@@ -325,7 +325,7 @@ reg_t kGraph(EngineState *s, int argc, reg_t *argv) {
 
 	case K_GRAPH_SAVE_UPSCALEDHIRES_BOX:
 		rect = kGraphCreateRect(x, y, x1, y1);
-		return s->_gui->graphSaveUpscaledHiresBox(rect);
+		return s->_gfxPaint16->kernelGraphSaveUpscaledHiresBox(rect);
 
 	default:
 		warning("Unsupported kGraph() operation %04x", argv[0].toSint16());
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 86a0a67918..7797ead3e6 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -27,7 +27,7 @@
 #include "sci/engine/state.h"
 #include "sci/engine/selector.h"
 #include "sci/engine/kernel.h"
-#include "sci/graphics/gui.h"
+#include "sci/graphics/paint16.h"
 #include "sci/graphics/palette.h"
 
 #include "common/list.h"
@@ -307,7 +307,7 @@ static void draw_line(EngineState *s, Common::Point p1, Common::Point p2, int ty
 	p2.y = CLIP<int16>(p2.y, 0, height - 1);
 
 	assert(type >= 0 && type <= 3);
-	s->_gui->graphDrawLine(p1, p2, poly_colors[type], 255, 255);
+	s->_gfxPaint16->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 +328,7 @@ static void draw_point(EngineState *s, Common::Point p, int start, int width, in
 	rect.right = CLIP<int16>(rect.right, 0, width - 1);
 
 	assert(start >= 0 && start <= 1);
-	s->_gui->graphFrameBox(rect, point_colors[start]);
+	s->_gfxPaint16->kernelGraphFrameBox(rect, point_colors[start]);
 }
 
 static void draw_polygon(EngineState *s, reg_t polygon, int width, int height) {
@@ -1417,7 +1417,7 @@ reg_t kAvoidPath(EngineState *s, int argc, reg_t *argv) {
 			}
 
 			// Update the whole screen
-			s->_gui->graphUpdateBox(Common::Rect(0, 0, width - 1, height - 1), width > 320);
+			s->_gfxPaint16->kernelGraphUpdateBox(Common::Rect(0, 0, width - 1, height - 1), width > 320);
 		}
 
 		PathfindingState *p = convert_polygon_set(s, poly_list, start, end, width, height, opt);