[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.123,1.124 screen.cpp,1.45,1.46 screen.h,1.11,1.12

[Robert G?ffringmann]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv7956/sky

Modified Files:
	logic.cpp screen.cpp screen.h 
Log Message:
removed useless _backScreen from SkyScreen

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- logic.cpp	12 Jul 2003 03:40:44 -0000	1.123
+++ logic.cpp	12 Jul 2003 04:21:20 -0000	1.124
@@ -2288,7 +2288,10 @@
 	lowTextManager_t creditText = _skyText->lowTextManager(a , 240, 0, 248, true);
 	Compact *credCompact = SkyState::fetchCompact(creditText.compactNum);
 	credCompact->xcood = 168;
-	credCompact->ycood = (uint16)c;
+	if ((a == 558) && (c == 215))
+		credCompact->ycood = 211;
+	else
+		credCompact->ycood = (uint16)c;
 	_scriptVariables[RESULT] = creditText.compactNum;
 	return true;
 }

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- screen.cpp	11 Jul 2003 22:59:56 -0000	1.45
+++ screen.cpp	12 Jul 2003 04:21:20 -0000	1.46
@@ -51,7 +51,6 @@
 
 	_system->init_size(FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
 	_gameGrid = (uint8 *)malloc(GRID_X * GRID_Y * 2);
-	_backScreen = (uint8 *)malloc(GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT);
 	forceRefresh();
 
 	_currentScreen = NULL;
@@ -81,7 +80,6 @@
 
 	free(_gameGrid);
 	if (_currentScreen) free(_currentScreen);
-	if (_backScreen) free(_backScreen);
 }
 
 void SkyScreen::clearScreen(void) {
@@ -170,7 +168,7 @@
 	if (!screenData) {
 		error("SkyScreen::recreate():\nSkyState::fetchItem(SkyLogic::_scriptVariables[LAYER_0_ID](%X)) returned NULL",SkyLogic::_scriptVariables[LAYER_0_ID]);
 	}
-	uint8 *screenPos = _backScreen;
+	uint8 *screenPos = _currentScreen;
 
 	for (uint8 cnty = 0; cnty < GRID_Y; cnty++) {
 		for (uint8 cntx = 0; cntx < GRID_X; cntx++) {
@@ -196,9 +194,6 @@
 
 void SkyScreen::flip(bool doUpdate) {
 
-	SkyState::_systemVars.mouseFlag |= MF_NO_UPDATE;
-	uint8 *screenPos = _currentScreen;
-	uint8 *backPos = _backScreen;
 	uint32 copyX, copyWidth;
 	copyX = copyWidth = 0;
 	for (uint8 cnty = 0; cnty < GRID_Y; cnty++) {
@@ -207,28 +202,16 @@
 				_gameGrid[cnty * GRID_X + cntx] &= ~1;
 				if (!copyWidth) copyX = cntx * GRID_W;
 				copyWidth += GRID_W;
-				uint8 *copySrc = backPos;
-				uint8 *copyDest = screenPos;
-				for (uint8 gridLineCnt = 0; gridLineCnt < GRID_H; gridLineCnt++) {
-					memcpy(copyDest, copySrc, GRID_W);
-					copySrc += GAME_SCREEN_WIDTH;
-					copyDest += GAME_SCREEN_WIDTH;
-				}
 			} else if (copyWidth) {
 				_system->copy_rect(_currentScreen + cnty * GRID_H * GAME_SCREEN_WIDTH + copyX, GAME_SCREEN_WIDTH, copyX, cnty * GRID_H, copyWidth, GRID_H);
 				copyWidth = 0;
 			}
-			backPos += GRID_W;
-			screenPos += GRID_W;
 		}
 		if (copyWidth) {
 			_system->copy_rect(_currentScreen + cnty * GRID_H * GAME_SCREEN_WIDTH + copyX, GAME_SCREEN_WIDTH, copyX, cnty * GRID_H, copyWidth, GRID_H);
 			copyWidth = 0;
 		}
-		screenPos += (GRID_H - 1) * GAME_SCREEN_WIDTH;
-		backPos += (GRID_H - 1) * GAME_SCREEN_WIDTH;
 	}
-	SkyState::_systemVars.mouseFlag &= ~MF_NO_UPDATE;
 	if (doUpdate)
 		_system->update_screen();
 }
@@ -663,7 +646,7 @@
 		}
 	}
 	_sprX = (uint32)spriteX;
-	uint8 *screenPtr = _backScreen + _sprY * GAME_SCREEN_WIDTH + _sprX;
+	uint8 *screenPtr = _currentScreen + _sprY * GAME_SCREEN_WIDTH + _sprX;
 	if ((_sprHeight > 192) || (_sprY > 192)) {
 		_sprWidth = 0;
 		return;
@@ -730,7 +713,7 @@
 
 	if (_sprWidth == 0) return ;
 	uint32 startGridOfs = (_sprY + _sprHeight - 1) * GRID_X + _sprX;
-	uint8 *startScreenPtr = (_sprY + _sprHeight - 1) * GRID_H * GAME_SCREEN_WIDTH + _sprX * GRID_W + _backScreen;
+	uint8 *startScreenPtr = (_sprY + _sprHeight - 1) * GRID_H * GAME_SCREEN_WIDTH + _sprX * GRID_W + _currentScreen;
 
 	for (uint32 layerCnt = LAYER_1_ID; layerCnt <= LAYER_3_ID; layerCnt++) {
 		uint32 gridOfs = startGridOfs;

Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- screen.h	11 Jul 2003 22:59:56 -0000	1.11
+++ screen.h	12 Jul 2003 04:21:20 -0000	1.12
@@ -100,7 +100,6 @@
 	uint8 *_gameGrid;
 	uint8 *_currentScreen;
 	uint8 *_scrollScreen;
-	uint8 *_backScreen;
 	struct {
 		uint32 framesLeft;
 		uint32 delay;