[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.24,1.25 control.cpp,1.29,1.30 mouse.cpp,1.23,1.24 screen.cpp,1.42,1.43 sword1.cpp,1.41,1.42

Sun Mar 28 08:43:16 CEST 2004

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15464/sword1

Modified Files:
	animation.cpp control.cpp mouse.cpp screen.cpp sword1.cpp 
Log Message:
Renamed more OSystem methods

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25

--- animation.cpp	24 Mar 2004 07:29:59 -0000	1.24
+++ animation.cpp	28 Mar 2004 16:30:49 -0000	1.25
@@ -48,7 +48,7 @@
 	_scr->plotYUV(lut, width, height, dat);
 #else
 	plotYUV(lookup, width, height, dat);
-	_sys->copy_rect_overlay(overlay, MOVIE_WIDTH, 0, 40, MOVIE_WIDTH, MOVIE_HEIGHT);
+	_sys->copyRectToOverlay(overlay, MOVIE_WIDTH, 0, 40, MOVIE_WIDTH, MOVIE_HEIGHT);
 #endif
 }
 

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- control.cpp	28 Mar 2004 12:59:51 -0000	1.29
+++ control.cpp	28 Mar 2004 16:30:49 -0000	1.30
@@ -141,7 +141,7 @@
 		dst += SCREEN_WIDTH;
 		src += FROM_LE_16(fHead->width);
 	}
-	_system->copy_rect(_dstBuf, SCREEN_WIDTH, _x, _y, _width, _height);
+	_system->copyRectToScreen(_dstBuf, SCREEN_WIDTH, _x, _y, _width, _height);
 }
 
 bool ControlButton::wasClicked(uint16 mouseX, uint16 mouseY) {
@@ -197,7 +197,7 @@
 			memset(_screenBuf, 0, 640 * 480);
 			renderText(textA, 320, 220, TEXT_CENTER);
 			renderText(_lStrings[STR_INSERT_CD_B], 320, 240, TEXT_CENTER);
-			_system->copy_rect(_screenBuf, 640, 0, 0, 640, 480);
+			_system->copyRectToScreen(_screenBuf, 640, 0, 0, 640, 480);
 			_system->updateScreen();
 		}
 		delay(300);
@@ -206,7 +206,7 @@
 			if (!test.isOpen()) {
 				memset(_screenBuf, 0, 640 * 480);
 				renderText(_lStrings[STR_INCORRECT_CD], 320, 230, TEXT_CENTER);
-				_system->copy_rect(_screenBuf, 640, 0, 0, 640, 480);
+				_system->copyRectToScreen(_screenBuf, 640, 0, 0, 640, 480);
 				_system->updateScreen();
 				delay(2000);
 				refreshText = true;
@@ -284,7 +284,7 @@
 		}
 		if (fullRefresh) {
 			fullRefresh = false;
-			_system->copy_rect(_screenBuf, SCREEN_WIDTH, 0, 0, SCREEN_WIDTH, 480);
+			_system->copyRectToScreen(_screenBuf, SCREEN_WIDTH, 0, 0, SCREEN_WIDTH, 480);
 		}
 		_system->updateScreen();
 		delay(1000 / 12);
@@ -294,7 +294,7 @@
 	_resMan->resClose(fontId);
 	_resMan->resClose(redFontId);
 	memset(_screenBuf, 0, 640 * 480);
-	_system->copy_rect(_screenBuf, 640, 0, 0, 640, 480);
+	_system->copyRectToScreen(_screenBuf, 640, 0, 0, 640, 480);
 	free(_screenBuf);
 	_mouse->controlPanel(false);
 	_music->startMusic(Logic::_scriptVars[CURRENT_MUSIC], 1);
@@ -840,7 +840,7 @@
 		destX += FROM_LE_16(chSpr->width) - 3;
 		str++;
 	}
