[Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.30,1.31 compact.cpp,1.37,1.38 control.cpp,1.96,1.97 control.h,1.37,1.38 debug.cpp,1.19,1.20 debug.h,1.11,1.12 disk.cpp,1.68,1.69 disk.h,1.21,1.22 grid.cpp,1.19,1.20 logic.cpp,1.154,1.155 logic.h,1.43,1.44 mouse.cpp,1.41,1.42 mouse.h,1.29,1.30 rnc_deco.cpp,1.23,1.24 rnc_deco.h,1.9,1.10 screen.cpp,1.67,1.68 screen.h,1.22,1.23 sky.cpp,1.179,1.180 sky.h,1.67,1.68 sound.cpp,1.53,1.54 struc.h,1.17,1.18 text.cpp,1.69,1.70

Eugene Sandulenko sev at users.sourceforge.net
Sat Jul 30 14:15:02 CEST 2005 

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

Modified Files:
	autoroute.cpp compact.cpp control.cpp control.h debug.cpp 
	debug.h disk.cpp disk.h grid.cpp logic.cpp logic.h mouse.cpp 
	mouse.h rnc_deco.cpp rnc_deco.h screen.cpp screen.h sky.cpp 
	sky.h sound.cpp struc.h text.cpp 
Log Message:
Remove trailing whitespaces.


Index: autoroute.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- autoroute.cpp	24 Jun 2005 15:23:42 -0000	1.30
+++ autoroute.cpp	30 Jul 2005 21:11:36 -0000	1.31
@@ -198,7 +198,7 @@
 	uint16 lastVal = (*routePos) - 1;
 	while (lastVal) { // lastVal == 0 means route is done.
 		dataTrg -= 2;
-		
+
 		int16 walkDirection = 0;
 		for (uint8 cnt = 0; cnt < 4; cnt++)
 			if (lastVal == *(routePos + _routeDirections[cnt])) {
@@ -258,7 +258,7 @@
 			   coordinates (2/14). This is normally not too tragic, but in the
 			   scene when foster gets thrown out by Lamb (first time you enter
 			   the pipe factory), the game would enter an infinite loop. */
-			_routeGrid[(destY + 1) * ROUTE_GRID_WIDTH + destX + 1] = 0; 
+			_routeGrid[(destY + 1) * ROUTE_GRID_WIDTH + destX + 1] = 0;
 			// hide this part joey from the grid
 		} else
 			return 1; // AR destination is an unaccessible block

Index: compact.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- compact.cpp	24 Jun 2005 15:23:42 -0000	1.37
+++ compact.cpp	30 Jul 2005 21:11:40 -0000	1.38
@@ -125,7 +125,7 @@
 		dialog.runModal();
 		error("Unable to find \"sky.cpt\" file\nPlease download it from www.scummvm.org");
 	}
-		
+
 	uint16 fileVersion = _cptFile->readUint16LE();
 	if (fileVersion != 0)
 		error("unknown \"sky.cpt\" version");
@@ -145,7 +145,7 @@
 		_cptTypes[i] = (uint16 *)malloc(_dataListLen[i] * sizeof(uint16));
 		_compacts[i] = (Compact**)malloc(_dataListLen[i] * sizeof(Compact*));
 	}
-	
+
 	uint32 rawSize = _cptFile->readUint32LE() * sizeof(uint16);
 	uint16 *rawPos = _rawBuf = (uint16*)malloc(rawSize);
 
