From 14378cb56e18237cf1b8b5e088995e0b91f47410 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 28 Mar 2004 16:30:50 +0000
Subject: Renamed more OSystem methods

svn-id: r13410
---
 sword1/screen.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'sword1/screen.cpp')

diff --git a/sword1/screen.cpp b/sword1/screen.cpp
index cc422bcd6c..c64551b88c 100644
--- a/sword1/screen.cpp
+++ b/sword1/screen.cpp
@@ -137,7 +137,7 @@ bool Screen::showScrollFrame(void) {
 	uint16 avgScrlX = (uint16)(_oldScrollX + Logic::_scriptVars[SCROLL_OFFSET_X]) / 2;
 	uint16 avgScrlY = (uint16)(_oldScrollY + Logic::_scriptVars[SCROLL_OFFSET_Y]) / 2;
 
-	_system->copy_rect(_screenBuf + avgScrlY * _scrnSizeX + avgScrlX, _scrnSizeX, 0, 40, SCREEN_WIDTH, SCREEN_DEPTH);
+	_system->copyRectToScreen(_screenBuf + avgScrlY * _scrnSizeX + avgScrlX, _scrnSizeX, 0, 40, SCREEN_WIDTH, SCREEN_DEPTH);
 	_system->updateScreen();
 	return true;
 }
@@ -165,7 +165,7 @@ void Screen::updateScreen(void) {
 			copyWidth = _scrnSizeX - scrlX;
 		if (scrlY + copyHeight > _scrnSizeY)
 			copyHeight = _scrnSizeY - scrlY;
-		_system->copy_rect(_screenBuf + scrlY * _scrnSizeX + scrlX, _scrnSizeX, 0, 40, copyWidth, copyHeight);
+		_system->copyRectToScreen(_screenBuf + scrlY * _scrnSizeX + scrlX, _scrnSizeX, 0, 40, copyWidth, copyHeight);
 	} else {
 		// partial screen update only. The screen coordinates probably won't fit to the
 		// grid holding the informations on which blocks have to be updated.
@@ -188,14 +188,14 @@ void Screen::updateScreen(void) {
 					int16 xPos = (cntx - cpWidth) * SCRNGRID_X - diffX;
 					if (xPos < 0)
 						xPos = 0;
-					_system->copy_rect(scrnBuf + xPos, _scrnSizeX, xPos, 40, cpWidth * SCRNGRID_X, diffY);
+					_system->copyRectToScreen(scrnBuf + xPos, _scrnSizeX, xPos, 40, cpWidth * SCRNGRID_X, diffY);
 					cpWidth = 0;
 				}
 			if (cpWidth) {
 				int16 xPos = (gridW - cpWidth) * SCRNGRID_X - diffX;
 				if (xPos < 0)
 					xPos = 0;
-				_system->copy_rect(scrnBuf + xPos, _scrnSizeX, xPos, 40, SCREEN_WIDTH - xPos, diffY);
+				_system->copyRectToScreen(scrnBuf + xPos, _scrnSizeX, xPos, 40, SCREEN_WIDTH - xPos, diffY);
 			}
 			scrlY += diffY;
 		}
@@ -211,14 +211,14 @@ void Screen::updateScreen(void) {
 					cpHeight++;
 				} else if (cpHeight) {
 					uint16 yPos = (cnty - cpHeight) * SCRNGRID_Y;
-					_system->copy_rect(scrnBuf + yPos * _scrnSizeX, _scrnSizeX, 0, yPos + diffY + 40, diffX, cpHeight * SCRNGRID_Y);
+					_system->copyRectToScreen(scrnBuf + yPos * _scrnSizeX, _scrnSizeX, 0, yPos + diffY + 40, diffX, cpHeight * SCRNGRID_Y);
 					cpHeight = 0;
 				}
 				gridPos += _gridSizeX;
 			}
 			if (cpHeight) {
 				uint16 yPos = (gridH - cpHeight) * SCRNGRID_Y;
-				_system->copy_rect(scrnBuf + yPos * _scrnSizeX, _scrnSizeX, 0, yPos + diffY + 40, diffX, SCREEN_DEPTH - (yPos + diffY));
+				_system->copyRectToScreen(scrnBuf + yPos * _scrnSizeX, _scrnSizeX, 0, yPos + diffY + 40, diffX, SCREEN_DEPTH - (yPos + diffY));
 			}
 			scrlX += diffX;
 		}
@@ -235,12 +235,12 @@ void Screen::updateScreen(void) {
 					gridPos[cntx] >>= 1;
 					cpWidth++;
 				} else if (cpWidth) {
-					_system->copy_rect(scrnBuf + (cntx - cpWidth) * SCRNGRID_X, _scrnSizeX, (cntx - cpWidth) * SCRNGRID_X + diffX, cnty * SCRNGRID_Y + diffY + 40, cpWidth * SCRNGRID_X, cpHeight);
+					_system->copyRectToScreen(scrnBuf + (cntx - cpWidth) * SCRNGRID_X, _scrnSizeX, (cntx - cpWidth) * SCRNGRID_X + diffX, cnty * SCRNGRID_Y + diffY + 40, cpWidth * SCRNGRID_X, cpHeight);
 					cpWidth = 0;
 				}
 			if (cpWidth) {
 				uint16 xPos = (gridW - cpWidth) * SCRNGRID_X;
-				_system->copy_rect(scrnBuf + xPos, _scrnSizeX, xPos + diffX, cnty * SCRNGRID_Y + diffY + 40, SCREEN_WIDTH - (xPos + diffX), cpHeight);
+				_system->copyRectToScreen(scrnBuf + xPos, _scrnSizeX, xPos + diffX, cnty * SCRNGRID_Y + diffY + 40, SCREEN_WIDTH - (xPos + diffX), cpHeight);
 			}
 			gridPos += _gridSizeX;
 			scrnBuf += _scrnSizeX * SCRNGRID_Y;
@@ -797,7 +797,7 @@ void Screen::showFrame(uint16 x, uint16 y, uint32 resId, uint32 frameNo, const b
 		}
 	}
 
-	_system->copy_rect(frame, 40, x, y, 40, 40);
+	_system->copyRectToScreen(frame, 40, x, y, 40, 40);
 }
 
 // ------------------- router debugging code --------------------------------
@@ -960,7 +960,7 @@ void Screen::plotYUV(byte *lut, int width, int height, byte *const *dat) {
 		ypos += width;
 	}
 
-	_system->copy_rect(buf, width, (640-width)/2, (480-height)/2, width, height);
+	_system->copyRectToScreen(buf, width, (640-width)/2, (480-height)/2, width, height);
 	_system->updateScreen();
 
 	free(buf);
-- 
cgit v1.2.3