-	_system->copy_rect(_screenBuf + y * SCREEN_WIDTH + x, SCREEN_WIDTH, x, y, (destX - x) + 3, 28);
+	_system->copyRectToScreen(_screenBuf + y * SCREEN_WIDTH + x, SCREEN_WIDTH, x, y, (destX - x) + 3, 28);
 }
 
 void Control::renderVolumeBar(uint8 id, uint8 volL, uint8 volR) {
@@ -857,7 +857,7 @@
 			srcMem += FROM_LE_16(frHead->width);
 			destMem += SCREEN_WIDTH;
 		}
-		_system->copy_rect(_screenBuf + destY * SCREEN_WIDTH + destX, SCREEN_WIDTH, destX, destY, FROM_LE_16(frHead->width), FROM_LE_16(frHead->height));
+		_system->copyRectToScreen(_screenBuf + destY * SCREEN_WIDTH + destX, SCREEN_WIDTH, destX, destY, FROM_LE_16(frHead->width), FROM_LE_16(frHead->height));
 		_resMan->resClose(SR_VLIGHT);
 		destX += 32;
 	}

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mouse.cpp	13 Feb 2004 11:04:15 -0000	1.23
+++ mouse.cpp	28 Mar 2004 16:30:49 -0000	1.24
@@ -52,7 +52,7 @@
 	for (uint8 cnt = 0; cnt < 17; cnt++)	 // force res manager to keep mouse 
 		_resMan->resOpen(MSE_POINTER + cnt); // cursors in memory all the time
 	
-	_system->show_mouse(false);
+	_system->showMouse(false);
 	createPointer(0, 0);
 }
 
@@ -240,11 +240,11 @@
 	createPointer(resId, _currentLuggageId);
 
 	if ((resId == 0) || (!(Logic::_scriptVars[MOUSE_STATUS] & 1) && (!_mouseOverride))) {
-		_system->set_mouse_cursor(NULL, 0, 0, 0, 0);
-		_system->show_mouse(false);
+		_system->setMouseCursor(NULL, 0, 0, 0, 0);
+		_system->showMouse(false);
 	} else {
 		animate();
-		_system->show_mouse(true);
+		_system->showMouse(true);
 	}
 }
 
@@ -259,7 +259,7 @@
 		_frame = (_frame + 1) % _currentPtr->numFrames;
 		uint8 *ptrData = (uint8*)_currentPtr + sizeof(MousePtr);
 		ptrData += _frame * _currentPtr->sizeX * _currentPtr->sizeY;
-		_system->set_mouse_cursor(ptrData, _currentPtr->sizeX, _currentPtr->sizeY, _currentPtr->hotSpotX, _currentPtr->hotSpotY);
+		_system->setMouseCursor(ptrData, _currentPtr->sizeX, _currentPtr->sizeY, _currentPtr->hotSpotX, _currentPtr->hotSpotY);
 	}
 }
 

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- screen.cpp	1 Mar 2004 08:04:10 -0000	1.42
+++ screen.cpp	28 Mar 2004 16:30:49 -0000	1.43
@@ -137,7 +137,7 @@
 	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 @@
 			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 @@
 					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 @@
 					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 @@
 					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 @@
 		}
 	}
 
-	_system->copy_rect(frame, 40, x, y, 40, 40);
+	_system->copyRectToScreen(frame, 40, x, y, 40, 40);
 }
 
 // ------------------- router debugging code --------------------------------
@@ -960,7 +960,7 @@
 		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);

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- sword1.cpp	3 Mar 2004 07:37:46 -0000	1.41
+++ sword1.cpp	28 Mar 2004 16:30:49 -0000	1.42
@@ -170,7 +170,7 @@
 	_logic->initialize();     // now reinitialize these objects as they (may) have locked
 	_objectMan->initialize(); // resources which have just been wiped.
 	_mouse->initialize();
-	_system->warp_mouse(320, 240);
+	_system->warpMouse(320, 240);
 	_systemVars.wantFade = true;
 }
 