@@ -163,7 +163,7 @@
 		for (uint32 ecnt = 0; ecnt < _dataListLen[lcnt]; ecnt++) {
 			_cptSizes[lcnt][ecnt] = READ_LE_UINT16(srcPos++);
 			if (_cptSizes[lcnt][ecnt]) {
-				_cptTypes[lcnt][ecnt] = READ_LE_UINT16(srcPos++);				
+				_cptTypes[lcnt][ecnt] = READ_LE_UINT16(srcPos++);
 				_compacts[lcnt][ecnt] = (Compact*)rawPos;
 				_cptNames[lcnt][ecnt] = asciiPos;
 				asciiPos += strlen(asciiPos) + 1;
@@ -290,7 +290,7 @@
 	uint16 *gfxBase = (uint16*)fetchCpt(cpt->grafixProgId);
 	if (gfxBase == NULL)
 		return NULL;
-	
+
 	return gfxBase + cpt->grafixProgPos;
 }
 
@@ -315,7 +315,7 @@
 /**
  \brief Returns the turn table for direction \a dir
  	from Compact \a cpt in \a megaSet.
-  
+
  Functionally equivalent to:
  \verbatim
  clear eax

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- control.cpp	24 Jun 2005 15:23:42 -0000	1.96
+++ control.cpp	30 Jul 2005 21:11:40 -0000	1.97
@@ -111,7 +111,7 @@
 }
 
 void TextResource::drawToScreen(bool doMask) {
-	
+
 	doMask = true;
 	uint16 cnty, cntx, cpWidth, cpHeight;
 	if ((_oldX == _x) && (_oldY == _y) && (_spriteData)) return;
@@ -137,7 +137,7 @@
 	if (cpWidth > _spriteData->s_width)
 		cpWidth = _spriteData->s_width;
 	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);
@@ -176,7 +176,7 @@
 	displayText_t disText = _skyText->displayText(tmpLine, NULL, true, STATUS_WIDTH, 255);
 	_textData = (dataFileHeader *)disText.textData;
 	_statusText->setSprite(_textData);
-	_statusText->drawToScreen(WITH_MASK);	
+	_statusText->drawToScreen(WITH_MASK);
 }
 
 void ControlStatus::setToText(uint16 textNum) {
@@ -257,7 +257,7 @@
 	_sprites.slode			= _skyDisk->loadFile(60506);
 	_sprites.slode2			= _skyDisk->loadFile(60507);
 	_sprites.slide2			= _skyDisk->loadFile(60508);
-	if (SkyEngine::_systemVars.gameVersion < 368) 
+	if (SkyEngine::_systemVars.gameVersion < 368)
 		_sprites.musicBodge = NULL;
 	else
 		_sprites.musicBodge = _skyDisk->loadFile(60509);
@@ -349,7 +349,7 @@
 }
 
 void Control::drawTextCross(uint32 flags) {
-	
+
 	_bodge->drawToScreen(NO_MASK);
 	if (!(flags & SF_ALLOW_SPEECH))
 		drawCross(151, 124);
@@ -458,11 +458,11 @@
 		_skyScreen->setPalette(60509);
 	else
 		_skyScreen->setPalette(60510);
-	
+
 	drawMainPanel();
 
 	_savedMouse = _skyMouse->giveCurrentMouseType();
-	
+
 	_skyMouse->spriteMouse(MOUSE_NORMAL, 0, 0);
 	bool quitPanel = false;
 	_lastButton = -1;
@@ -584,7 +584,7 @@
 			_system->quit();
 		}
 		return 0;
-	default: 
+	default:
 		error("Control::handleClick: unknown routine: %X",pButton->_onClick);
 	}
 }
@@ -605,7 +605,7 @@
 		textY = MPNL_Y + 44 + (28 - dlgTextDat->s_height) / 2;
 	} else
 		dlgTextDat = NULL;
-	
+
 	TextResource *dlgText = new TextResource(dlgTextDat, 1, 0, MPNL_X+2, textY, 0, DO_NOTHING, _system, _screenBuf);
 	dlgText->drawToScreen(WITH_MASK);
 
@@ -826,7 +826,7 @@
 	for (cnt = 0; cnt < MAX_ON_SCREEN + 1; cnt++)
 		textSprites[cnt] = NULL;
 	_firstText = 0;
-	
+
 	loadDescriptions(saveGameTexts);
 	_selectedGame = 0;
 
@@ -882,7 +882,7 @@
 
 				if (_mouseClicked && lookList[cnt]->_onClick) {
 					_mouseClicked = false;
-					
+
 					clickRes = handleClick(lookList[cnt]);
 
 					if (clickRes == SHIFTED) {
@@ -924,7 +924,7 @@
 	if (allowSave) {
 		_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 	}
-		
+
 	return clickRes;
 }
 
@@ -1002,7 +1002,7 @@
 				drawResource->drawToScreen(WITH_MASK);
 			}
 			_system->copyRectToScreen(_screenBuf + (GAME_NAME_Y + cnt * PAN_CHAR_HEIGHT) * GAME_SCREEN_WIDTH + GAME_NAME_X, GAME_SCREEN_WIDTH, GAME_NAME_X, GAME_NAME_Y + cnt * PAN_CHAR_HEIGHT, PAN_LINE_WIDTH, PAN_CHAR_HEIGHT);
-		} else 
+		} else
 			drawResource->drawToScreen(NO_MASK);
 	}
 	delete drawResource;
@@ -1044,7 +1044,7 @@
 		return false; // texts get lost during load/save, so don't allow it during choosing
 	if (Logic::_scriptVariables[SCREEN] >= 101)
 		return false; // same problem with LINC terminals
-	if ((Logic::_scriptVariables[SCREEN] >= 82) && 
+	if ((Logic::_scriptVariables[SCREEN] >= 82) &&
 		(Logic::_scriptVariables[SCREEN] != 85) &&
 		(Logic::_scriptVariables[SCREEN] < 90))
 		return false; // don't allow saving in final rooms
@@ -1091,7 +1091,7 @@
 		outf->write(tmpBuf, tmpPos - tmpBuf);
 		delete outf;
 	}
-	free(tmpBuf);	
+	free(tmpBuf);
 }
 
 void Control::doAutoSave(void) {
@@ -1219,7 +1219,7 @@
 			destCpt->grafixProgId = ((uint16*)_skyCompact->fetchCpt(CPT_TALK_TABLE_LIST))[target];
 		else if (graphType == OG_COMPACTELEM)
 			destCpt->grafixProgId = *(uint16*)_skyCompact->getCompactElem(destCpt, target);
-		else 
+		else
 			error("Illegal GrafixProg type encountered for compact %s", name);
 	}
 	if (saveType & SAVE_TURNP) {
@@ -1604,43 +1604,43 @@
 };
 
 uint8 Control::_crossImg[594] = {
-	0xFF, 0xFF, 0xFF, 0xFF, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0B, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x4D, 0x61, 
-	0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0x08, 0x4E, 0x53, 0x50, 0x4F, 0x0C, 0x4D, 0x4E, 0x51, 0x58, 0x58, 0x54, 0x4E, 0x08, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x54, 0x58, 0x50, 0x4E, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0x50, 0x4E, 0x54, 0x58, 0x58, 0x54, 0x4E, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0x61, 0x53, 0x58, 0x54, 0x4E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0x50, 0x4E, 0x55, 0x58, 0x58, 0x53, 0x4E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x05, 0x51, 0x58, 0x58, 
-	0x51, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x51, 0x58, 
-	0x59, 0x58, 0x51, 0x61, 0xFF, 0xFF, 0x61, 0x54, 0x58, 0x58, 0x4F, 0x52, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x55, 0x58, 0x58, 0x57, 0x4E, 
-	0x4F, 0x56, 0x58, 0x57, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x51, 0x58, 0x58, 0x58, 0x58, 0x58, 0x54, 0x4E, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0x6A, 0x4F, 0x58, 0x58, 0x58, 0x58, 0x52, 0x06, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0x54, 0x58, 
-	0x58, 0x58, 0x58, 0x57, 0x53, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0x09, 0x58, 0x58, 0x58, 0x57, 0x56, 0x58, 0x58, 0x58, 
-	0x57, 0x4F, 0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0x61, 0x55, 0x58, 0x58, 0x58, 0x58, 0x4E, 0x64, 0x57, 0x58, 0x58, 0x58, 0x58, 0x53, 0x61, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x57, 0x58, 0x58, 0x58, 0x58, 
-	0x50, 0xFF, 0xFF, 0x4E, 0x57, 0x58, 0x58, 0x58, 0x58, 0x56, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x58, 0x58, 0x58, 0x58, 0x58, 0x53, 0x09, 0xFF, 0xFF, 0xFF, 0x4E, 
-	0x57, 0x58, 0x58, 0x58, 0x58, 0x58, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x57, 
-	0x58, 0x58, 0x58, 0x58, 0x56, 0x4E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x58, 0x58, 0x58, 0x58, 
-	0x58, 0x57, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0x55, 0x58, 0x58, 0x58, 0x58, 0x58, 0x4E, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x58, 0x58, 0x58, 0x58, 0x4E, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0x06, 0x58, 0x58, 0x58, 0x58, 0x58, 0x52, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0x0C, 0x52, 0x58, 0x58, 0x51, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x56, 0x58, 
-	0x58, 0x58, 0x58, 0x56, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x56, 
-	0x58, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0x4D, 0x4D, 0x51, 0x56, 0x58, 0x58, 0x50, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x54, 0x09, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x50, 0x54, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x06, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0xFF, 0xFF, 0xFF, 
+	0xFF, 0xFF, 0xFF, 0xFF, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0B, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x4D, 0x61,
+	0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x08, 0x4E, 0x53, 0x50, 0x4F, 0x0C, 0x4D, 0x4E, 0x51, 0x58, 0x58, 0x54, 0x4E, 0x08, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x54, 0x58, 0x50, 0x4E, 0xFF,
+	0xFF, 0xFF, 0xFF, 0x50, 0x4E, 0x54, 0x58, 0x58, 0x54, 0x4E, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0x61, 0x53, 0x58, 0x54, 0x4E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x50, 0x4E, 0x55, 0x58, 0x58, 0x53, 0x4E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x05, 0x51, 0x58, 0x58,
+	0x51, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x51, 0x58,
+	0x59, 0x58, 0x51, 0x61, 0xFF, 0xFF, 0x61, 0x54, 0x58, 0x58, 0x4F, 0x52, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x55, 0x58, 0x58, 0x57, 0x4E,
+	0x4F, 0x56, 0x58, 0x57, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x51, 0x58, 0x58, 0x58, 0x58, 0x58, 0x54, 0x4E, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0x6A, 0x4F, 0x58, 0x58, 0x58, 0x58, 0x52, 0x06, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0x54, 0x58,
+	0x58, 0x58, 0x58, 0x57, 0x53, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0x09, 0x58, 0x58, 0x58, 0x57, 0x56, 0x58, 0x58, 0x58,
+	0x57, 0x4F, 0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x61, 0x55, 0x58, 0x58, 0x58, 0x58, 0x4E, 0x64, 0x57, 0x58, 0x58, 0x58, 0x58, 0x53, 0x61, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x57, 0x58, 0x58, 0x58, 0x58,
+	0x50, 0xFF, 0xFF, 0x4E, 0x57, 0x58, 0x58, 0x58, 0x58, 0x56, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x58, 0x58, 0x58, 0x58, 0x58, 0x53, 0x09, 0xFF, 0xFF, 0xFF, 0x4E,
+	0x57, 0x58, 0x58, 0x58, 0x58, 0x58, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x57,
+	0x58, 0x58, 0x58, 0x58, 0x56, 0x4E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x58, 0x58, 0x58, 0x58,
+	0x58, 0x57, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0x55, 0x58, 0x58, 0x58, 0x58, 0x58, 0x4E,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x58, 0x58, 0x58, 0x58, 0x4E, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0x06, 0x58, 0x58, 0x58, 0x58, 0x58, 0x52, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0x0C, 0x52, 0x58, 0x58, 0x51, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x56, 0x58,
+	0x58, 0x58, 0x58, 0x56, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x56,
+	0x58, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0x4D, 0x4D, 0x51, 0x56, 0x58, 0x58, 0x50, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x54, 0x09, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x50, 0x54, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x06, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0xFF, 0xFF, 0xFF,
 	0xFF, 0xFF
 };
 

Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- control.h	10 May 2005 23:17:37 -0000	1.37
+++ control.h	30 Jul 2005 21:11:40 -0000	1.38
@@ -195,7 +195,7 @@
 	void drawMainPanel(void);
 
 	void delay(unsigned int amount);
-	
+
     void animClick(ConResource *pButton);
 	bool getYesNo(char *text);
 	void buttonControl(ConResource *pButton);

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/debug.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- debug.cpp	24 Jun 2005 15:23:43 -0000	1.19
+++ debug.cpp	30 Jul 2005 21:11:40 -0000	1.20
@@ -1277,7 +1277,7 @@
 
 
 
-Debugger::Debugger(Logic *logic, Mouse *mouse, Screen *screen, SkyCompact *skyCompact) 
+Debugger::Debugger(Logic *logic, Mouse *mouse, Screen *screen, SkyCompact *skyCompact)
 : _logic(logic), _mouse(mouse), _screen(screen), _skyCompact(skyCompact), _showGrid(false) {
 	DCmd_Register("exit", &Debugger::Cmd_Exit);
 	DCmd_Register("help", &Debugger::Cmd_Help);
@@ -1345,7 +1345,7 @@
 		DebugPrintf("Example: %s foster\n", argv[0]);
 		return true;
 	}
-	
+
 	int i;
 	int numCompacts = ARRAYSIZE(section_0_compacts);
 
@@ -1355,7 +1355,7 @@
 		}
 		return true;
 	}
-	
+
 	Compact *cpt = 0;
 
 	for (i = 0; i < numCompacts; ++i) {
@@ -1383,7 +1383,7 @@
 	} else {
 		DebugPrintf("Unknown compact: '%s'\n", argv[1]);
 	}
-	
+
 	return true;
 }
 
@@ -1392,16 +1392,16 @@
 		DebugPrintf("Example: %s fn_printf 42\n", argv[0]);
 		return true;
 	}
-	
+
 	int numMCodes = ARRAYSIZE(mcodes);
-	
+
 	if (0 == strcmp(argv[1], "list")) {
 		for (int i = 0; i < numMCodes; ++i) {
 			DebugPrintf("%s\n", mcodes[i]);
 		}
 		return true;
 	}
-	
+
 	uint32 arg1 = 0, arg2 = 0, arg3 = 0;
 
 	switch (argc) {
@@ -1412,7 +1412,7 @@
 		case  3:
 			arg1 = atoi(argv[2]);
 	}
-	
+
 	for (int i = 0; i < numMCodes; ++i) {
 		if (0 == strcmp(mcodes[i], argv[1])) {
 			_logic->fnExec(i, arg1, arg2, arg3);
@@ -1421,7 +1421,7 @@
 	}
 
 	DebugPrintf("Unknown function: '%s'\n", argv[1]);
-		
+
 	return true;
 }
 
@@ -1437,15 +1437,15 @@
 		DebugPrintf("Example: %s lamb_friend <value>\n", argv[0]);
 		return true;
 	}
-	
-	int numScriptVars = ARRAYSIZE(scriptVars);	
+
+	int numScriptVars = ARRAYSIZE(scriptVars);
 
 	if (0 == strcmp(argv[1], "list")) {
 		for (int i = 0; i < numScriptVars; ++i) {
 			DebugPrintf("%s\n", scriptVars[i]);
 		}
 		return true;
-	}					
+	}
 
 	for (int i = 0; i < numScriptVars; ++i) {
 		if (0 == strcmp(scriptVars[i], argv[1])) {
@@ -1453,13 +1453,13 @@
 				Logic::_scriptVariables[i] = atoi(argv[2]);
 			}
 			DebugPrintf("%s = %d\n", argv[1], Logic::_scriptVariables[i]);
-			
+
 			return true;
 		}
 	}
 
 	DebugPrintf("Unknown ScriptVar: '%s'\n", argv[1]);
-	
+
 	return true;
 }
 
@@ -1471,7 +1471,7 @@
 
 	const int baseId[] = { START_ONE, START_S6, START_29, START_SC31, START_SC66, START_SC90, START_SC81 };
 	int section = atoi(argv[1]);
-	
+
 	if (section >= 0 && section <= 6) {
 		_logic->fnEnterSection(section == 6 ? 4 : section, 0, 0);
 		_logic->fnAssignBase(ID_FOSTER, baseId[section], 0);

Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/debug.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- debug.h	24 Jun 2005 15:23:43 -0000	1.11
+++ debug.h	30 Jul 2005 21:11:40 -0000	1.12
@@ -38,7 +38,7 @@
 	Debugger(Logic *logic, Mouse *mouse, Screen *screen, SkyCompact *skyCompact);
 	virtual ~Debugger(); // we need this here for __SYMBIAN32__ archaic gcc/UIQ
 	bool showGrid()	{	return _showGrid; }
-	
+
 protected:
 	virtual void preEnter();
 	virtual void postEnter();
@@ -52,7 +52,7 @@
 	bool Cmd_Info(int argc, const char **argv);
 	bool Cmd_ScriptVar(int argc, const char **argv);
 	bool Cmd_Section(int argc, const char **argv);
-	
+
 	Logic *_logic;
 	Mouse *_mouse;
 	Screen *_screen;
@@ -61,7 +61,7 @@
 	bool _showGrid;
 };
 
-	
+
 class Debug {
 public:
 	static void fetchCompact(uint32 a);

Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- disk.cpp	24 Jun 2005 15:23:43 -0000	1.68
+++ disk.cpp	30 Jul 2005 21:11:40 -0000	1.69
@@ -60,7 +60,7 @@
 		warning("entriesRead != dinnerTableEntries. [%d/%d]", entriesRead, _dinnerTableEntries);
 
 	_dataDiskHandle->open(dataFilename);
-	if (!_dataDiskHandle->isOpen()) 
+	if (!_dataDiskHandle->isOpen())
 		error("Error opening %s%s", gameDataPath.c_str(), dataFilename);
 
 	printf("Found BASS version v0.0%d (%d dnr entries)\n", determineGameVersion(), _dinnerTableEntries);
@@ -99,7 +99,7 @@
 }
 
 bool Disk::fileExists(uint16 fileNr) {
-	
+
 	return (getFileInfo(fileNr) != NULL);
 }
 
@@ -112,7 +112,7 @@
 	if (prefData)
 		return prefData;
 
-	debug(2, "load file %d,%d (%d)", (fileNr >> 11), (fileNr & 2047), fileNr); 
+	debug(2, "load file %d,%d (%d)", (fileNr >> 11), (fileNr & 2047), fileNr);
 
 	uint8 *fileInfoPtr = getFileInfo(fileNr);
 	if (fileInfoPtr == NULL) {
@@ -244,7 +244,7 @@
 }
 
 uint8 *Disk::givePrefetched(uint16 fileNr, uint32 *fSize) {
-	
+
 	PrefFile **fEntry = &_prefRoot;
 	bool found = false;
 	while ((*fEntry) && (!found)) {
@@ -266,7 +266,7 @@
 }
 
 uint8 *Disk::getFileInfo(uint16 fileNr) {
-	
+
 	uint16 i;
 	uint16 *dnrTbl16Ptr = (uint16 *)_dinnerTableArea;
 
@@ -286,7 +286,7 @@
 	// fnCacheChip is called after fnCacheFast
 	uint16 cnt = 0;
 	while (_buildList[cnt])
-		cnt++;	
+		cnt++;
 	uint16 fCnt = 0;
 	do {
 		_buildList[cnt + fCnt] = fList[fCnt] & 0x7FFFU;
@@ -324,7 +324,7 @@
 			targCnt++;
 		} else {
 			free(SkyEngine::_itemList[_loadedFilesList[lCnt] & 2047]);
-			SkyEngine::_itemList[_loadedFilesList[lCnt] & 2047] = NULL;		
+			SkyEngine::_itemList[_loadedFilesList[lCnt] & 2047] = NULL;
 		}
 		lCnt++;
 	}
@@ -423,7 +423,7 @@
 	case 243:
 		// pc gamer demo (v0.0109)
 		return 109;
-	case 247:	
+	case 247:
 		//floppy demo (v0.0267)
 		return 267;
 	case 1404:

Index: disk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- disk.h	24 Jun 2005 15:23:43 -0000	1.21
+++ disk.h	30 Jul 2005 21:11:40 -0000	1.22
@@ -78,7 +78,7 @@
 	Common::File *_dataDiskHandle;
 	Common::File *_dnrHandle;
 	RncDecoder _rncDecoder;
-	
+
 	uint16 _buildList[MAX_FILES_IN_LIST];
 	uint32 _loadedFilesList[MAX_FILES_IN_LIST];
 };

Index: grid.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/grid.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- grid.cpp	1 Jan 2005 16:09:20 -0000	1.19
+++ grid.cpp	30 Jul 2005 21:11:40 -0000	1.20
@@ -166,18 +166,18 @@
 
 bool Grid::getGridValues(uint32 x, uint32 y, uint32 width, Compact *cpt, uint8 *resGrid, uint32 *resBitNum, uint32 *resWidth) {
 	uint32 bitPos;
-	if (y < TOP_LEFT_Y) 
+	if (y < TOP_LEFT_Y)
 		return false; // off screen
 	y -= TOP_LEFT_Y;
 	y >>= 3; // convert to blocks
-	if (y >= GAME_SCREEN_HEIGHT >> 3) 
+	if (y >= GAME_SCREEN_HEIGHT >> 3)
 		return false; // off screen
 	bitPos = y * 40;
 	width++;
 	x >>= 3; // convert to blocks
-	
+
 	if (x < (TOP_LEFT_X >> 3)) { // at least partially off screen
-		if (x + width < (TOP_LEFT_X >> 3)) 
+		if (x + width < (TOP_LEFT_X >> 3))
 			return false; // completely off screen
 		else {
 			width -= (TOP_LEFT_X >> 3) - x;
@@ -186,7 +186,7 @@
 	} else
 		x -= TOP_LEFT_X >> 3;
 
-	if ((GAME_SCREEN_WIDTH >> 3) <= x) 
+	if ((GAME_SCREEN_WIDTH >> 3) <= x)
 		return false; // off screen
 	if ((GAME_SCREEN_WIDTH >> 3) < x + width) // partially off screen
 		width = (GAME_SCREEN_WIDTH >> 3) - x;

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- logic.cpp	24 Jun 2005 15:23:43 -0000	1.154
+++ logic.cpp	30 Jul 2005 21:11:40 -0000	1.155
@@ -173,9 +173,9 @@
 }
 
 void Logic::autoRoute() {
-	
+
 	_compact->downFlag = _skyAutoRoute->autoRoute(_compact);
-	if ((_compact->downFlag == 2) && _skyCompact->cptIsId(_compact, CPT_JOEY) && 
+	if ((_compact->downFlag == 2) && _skyCompact->cptIsId(_compact, CPT_JOEY) &&
 	   (_compact->mode == 0) && (_compact->baseSub == JOEY_OUT_OF_LIFT)) {
 		   // workaround for script bug #1064113. Details unclear...
 		   _compact->downFlag = 0;
@@ -514,7 +514,7 @@
 	// TODO: Check for mouse clicking
 
 	// Are we allowed to click
-	
+
 	if (_skyMouse->wasClicked())
 		for (int i = 0; i < ARRAYSIZE(clickTable); i++)
 			if (clickTable[i] == (uint16)_scriptVariables[CUR_ID]) {
@@ -523,7 +523,7 @@
 				if ((SkyEngine::_systemVars.systemFlags & SF_ALLOW_TEXT) &&
 					(_compact->spTextId > 0) &&
 					(_compact->spTextId < 0xFFFF)) {
-					
+
 					_skyCompact->fetchCpt(_compact->spTextId)->status = 0;
 				}
 				if (_skyCompact->getGrafixPtr(_compact)) {
@@ -747,7 +747,7 @@
 		y -= 8; // bring them up a line
 		if (y == _compact->ycood)
 			return true;
-		
+
 		return false;
 	case 2: // looking left
 
@@ -764,7 +764,7 @@
 
 		return false;
 	case 3: // looking right
-	case 4: // talking (not sure if this makes sense...) 
+	case 4: // talking (not sure if this makes sense...)
 
 		if (y != _compact->ycood)
 			return false;
@@ -1171,7 +1171,7 @@
 		memcpy(_scriptVariables + 352, forwardList1b288, sizeof(forwardList1b288));
 	else
 		memcpy(_scriptVariables + 352, forwardList1b, sizeof(forwardList1b));
-		
+
 	memcpy(_scriptVariables + 656, forwardList2b, sizeof(forwardList2b));
 	memcpy(_scriptVariables + 721, forwardList3b, sizeof(forwardList3b));
 	memcpy(_scriptVariables + 663, forwardList4b, sizeof(forwardList4b));
@@ -1182,7 +1182,7 @@
 
 	Compact *tmpComp = _compact;
 	_compact = scriptComp;
-	uint16 retVal = script((uint16)(scrNum & 0xFFFF), (uint16)(scrNum >> 16)); 
+	uint16 retVal = script((uint16)(scrNum & 0xFFFF), (uint16)(scrNum >> 16));
 	_compact = tmpComp;
 	return retVal;
 }
@@ -1388,7 +1388,7 @@
 	debug(5, "Call: fnDrawScreen(%X, %X)",a,b);
 	SkyEngine::_systemVars.currentPalette = a;
 	_skyScreen->fnDrawScreen(a, b);
-	
+
 	if (Logic::_scriptVariables[SCREEN] == 32) {
 		/* workaround for script bug #786482
 		    Under certain circumstances, which never got completely cleared,
@@ -1523,14 +1523,14 @@
  	_compact->upFlag = (uint16)mode; // save mode for action script
 	_compact->mode += 4; // next level up
 	Compact *cpt = _skyCompact->fetchCpt(_compact->place);
-	if (!cpt) { 
+	if (!cpt) {
 		warning("can't find _compact's getToTable. Place compact is NULL");
-		return false; 
+		return false;
 	}
 	uint16 *getToTable = (uint16*)_skyCompact->fetchCpt(cpt->getToTableId);
-	if (!getToTable) { 
+	if (!getToTable) {
 		warning("Place compact's getToTable is NULL!");
-		return false; 
+		return false;
 	}
 
 	while (*getToTable != targetPlaceId)
@@ -1653,7 +1653,7 @@
 }
 
 bool Logic::fnPointerText(uint32 a, uint32 b, uint32 c) {
-	
+
 	_skyText->fnPointerText(a, _skyMouse->giveMouseX(), _skyMouse->giveMouseY());
 	return true;
 }
@@ -1713,7 +1713,7 @@
 }
 
 bool Logic::fnChooser(uint32 a, uint32 b, uint32 c) {
-	
+
 	// setup the text questions to be clicked on
 	// read from TEXT1 until 0
 
@@ -1728,11 +1728,11 @@
 		uint32 textNum = *p++;
 
 		struct lowTextManager_t lowText = _skyText->lowTextManager(textNum, GAME_SCREEN_WIDTH, 0, 241, 0);
-		
+
 		uint8 *data = lowText.textData;
 
 		// stipple the text
-		
+
 		uint32 size = ((dataFileHeader *)data)->s_height * ((dataFileHeader *)data)->s_width;
 		uint32 index = 0;
 		uint32 width = ((dataFileHeader *)data)->s_width;
@@ -1740,7 +1740,7 @@
 		data += sizeof(dataFileHeader);
 
 		while (index < size) {
-			if (index % width <= 1) 
+			if (index % width <= 1)
 				index ^= 1; //index++;
 			if (!data[index])
 				data[index] = 1;
@@ -1832,7 +1832,7 @@
 
 bool Logic::fnCheckRequest(uint32 a, uint32 b, uint32 c) {
 	/// check for interaction request
-	
+
 	if (!_compact->request)
 		return true;
 
@@ -1993,7 +1993,7 @@
 	/// stop the compact printing
 	/// remove foreground, background & sort
 	_compact->status &= 0xfff8;
-	return true;	
+	return true;
 }
 
 bool Logic::fnNoSpritesA6(uint32 us, uint32 b, uint32 c) {
@@ -2001,7 +2001,7 @@
 	/// remove foreground, background & sort
 	Compact *cpt = _skyCompact->fetchCpt(us);
 	cpt->status &= 0xfff8;
-	return true;	
+	return true;
 }
 
 bool Logic::fnResetId(uint32 id, uint32 resetBlock, uint32 c) {
@@ -2043,7 +2043,7 @@
 bool Logic::fnRunAnimMod(uint32 animNo, uint32 b, uint32 c) {
 	_compact->grafixProgId = animNo;
 	_compact->grafixProgPos = 0;
-	
+
 	_compact->offset = *_skyCompact->getGrafixPtr(_compact);
 	_compact->grafixProgPos++;
 	_compact->logic = L_MOD_ANIMATE;
@@ -2128,7 +2128,7 @@
 }
 
 bool Logic::fnRandom(uint32 a, uint32 b, uint32 c) {
-	_scriptVariables[RND] = _rnd.getRandomNumber(65536) & a; 
+	_scriptVariables[RND] = _rnd.getRandomNumber(65536) & a;
 	return true;
 }
 
@@ -2139,7 +2139,7 @@
 }
 
 bool Logic::fnToggleMouse(uint32 a, uint32 b, uint32 c) {
-	
+
 	_skyCompact->fetchCpt(a)->status ^= ST_MOUSE;
 	return true;
 }
@@ -2194,7 +2194,7 @@
 	/// get access to another megas compact as easily
 
 	Compact *cpt = _skyCompact->fetchCpt(id);
-	
+
 	_scriptVariables[PLAYER_X] = cpt->xcood;
 	_scriptVariables[PLAYER_Y] = cpt->ycood;
 	_scriptVariables[PLAYER_MOOD] = cpt->mood;
@@ -2271,7 +2271,7 @@
 bool Logic::fnLeaveSection(uint32 sectionNo, uint32 b, uint32 c) {
 	if (SkyEngine::isDemo())
 		_skyControl->showGameQuitMsg();
-	
+
 	if (sectionNo == 5) //linc section - has different mouse icons
 		_skyMouse->replaceMouseCursors(60301);
 
@@ -2298,18 +2298,18 @@
 		_skyGrid->loadGrids();
 		SkyEngine::_systemVars.systemFlags &= ~SF_GAME_RESTORED;
 	}
-			
+
 	return true;
 }
 
 bool Logic::fnRestoreGame(uint32 a, uint32 b, uint32 c) {
-	
+
 	_skyControl->doLoadSavePanel();
 	return false;
 }
 
 bool Logic::fnRestartGame(uint32 a, uint32 b, uint32 c) {
-	
+
 	_skyControl->restartGame();
 	return false;
 }
@@ -2353,7 +2353,7 @@
 }
 
 bool Logic::fnLookAt(uint32 a, uint32 b, uint32 c) {
-	
+
 	struct lowTextManager_t textInfo = _skyText->lowTextManager(a, 240, 0, 248, true);
 	Compact *textCpt = _skyCompact->fetchCpt(textInfo.compactNum);
 	textCpt->xcood = 168;
@@ -2363,11 +2363,11 @@
 	_skyScreen->spriteEngine();
 	_skyScreen->flip();
 
-	fnNoHuman(0, 0, 0); 
+	fnNoHuman(0, 0, 0);
 	_skyMouse->lockMouse();
 
 	_skyMouse->waitMouseNotPressed();
-	
+
 	_skyMouse->unlockMouse();
 	fnAddHuman(0, 0, 0);
 	textCpt->status = 0;
@@ -2476,12 +2476,12 @@
 
 	animNum += target->megaSet / NEXT_MEGA_SET;
 	animNum &= 0xFF;
-	
+
 	uint16 *talkTable = (uint16*)_skyCompact->fetchCpt(CPT_TALK_TABLE_LIST);
 	target->grafixProgId = talkTable[animNum];
 	target->grafixProgPos = 0;
 	uint16 *animPtr = _skyCompact->getGrafixPtr(target);
-	
+
 	if (animPtr) {
 		target->offset = *animPtr++;
 		target->getToFlag = *animPtr++;
@@ -2499,7 +2499,7 @@
 	// language than english
 	if (speechUsed && (!(SkyEngine::_systemVars.systemFlags & SF_ALLOW_TEXT))) {
 		target->spTime = 10;
-		target->logic = L_TALK; 
+		target->logic = L_TALK;
 		return ;
 	}
 
@@ -2514,7 +2514,7 @@
 	//we need the talkers sprite information
 	textCompact->screen = target->screen;	//put our screen in
 
-	if (_scriptVariables[SCREEN] == target->screen) { // Only use coordinates if we are on the current screen 
+	if (_scriptVariables[SCREEN] == target->screen) { // Only use coordinates if we are on the current screen
 		//talking on-screen
 		byte *targetGfx = (byte *)SkyEngine::fetchItem(target->frame >> 6);
 		uint16 xPos = target->xcood + ((struct dataFileHeader *)targetGfx)->s_offset_x;
@@ -2530,15 +2530,15 @@
 			xPos = TOP_LEFT_X + FULL_SCREEN_WIDTH;
 			xPos -= FIXED_TEXT_WIDTH;
 		}
-			
+
 		textCompact->xcood = xPos;
 		uint16 yPos = target->ycood + ((struct dataFileHeader *)targetGfx)->s_offset_y - 6 - ((struct dataFileHeader *)textGfx)->s_height;
-		
+
 		if (yPos < TOP_LEFT_Y)
 			yPos = TOP_LEFT_Y;
 
 		textCompact->ycood = yPos;
-			
+
 	} else {
 		//talking off-screen
 		target->spTextId = 0; 	//don't kill any text 'cos none was made
@@ -2551,7 +2551,7 @@
 		target->spTime = 10;
 	else
 		target->spTime = (uint16)_skyText->_dtLetters + 5;
-	target->logic = L_TALK; 
+	target->logic = L_TALK;
 }
 
 } // End of namespace Sky

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- logic.h	24 Jun 2005 15:23:44 -0000	1.43
+++ logic.h	30 Jul 2005 21:11:40 -0000	1.44
@@ -144,14 +144,14 @@
 	void useControlInstance(Control *control) { _skyControl = control; };
 
 	uint16 mouseScript(uint32 scrNum, Compact *scriptComp);
-	
+
 	static uint32 _scriptVariables[NUM_SKY_SCRIPTVARS];
 	Grid *_skyGrid;
 
 	uint16 script(uint16 scriptNo, uint16 offset);
 	void initScreen0(void);
 	void parseSaveData(uint32 *data);
-	
+
 protected:
 	void push(uint32);
 	uint32 pop();
@@ -313,7 +313,7 @@
 	uint32 _currentSection;
 
 	Common::RandomSource _rnd;
-	
+
 	SkyCompact	*_skyCompact;
 	Screen		*_skyScreen;
 	Disk		*_skyDisk;

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- mouse.cpp	24 Jun 2005 15:23:44 -0000	1.41
+++ mouse.cpp	30 Jul 2005 21:11:40 -0000	1.42
@@ -95,7 +95,7 @@
 	_currentCursor = 6;
 	_mouseX = GAME_SCREEN_WIDTH / 2;
 	_mouseY = GAME_SCREEN_HEIGHT / 2;
-	
+
 	_miceData = _skyDisk->loadFile(MICE_FILE);
 
 	//load in the object mouse file
@@ -121,9 +121,9 @@
 
 		if (_mouseY < 2) //stop mouse activating top line
 			_mouseY = 2;
-		
+
 		_system->warpMouse(_mouseX, _mouseY);
-	
+
 		//force the pointer engine into running a get-off
 		//even if it's over nothing
 
@@ -133,7 +133,7 @@
 		//I am going to try it anyway
 		if (Logic::_scriptVariables[GET_OFF])
 			_skyLogic->script((uint16)Logic::_scriptVariables[GET_OFF],(uint16)(Logic::_scriptVariables[GET_OFF] >> 16));
-	
+
 		Logic::_scriptVariables[SPECIAL_ITEM] = 0xFFFFFFFF;
 		Logic::_scriptVariables[GET_OFF] = RESET_MOUSE;
 	}
@@ -141,7 +141,7 @@
 	return true;
 }
 
-void Mouse::fnSaveCoods(void) { 
+void Mouse::fnSaveCoods(void) {
 	Logic::_scriptVariables[SAFEX] = _mouseX + TOP_LEFT_X;
 	Logic::_scriptVariables[SAFEY] = _mouseY + TOP_LEFT_Y;
 }
@@ -180,7 +180,7 @@
 }
 
 void Mouse::spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY) {
-	
+
 	_currentCursor = frameNum;
 
 	byte *newCursor = _miceData;
@@ -200,7 +200,7 @@
 void Mouse::mouseEngine(uint16 mouseX, uint16 mouseY) {
 	_mouseX = mouseX;
 	_mouseY = mouseY;
-	
+
 	_logicClick = (_mouseB > 0); // click signal is available for Logic for one gamecycle
 
 	if (!Logic::_scriptVariables[MOUSE_STOP]) {
@@ -209,7 +209,7 @@
 			if (Logic::_scriptVariables[MOUSE_STATUS] & (1 << 2)) //buttons enabled?
 				buttonEngine1();
 		}
-	}	
+	}
 	_mouseB = 0;	//don't save up buttons
 }
 
@@ -244,7 +244,7 @@
 	} while (*currentList != 0);
 	if (Logic::_scriptVariables[SPECIAL_ITEM] != 0) {
 		Logic::_scriptVariables[SPECIAL_ITEM] = 0;
-		
+
 		if (Logic::_scriptVariables[GET_OFF])
 			_skyLogic->script((uint16)Logic::_scriptVariables[GET_OFF],(uint16)(Logic::_scriptVariables[GET_OFF] >> 16));
 		Logic::_scriptVariables[GET_OFF] = 0;
@@ -252,7 +252,7 @@
 }
 
 void Mouse::buttonPressed(uint8 button) {
-	
+
 	_mouseB = button;
 }
 
@@ -303,7 +303,7 @@
 	uint32 size = ((dataFileHeader*)_objectMouseData)->s_sp_size;
 	uint8 *srcData;
 	uint8 *destData;
-	
+
 	srcData = (uint8 *)_objectMouseData + size * cursor + sizeof(dataFileHeader);
 	destData = (uint8 *)_miceData + sizeof(dataFileHeader);
 	memcpy(destData, srcData, size);

Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- mouse.h	24 Jun 2005 15:23:44 -0000	1.29
+++ mouse.h	30 Jul 2005 21:11:40 -0000	1.30
@@ -60,17 +60,17 @@
 	bool wasClicked(void);
 	void logicClick(void) { _logicClick = true; };
 	void resetCursor();
-	
+
 protected:
 
 	void pointerEngine(uint16 xPos, uint16 yPos);
 	void buttonEngine1(void);
 
 	bool _logicClick;
-	
+
 	uint16 _mouseB;	//mouse button
 	uint16 _mouseX;	//actual mouse coordinates
-	uint16 _mouseY;	
+	uint16 _mouseY;
 
 	uint16 _currentCursor;
 

Index: rnc_deco.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- rnc_deco.cpp	24 Jun 2005 15:23:44 -0000	1.23
+++ rnc_deco.cpp	30 Jul 2005 21:11:40 -0000	1.24
@@ -47,7 +47,7 @@
 	uint16 tmp2 = 0;
 
 	for (tmp2 = 0; tmp2 < 0x100; tmp2++) {
-		tmp1 = tmp2; 
+		tmp1 = tmp2;
 		for (cnt = 8; cnt > 0; cnt--) {
 			if (tmp1 % 2) {
 				tmp1 >>= 1;
@@ -68,9 +68,9 @@
 
 	for (i = 0; i < size; i++) {
 		tmp = *block++;
-		crc ^= tmp; 
-		tmp = (uint8)((crc >> 8) & 0x00FF); 
-		crc &= 0x00FF;  
+		crc ^= tmp;
+		tmp = (uint8)((crc >> 8) & 0x00FF);
+		crc &= 0x00FF;
 		crc = *(uint16 *)&crcTable8[crc << 1];
 		crc ^= tmp;
 	}
@@ -84,7 +84,7 @@
 	int16 newBitCount = _bitCount;
 	uint16 remBits, returnVal;
 
-	returnVal = ((1 << amount) - 1) & newBitBuffl;	
+	returnVal = ((1 << amount) - 1) & newBitBuffl;
 	newBitCount -= amount;
 
 	if (newBitCount < 0) {
@@ -92,7 +92,7 @@
 		remBits = (newBitBuffh << (16 - newBitCount));
 		newBitBuffh >>= newBitCount;
 		newBitBuffl >>= newBitCount;
-		newBitBuffl |= remBits;	
+		newBitBuffl |= remBits;
 		_srcPtr += 2;
 		newBitBuffh = READ_LE_UINT16(_srcPtr);
 		amount -= newBitCount;
@@ -170,7 +170,7 @@
 	uint16 counts = 0;
 	uint16 crcUnpacked = 0;
 	uint16 crcPacked = 0;
-	
+
 
 	_bitBuffl = 0;
 	_bitBuffh = 0;
@@ -196,9 +196,9 @@
 	if (crcBlock(inputptr, packLen) != crcPacked)
 		return PACKED_CRC;
 
-	inputptr = (((const uint8 *)input) + HEADER_LEN); 
+	inputptr = (((const uint8 *)input) + HEADER_LEN);
 	_srcPtr = inputptr;
-	
+
 	inputHigh = ((const uint8 *)input) + packLen + HEADER_LEN;;
 	outputLow = (uint8 *)output;
 	outputHigh = *(((const uint8 *)input) + 16) + unpackLen + outputLow;
@@ -215,7 +215,7 @@
 
 	_bitBuffl = READ_LE_UINT16(_srcPtr);
 	inputBits(2);
-	
+
 	do {
 		makeHufftable(_rawTable);
 		makeHufftable(_posTable);
@@ -242,7 +242,7 @@
 			if (counts > 1) {
 				inputOffset = inputValue(_posTable) + 1;
 				inputLength = inputValue(_lenTable) + MIN_LENGTH;
-	
+
 				// Don't use memcpy here! because input and output overlap.
 				uint8 *tmpPtr = (_dstPtr-inputOffset);
 				while (inputLength--)

Index: rnc_deco.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rnc_deco.h	24 Jun 2005 15:23:44 -0000	1.9
+++ rnc_deco.h	30 Jul 2005 21:11:40 -0000	1.10
@@ -35,7 +35,7 @@
 	uint16 _posTable[64];
 	uint16 _lenTable[64];
 	uint16 _crcTable[256];
-	
+
 	uint16 _bitBuffl;
 	uint16 _bitBuffh;
 	uint8 _bitCount;
@@ -46,15 +46,15 @@
 public:
 	RncDecoder();
 	~RncDecoder();
-	int32 unpackM1(const void *input, void *output, uint16 key);	
-	
+	int32 unpackM1(const void *input, void *output, uint16 key);
+
 protected:
 	void initCrc();
 	uint16 crcBlock(const uint8 *block, uint32 size);
 	uint16 inputBits(uint8 amount);
 	void makeHufftable(uint16 *table);
 	uint16 inputValue(uint16 *table);
-	
+
 };
 
 } // End of namespace Sky

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- screen.cpp	24 Jun 2005 15:23:44 -0000	1.67
+++ screen.cpp	30 Jul 2005 21:11:40 -0000	1.68
@@ -66,7 +66,7 @@
 	_currentScreen = NULL;
 	_scrollScreen = NULL;
 
-	//blank the first 240 colors of the palette 
+	//blank the first 240 colors of the palette
 	memset(tmpPal, 0, GAME_COLOURS * 4);
 
 	//set the remaining colors
@@ -74,7 +74,7 @@
 		tmpPal[4 * GAME_COLOURS + i * 4] = (_top16Colours[i * 3] << 2) + (_top16Colours[i * 3] >> 4);
 		tmpPal[4 * GAME_COLOURS + i * 4 + 1] = (_top16Colours[i * 3 + 1] << 2) + (_top16Colours[i * 3 + 1] >> 4);
 		tmpPal[4 * GAME_COLOURS + i * 4 + 2] = (_top16Colours[i * 3 + 2] << 2) + (_top16Colours[i * 3 + 2] >> 4);
-		tmpPal[4 * GAME_COLOURS + i * 4 + 3] = 0x00; 
+		tmpPal[4 * GAME_COLOURS + i * 4 + 3] = 0x00;
 	}
 
 	//set the palette
@@ -94,7 +94,7 @@
 }
 
 void Screen::clearScreen(void) {
-	 
+
 	memset(_currentScreen, 0, FULL_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
 	_system->copyRectToScreen(_currentScreen, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
 	_system->updateScreen();
@@ -102,7 +102,7 @@
 
 //set a new palette, pal is a pointer to dos vga rgb components 0..63
 void Screen::setPalette(uint8 *pal) {
-	
+
 	convertPalette(pal, _palette);
 	_system->setPalette(_palette, 0, GAME_COLOURS);
 	_system->updateScreen();
@@ -149,7 +149,7 @@
 	if (_currentScreen)
 		free(_currentScreen);
 	_currentScreen = _skyDisk->loadFile(fileNum);
-	
+
 	if (_currentScreen)
 		showScreen(_currentScreen);
 	else
@@ -300,7 +300,7 @@
 void Screen::paletteFadeUp(uint8 *pal) {
 
 	byte tmpPal[1024];
-	
+
 	convertPalette(pal, tmpPal);
 
 	uint32 delayTime = _system->getMillis();
@@ -317,7 +317,7 @@
 		if (waitTime < 0)
 			waitTime = 0;
 		_system->delayMillis((uint)waitTime);
-	}	
+	}
 }
 
 void Screen::fnFadeUp(uint32 palNum, uint32 scroll) {
@@ -522,7 +522,7 @@
 
 	doSprites(BACK);
 	sortSprites();
-	doSprites(FORE);	
+	doSprites(FORE);
 }
 
 void Screen::sortSprites(void) {
@@ -550,7 +550,7 @@
 					Compact *spriteComp = _skyCompact->fetchCpt(drawListData[0]);
 					if ((spriteComp->status & 4) && // is it sortable playfield?(!?!)
 						(spriteComp->screen == Logic::_scriptVariables[SCREEN])) { // on current screen
-							dataFileHeader *spriteData = 
+							dataFileHeader *spriteData =
 								(dataFileHeader *)SkyEngine::fetchItem(spriteComp->frame >> 6);
 							if (!spriteData) {
 								debug(9,"Missing file %d", spriteComp->frame >> 6);
@@ -564,7 +564,7 @@
 					}
 					drawListData++;
 				}
-			} 
+			}
 		} while (nextDrawList);
 		// made_list:
 		if (spriteCnt > 1) { // bubble sort
@@ -612,7 +612,7 @@
 				// not_new_list
 				Compact *spriteData = _skyCompact->fetchCpt(drawList[0]);
 				drawList++;
-				if ((spriteData->status & (1 << layer)) && 
+				if ((spriteData->status & (1 << layer)) &&
 						(spriteData->screen == Logic::_scriptVariables[SCREEN])) {
 					uint8 *toBeDrawn = (uint8 *)SkyEngine::fetchItem(spriteData->frame >> 6);
 					if (!toBeDrawn) {
@@ -703,7 +703,7 @@
 		_sprWidth = 0;
 		return ;
 	}
-	
+
 	for (uint16 cnty = 0; cnty < _sprHeight; cnty++) {
 		for (uint16 cntx = 0; cntx < _sprWidth; cntx++)
 			if (spriteData[cntx + _maskX1])
@@ -714,7 +714,7 @@
 	// Convert the sprite coordinate/size values to blocks for vertical mask and/or vector to game
 	_sprWidth += _sprX + GRID_W-1;
 	_sprHeight += _sprY + GRID_H-1;
-	
+
 	_sprX >>= GRID_W_SHIFT;
 	_sprWidth >>= GRID_W_SHIFT;
 	_sprY >>= GRID_H_SHIFT;
@@ -802,7 +802,7 @@
 
 	uint32 gridData = 0;
 	uint8 bitsLeft = 0;
-	for (uint16 cnty = 0; cnty < GAME_SCREEN_HEIGHT >> 3; cnty++) { 
+	for (uint16 cnty = 0; cnty < GAME_SCREEN_HEIGHT >> 3; cnty++) {
 		for (uint16 cntx = 0; cntx < GAME_SCREEN_WIDTH >> 3; cntx++) {
 			if (!bitsLeft) {
 				bitsLeft = 32;

Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- screen.h	24 Jun 2005 15:23:44 -0000	1.22
+++ screen.h	30 Jul 2005 21:11:40 -0000	1.23
@@ -62,7 +62,7 @@
 
 	void showScreen(uint16 fileNum);
 	void showScreen(uint8 *pScreen);
-	
+
 	void handleTimer(void);
 	void startSequence(uint16 fileNum);
 	void startSequenceItem(uint16 itemNum);
@@ -116,7 +116,7 @@
 	//- more regular screen.asm + layer.asm routines
 	void convertPalette(uint8 *inPal, uint8* outPal);
 	void palette_fadedown_helper(uint32 *pal, uint num);
-	
+
 	//- sprite.asm routines
 	// fixme: get rid of these globals
 	uint32 _sprWidth, _sprHeight, _sprX, _sprY, _maskX1, _maskX2;

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- sky.cpp	5 Jul 2005 20:22:56 -0000	1.179
+++ sky.cpp	30 Jul 2005 21:11:40 -0000	1.180
@@ -65,7 +65,7 @@
  promise. But then they did look closer and see'th the aweful truth;
  it's code was assembly and messy (rareth was its comments). And so large
  were it's includes that did at first seem small; queereth also was its
- compact(s). Then they did findeth another version, and this was slightly 
+ compact(s). Then they did findeth another version, and this was slightly
  different from the first. Then a third, and this was different again.
  All different, but not really better, for all were not really compatible.
  But, eventually, it did come to pass that Steel Sky was implemented on
@@ -149,7 +149,7 @@
 }
 
 void SkyEngine::initVirgin() {
-	
+
 	_skyScreen->setPalette(60111);
 	_skyScreen->showScreen(60110);
 }
@@ -212,7 +212,7 @@
 	if (ConfMan.hasKey("save_slot") && ConfMan.getInt("save_slot") >= 0)
 		result = _skyControl->quickXRestore(ConfMan.getInt("save_slot"));
 
-	if (result != GAME_RESTORED) {	
+	if (result != GAME_RESTORED) {
 		bool introSkipped = false;
 		if (_systemVars.gameVersion > 267) {// don't do intro for floppydemos
 			_skyIntro = new Intro(_skyDisk, _skyScreen, _skyMusic, _skySound, _skyText, _mixer, _system);
@@ -229,13 +229,13 @@
 		if (introSkipped)
 			_skyControl->restartGame();
 	}
-	
+
 	_lastSaveTime = _system->getMillis();
 
 	while (1) {
 		if (_debugger->isAttached())
 			_debugger->onFrame();
-		
+
 		int32 frameTime = (int32)_system->getMillis();
 
 		if (_system->getMillis() - _lastSaveTime > 5 * 60 * 1000) {
@@ -249,7 +249,7 @@
 		_skyMouse->mouseEngine((uint16)_mouseX, (uint16)_mouseY);
 		handleKey();
 		while (_systemVars.paused) {
-			_system->updateScreen();			
+			_system->updateScreen();
 			delay(300);
 			handleKey();
 		}
@@ -270,7 +270,7 @@
 		else
 			delay((frameTime + _systemVars.gameSpeed) - _system->getMillis());
 	}
-	
+
 	return 0;
 }
 
@@ -289,7 +289,7 @@
 
 	_skyDisk = new Disk(_gameDataPath);
 	_skySound = new Sound(_mixer, _skyDisk, ConfMan.getInt("sfx_volume"));
-	
+
 	_systemVars.gameVersion = _skyDisk->determineGameVersion();
 
 	int midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_NATIVE | MDT_PREFER_NATIVE);
@@ -330,7 +330,7 @@
 	loadFixedItems();
 	_skyLogic = new Logic(_skyCompact, _skyScreen, _skyDisk, _skyText, _skyMusic, _skyMouse, _skySound);
 	_skyMouse->useLogicInstance(_skyLogic);
-	
+
 	// initialize timer *after* _skyScreen has been initialized.
 	_timer->installTimerProc(&timerHandler, 1000000 / 50, this); //call 50 times per second
 
@@ -385,7 +385,7 @@
 }
 
 void SkyEngine::initItemList() {
-	
+
 	//See List.asm for (cryptic) item # descriptions
 
 	for (int i = 0; i < 300; i++)
@@ -396,7 +396,7 @@
 	// leave these as NULL.
 	/*_itemList[119] = (void **)SkyCompact::data_0; // Compacts - Section 0
 	_itemList[120] = (void **)SkyCompact::data_1; // Compacts - Section 1
-	
+
 	if (isDemo()) {
 		_itemList[121] = _itemList[122] = _itemList[123] = _itemList[124] = _itemList[125] = (void **)SkyCompact::data_0;
 	} else {
@@ -425,7 +425,7 @@
 		_itemList[269] = _skyDisk->loadFile(269);
 		_itemList[271] = _skyDisk->loadFile(271);
 		_itemList[272] = _skyDisk->loadFile(272);
-	}		
+	}
 }
 
 void *SkyEngine::fetchItem(uint32 num) {

Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- sky.h	24 Jun 2005 15:23:45 -0000	1.67
+++ sky.h	30 Jul 2005 21:11:41 -0000	1.68
@@ -72,10 +72,10 @@
 	Control *_skyControl;
 	SkyCompact *_skyCompact;
 	Debugger *_debugger;
-	
+
 	MusicBase *_skyMusic;
 	Intro *_skyIntro;
-	
+
 public:
 	SkyEngine(GameDetector *detector, OSystem *syst);
 	virtual ~SkyEngine();

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- sound.cpp	24 Jun 2005 15:23:45 -0000	1.53
+++ sound.cpp	30 Jul 2005 21:11:41 -0000	1.54
@@ -1036,9 +1036,9 @@
 	byte flags = 0;
 	flags |= Audio::Mixer::FLAG_UNSIGNED|Audio::Mixer::FLAG_AUTOFREE;
 	size -= sizeof(struct dataFileHeader);
-	byte *buffer = (byte *)malloc(size); 
-	memcpy(buffer, sound+sizeof(struct dataFileHeader), size);	
-	
+	byte *buffer = (byte *)malloc(size);
+	memcpy(buffer, sound+sizeof(struct dataFileHeader), size);
+
 	_mixer->stopID(id);
 	_mixer->playRaw(handle, buffer, size, 11025, flags, id);
 }
@@ -1087,7 +1087,7 @@
 		warning("Sound::playSound(%04X, %04X) called with a section having been loaded", sound, volume);
 		return;
 	}
-	
+
 	if (sound > _soundsTotal) {
 		debug(5, "Sound::playSound %d ignored, only %d sfx in file", sound, _soundsTotal);
 		return ;
@@ -1095,7 +1095,7 @@
 
 	volume = ((volume & 0x7F) + 1) << 1;
 	sound &= 0xFF;
-	
+
 	// note: all those tables are big endian. Don't ask me why. *sigh*
 	uint16 sampleRate = (_sampleRates[sound << 2] << 8) | _sampleRates[(sound << 2) | 1];
 	if (sampleRate > 11025)
@@ -1113,7 +1113,7 @@
 		loopEnd = dataSize;
 		flags |= Audio::Mixer::FLAG_LOOP;
 	}
-	
+
 	if (channel == 0)
 		_mixer->playRaw(&_ingameSound0, _soundData + dataOfs, dataSize, sampleRate, flags, SOUND_CH0, volume, 0, loopSta, loopEnd);
 	else
@@ -1139,7 +1139,7 @@
 	if (roomList[i].room != 0xff) // if room list empty then do all rooms
 		while (roomList[i].room != screen) { // check rooms
 			i++;
-			if (roomList[i].room == 0xff)	
+			if (roomList[i].room == 0xff)
 				return;
 		}
 
@@ -1184,7 +1184,7 @@
 }
 
 void Sound::restoreSfx(void) {
-	
+
 	// queue sfx, so they will be started when the player exits the control panel
 	memset(_sfxQueue, 0, sizeof(_sfxQueue));
 	uint8 queueSlot = 0;
@@ -1218,7 +1218,7 @@
 	if (!(SkyEngine::_systemVars.systemFlags & SF_ALLOW_SPEECH))
 		return false;
 	uint16 speechFileNum = _speechConvertTable[textNum >> 12] + (textNum & 0xFFF);
-	
+
 	uint8 *speechData = _skyDisk->loadFile(speechFileNum + 50000);
 	if (!speechData) {
 		debug(9,"File %d (speechFile %d from section %d) wasn't found", speechFileNum + 50000, textNum & 0xFFF, textNum >> 12);

Index: struc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/struc.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- struc.h	1 Jan 2005 16:09:21 -0000	1.17
+++ struc.h	30 Jul 2005 21:11:41 -0000	1.18
@@ -30,7 +30,7 @@
 };
 
 struct displayText_t {
-	byte *textData;	
+	byte *textData;
 	uint32 textWidth;
 };
 
@@ -113,7 +113,7 @@
 	uint16 flag;		 // 21: a use any time flag
 
 	uint16 mood;		 // 22: high level - stood or not
-	
+
 	uint16 grafixProgId; // 23
 	uint16 grafixProgPos;// 24
 
@@ -159,9 +159,9 @@
 	uint16 megaSet;		 // 54
 
 	MegaSet megaSet0;	 // 55
-	MegaSet megaSet1;	 // 
-	MegaSet megaSet2;	 // 
-	MegaSet megaSet3;	 // 
+	MegaSet megaSet1;	 //
+	MegaSet megaSet2;	 //
+	MegaSet megaSet3;	 //
 } GCC_PACK;
 
 #if !defined(__GNUC__)

Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- text.cpp	4 Jun 2005 13:58:11 -0000	1.69
+++ text.cpp	30 Jul 2005 21:11:41 -0000	1.70
@@ -33,7 +33,7 @@
 #define	FIRST_TEXT_BUFFER	274
 #define NO_OF_TEXT_SECTIONS	8	// 8 sections per language
 #define	CHAR_SET_FILE	60150
-#define MAX_SPEECH_SECTION	7 
+#define MAX_SPEECH_SECTION	7
 #define CHAR_SET_HEADER	128
 #define	MAX_NO_LINES	10
 
@@ -46,7 +46,7 @@
 	_mainCharacterSet.addr = _skyDisk->loadFile(CHAR_SET_FILE);
 	_mainCharacterSet.charHeight = MAIN_CHAR_HEIGHT;
 	_mainCharacterSet.charSpacing = 0;
-	
+
 	fnSetFont(0);
 
 	if (!SkyEngine::isDemo()) {
@@ -268,7 +268,7 @@
 	}
 }
 
-void Text::fnSetFont(uint32 fontNr) { 
+void Text::fnSetFont(uint32 fontNr) {
 
 	struct charSet *newCharSet;
 
@@ -313,41 +313,41 @@
 
 	if (SkyEngine::_itemList[FIRST_TEXT_SEC + sectionNo] == (void **)NULL) { //check if already loaded
 		debug(5, "Loading Text item(s) for Section %d", (sectionNo>>2));
-		
+
 		uint32 fileNo = sectionNo + ((SkyEngine::_systemVars.language * NO_OF_TEXT_SECTIONS) + 60600);
 		SkyEngine::_itemList[FIRST_TEXT_SEC + sectionNo] = (void **)_skyDisk->loadFile((uint16)fileNo);
 	}
 	_textItemPtr = (uint8 *)SkyEngine::_itemList[FIRST_TEXT_SEC + sectionNo];
 
-	uint32 offset = 0; 
+	uint32 offset = 0;
 	uint32 nr32MsgBlocks = (textNr & 0x0fe0);
-	uint32 skipBytes; 
+	uint32 skipBytes;
 	byte *blockPtr;
-	bool bitSeven; 
+	bool bitSeven;
 
-	if (nr32MsgBlocks) { 
+	if (nr32MsgBlocks) {
 		blockPtr = (byte *)(_textItemPtr + 4);
 		nr32MsgBlocks >>= 5;
 		do {
 			offset += READ_LE_UINT16(blockPtr);
 			blockPtr += 2;
-		} while (--nr32MsgBlocks); 
+		} while (--nr32MsgBlocks);
 	}
 
-	uint32 remItems = textNr; 
+	uint32 remItems = textNr;
 	textNr &= 0x1f;
 	if (textNr) {
-	
+
 		remItems &= 0x0fe0;
 		remItems += READ_LE_UINT16(_textItemPtr);
-		blockPtr = _textItemPtr + remItems; 
+		blockPtr = _textItemPtr + remItems;
 
 		do {
 			skipBytes = *blockPtr++;
 			bitSeven = (bool)((skipBytes >> (7)) & 0x1);
 			skipBytes &= ~(1UL << 7);
 
-			if (bitSeven) 
+			if (bitSeven)
 				skipBytes <<= 3;
 
 			offset += skipBytes;
@@ -357,23 +357,23 @@
 
 	uint32 numBits = offset;
 	offset >>= 2;
-	offset += READ_LE_UINT16(_textItemPtr + 2); 
+	offset += READ_LE_UINT16(_textItemPtr + 2);
 	_textItemPtr += offset;
 
 	//bit pointer: 0->8, 1->6, 2->4 ...
 	numBits &= 3;
-	numBits ^= 3; 
+	numBits ^= 3;
 	numBits++;
 	numBits <<= 1;
 
 	_inputValue = *_textItemPtr++;
 	char *dest = (char *)_textBuffer;
 	char textChar;
-	_shiftBits = (uint8) numBits; 
+	_shiftBits = (uint8) numBits;
 
 	do {
 		textChar = getTextChar();
-		*dest++ = textChar;	
+		*dest++ = textChar;
 	} while (textChar);
 }
 
@@ -409,8 +409,8 @@
 	} else {
 		_inputValue = *_textItemPtr++;
 		_shiftBits = 7;
-	} 
-	
+	}
+
 	return (bool)(((_inputValue) >> (_shiftBits)) & 1);
 }
 
@@ -427,10 +427,10 @@
 	char *curPos = textPtr;
 	char *lastSpace = curPos;
 	byte *centerTblPtr = _centreTable;
-	uint16 lineWidth = 0;  
+	uint16 lineWidth = 0;
 
 	_dtCol = color;
-	_dtLineWidth = pixelWidth;  
+	_dtLineWidth = pixelWidth;
 	_dtLines = 0;
 	_dtLetters = 1;
 	_dtData = dest;
@@ -451,7 +451,7 @@
 	tmpPtr = strstr(textPtr, "MANIFESTACION-ARTISTICA.");
 	if (tmpPtr)
 		strcpy(tmpPtr, "MANIFESTACION ARTISTICA.");
-		
+
 	while (textChar >= 0x20) {
 		if ((_curCharSet == 1) && (textChar >= 0x80))
 			textChar = 0x20;
@@ -489,12 +489,12 @@
 		error("Maximum no. of lines exceeded!");
 
 	_dtLineSize = pixelWidth * _charHeight;
-	uint32 numBytes = (_dtLineSize * _dtLines) + sizeof(struct dataFileHeader) + 4;	
+	uint32 numBytes = (_dtLineSize * _dtLines) + sizeof(struct dataFileHeader) + 4;
 
 	if (_dtData == NULL)
 		_dtData = (byte *)malloc(numBytes);
 
-	uint8 *curDest = _dtData; 
+	uint8 *curDest = _dtData;
 
 	uint32 bytesToClear = numBytes; //no of bytes to clear
 	bytesToClear -= sizeof(struct dataFileHeader);	//don't touch the header.
@@ -518,7 +518,7 @@
 	do {
 		if (_dtCentre) {
 
-			uint32 width = (_dtLineWidth - READ_LE_UINT32(centerTblPtr)) >> 1; 
+			uint32 width = (_dtLineWidth - READ_LE_UINT32(centerTblPtr)) >> 1;
 			centerTblPtr += 4;
 			curDest += width;
 		}
@@ -535,15 +535,15 @@
 
 	struct displayText_t ret;
 	ret.textData = _dtData;
-	ret.textWidth = _dtLastWidth;	
+	ret.textWidth = _dtLastWidth;
 	return ret;
 }
 
 void Text::makeGameCharacter(uint8 textChar, uint8 *charSetPtr, uint8 *&dest, uint8 color) {
 
-	bool maskBit, dataBit;	
+	bool maskBit, dataBit;
 	uint8 charWidth = (uint8)((*(charSetPtr + textChar)) + 1 - _dtCharSpacing);
-	uint16 data, mask; 
+	uint16 data, mask;
 	byte *charSpritePtr = charSetPtr + (CHAR_SET_HEADER + ((_charHeight << 2) * textChar));
 	byte *startPos = dest;
 	byte *curPos = startPos;
@@ -555,19 +555,19 @@
 		data = READ_BE_UINT16(charSpritePtr);
 		mask = READ_BE_UINT16(charSpritePtr + 2);
 		charSpritePtr += 4;
-		
+
 		for (int j = 0; j < charWidth; j++) {
-	
+
 			maskBit = (mask & 0x8000) != 0; //check mask
 			mask <<= 1;
 			dataBit = (data & 0x8000) != 0; //check data
 			data <<= 1;
 
-			if (maskBit) 
-				if (dataBit) 
+			if (maskBit)
+				if (dataBit)
 					*curPos = color;
 				else
-					*curPos = 240; //black edge 
+					*curPos = 240; //black edge
 
 			curPos++;
 		}
@@ -577,7 +577,7 @@
 	}
 
 	//update position
-	dest = startPos + charWidth + _dtCharSpacing * 2 - 1; 
+	dest = startPos + charWidth + _dtCharSpacing * 2 - 1;
 
 }
 
@@ -594,7 +594,7 @@
 
 	Compact *cpt = _skyCompact->fetchCpt(compactNum);
 
-	while (cpt->status != 0) { 
+	while (cpt->status != 0) {
 		compactNum++;
 		cpt = _skyCompact->fetchCpt(compactNum);
 	}
@@ -602,12 +602,12 @@
 	cpt->flag = (uint16)(compactNum - FIRST_TEXT_COMPACT) + FIRST_TEXT_BUFFER;
 
 	byte *oldText = (byte *)SkyEngine::_itemList[cpt->flag];
-	SkyEngine::_itemList[cpt->flag] = (void **)textData; 
+	SkyEngine::_itemList[cpt->flag] = (void **)textData;
 
 	if (oldText != NULL)
 		free (oldText);
 
-	cpt->logic = logicNum; 
+	cpt->logic = logicNum;
 	cpt->status = ST_LOGIC | ST_FOREGROUND | ST_RECREATE;
 	cpt->screen = (uint16) Logic::_scriptVariables[SCREEN];
 
@@ -681,7 +681,7 @@
 		if (_patchedMessages[cnt + patchIdx].textNr == textNum) {
 			strcpy(_textBuffer, _patchedMessages[cnt + patchIdx].text);
 			return true;
-		}		
+		}
 	}
 	return false;
 }
@@ -689,7 +689,7 @@
 const PatchMessage Text::_patchedMessages[NUM_PATCH_MSG] = {
 	{ 28724, "Testo e Parlato" }, // - italian
 	{ 28707, "Solo Testo" },
-	{ 28693, "Solo Parlato" }, 
+	{ 28693, "Solo Parlato" },
 	{ 28724, "Text och tal" }, // - swedish
 	{ 28707, "Endast text" },
 	{ 28693, "Endast tal" },

More information about the Scummvm-git-logs mailing list