[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.47,1.48 sky.cpp,1.96,1.97

[Robert G?ffringmann]

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

Modified Files:
	control.cpp sky.cpp 
Log Message:
fixed text drawing bug and made sure autosave doesn't save if engine is in logic_choose mode

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- control.cpp	13 Jul 2003 16:22:16 -0000	1.47
+++ control.cpp	14 Jul 2003 09:16:12 -0000	1.48
@@ -122,18 +122,16 @@
 	_oldX = _x;
 	_oldY = _y;
 	cpWidth = (PAN_LINE_WIDTH > (GAME_SCREEN_WIDTH - _x))?(GAME_SCREEN_WIDTH - _x):(PAN_LINE_WIDTH);
-	if (_spriteData && (cpWidth > _spriteData->s_width))
+	if (cpWidth > _spriteData->s_width)
 		cpWidth = _spriteData->s_width;
-	if (_spriteData)
-		cpHeight = (_spriteData->s_height > (GAME_SCREEN_HEIGHT - _y))?(GAME_SCREEN_HEIGHT - _y):(_spriteData->s_height);
-	else
-		cpHeight = PAN_CHAR_HEIGHT;
+	cpHeight = (_spriteData->s_height > (GAME_SCREEN_HEIGHT - _y))?(GAME_SCREEN_HEIGHT - _y):(_spriteData->s_height);
+	
 	uint8 *screenPos = _screen + _y * GAME_SCREEN_WIDTH + _x;
 	uint8 *copyDest = _oldScreen;
 	uint8 *copySrc = ((uint8 *)_spriteData) + sizeof(dataFileHeader);
 	for (cnty = 0; cnty < cpHeight; cnty++) {
 		memcpy(copyDest, screenPos, cpWidth);
-		for (cntx = 0; cntx < PAN_LINE_WIDTH; cntx++)
+		for (cntx = 0; cntx < cpWidth; cntx++)
 			if (copySrc[cntx]) screenPos[cntx] = copySrc[cntx];
 		copySrc += _spriteData->s_width;
 		copyDest += PAN_LINE_WIDTH;

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- sky.cpp	12 Jul 2003 23:29:31 -0000	1.96
+++ sky.cpp	14 Jul 2003 09:16:12 -0000	1.97
@@ -194,8 +194,12 @@
 		delay(_systemVars.gameSpeed);
 
 		if (_system->get_msecs() - _lastSaveTime > 5 * 60 * 1000) {
-			_lastSaveTime = _system->get_msecs();
-			_skyControl->doAutoSave();
+			if (_systemVars.systemFlags & SF_CHOOSING)
+				_lastSaveTime += 30 * 1000;
+			else {
+				_lastSaveTime = _system->get_msecs();
+				_skyControl->doAutoSave();
+			}
 		}
 		_skySound->checkFxQueue();
 		_skyMouse->mouseEngine((uint16)_sdl_mouse_x, (uint16)_sdl_mouse_y);