Removed trailing spaces.

svn-id: r30664

16 files changed, 48 insertions, 48 deletions

diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp
index 50ab7e1656..943ffa5c8d 100644
--- a/engines/cruise/actor.cpp
+++ b/engines/cruise/actor.cpp
@@ -89,7 +89,7 @@ void getPixel(int x, int y) {
 			tableau+=u*2;
 			x_min = *tableau++;
 			x_max = *tableau++;
-			
+
 			if ( (x>=x_min && x<=x_max) ) {
 				flag_obstacle = walkboxColor[computedVar14];
 
@@ -1001,8 +1001,8 @@ void processAnimation(void) {
 								/*
 								 * if (pl->next_dir!=pl->start_dir)
 								 * {
-								 * pl->phase=PHASE_STATIC; 
-								 * pl->cnt=0;   
+								 * pl->phase=PHASE_STATIC;
+								 * pl->cnt=0;
 								 * break;
 								 * }
 								 */
diff --git a/engines/cruise/background.cpp b/engines/cruise/background.cpp
index 9d1bf61267..15b4c91e47 100644
--- a/engines/cruise/background.cpp
+++ b/engines/cruise/background.cpp
@@ -162,7 +162,7 @@ int loadBackground(const char *name, int idx) {
 				{
 					uint8* inPtr = ptr2 + i * 2;
 					uint8* outPtr = palScreen[idx] +i * 3;
-					
+
 					outPtr[2] = ((inPtr[1])&0x0F) * 17;
 					outPtr[1] = (((inPtr[1])&0xF0) >> 4) * 17;
 					outPtr[0] = ((inPtr[0])&0x0F) * 17;
diff --git a/engines/cruise/backgroundIncrust.cpp b/engines/cruise/backgroundIncrust.cpp
index e4a716b25a..c66fb9eb9b 100644
--- a/engines/cruise/backgroundIncrust.cpp
+++ b/engines/cruise/backgroundIncrust.cpp
@@ -165,7 +165,7 @@ backgroundIncrustStruct *addBackgroundIncrust(int16 overlayIdx,	int16 objectIdx,
 			int newY;
 			int newScale;
 			char *newFrame;
-			
+
 			int sizeTable[4];	// 0 = left, 1 = right, 2 = bottom, 3 = top
 
 			// this function checks if the dataPtr is not 0, else it retrives the data for X, Y, scale and DataPtr again (OLD: mainDrawSub1Sub1)
@@ -202,7 +202,7 @@ void saveIncrust(Common::OutSaveFile& currentSaveFile) {
 		char dummy[4] = {0, 0, 0, 0};
 		currentSaveFile.write(dummy, 2);
 		currentSaveFile.write(dummy, 2);
-		
+
 		currentSaveFile.writeSint16LE(pl->objectIdx);
 		currentSaveFile.writeSint16LE(pl->type);
 		currentSaveFile.writeSint16LE(pl->overlayIdx);
@@ -249,7 +249,7 @@ void loadBackgroundIncrustFromSave(Common::InSaveFile& currentSaveFile) {
 
 		currentSaveFile.skip(2);
 		currentSaveFile.skip(2);
-		
+
 		pl2->objectIdx = currentSaveFile.readSint16LE();
 		pl2->type = currentSaveFile.readSint16LE();
 		pl2->overlayIdx = currentSaveFile.readSint16LE();
diff --git a/engines/cruise/cell.cpp b/engines/cruise/cell.cpp
index a716d0b61f..2c990817eb 100644
--- a/engines/cruise/cell.cpp
+++ b/engines/cruise/cell.cpp
@@ -135,7 +135,7 @@ void loadSavegameDataSub2(Common::InSaveFile& currentSaveFile) {
 		t->animCounter = currentSaveFile.readSint16LE();
 		t->animLoop = currentSaveFile.readSint16LE();
 		currentSaveFile.skip(2);
-		
+
 		t->next = NULL;
 		p->next = t;
 		t->prev = cellHead.prev;
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 1c0f1fd8ab..5d16c6e68a 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -899,7 +899,7 @@ bool createDialog(int objOvl, int objIdx, int x, int y) {
 						if (!verbeOvl) verbeOvl=j;
 						if (!obj1Ovl)  obj1Ovl=j;
 						if (!obj2Ovl)  obj2Ovl=j;
-						
+
 						char verbe_name[80];
 						char obj1_name[80];
 						char obj2_name[80];
@@ -999,7 +999,7 @@ bool findRelation(int objOvl, int objIdx, int x, int y) {
 					if (!verbeOvl) verbeOvl=j;
 					if (!obj1Ovl)  obj1Ovl=j;
 					if (!obj2Ovl)  obj2Ovl=j;
-					
+
 					char verbe_name[80];
 					char obj1_name[80];
 					char obj2_name[80];
@@ -1282,7 +1282,7 @@ void callRelation(menuElementSubStruct *pMenuElement, int nObj2) {
 				{
 					createTextObject(&cellHead, ovlIdx, pHeader->id, x, y, 200, findHighColor(), masterScreen, 0, 0);
 				}
-				
+
 				userWait = 1;
 				autoOvl = ovlIdx;
 				autoMsg = pHeader->id;
@@ -1393,7 +1393,7 @@ int processInput(void) {
 	}
 
 	if (dialogueEnabled) {
-		
+
 		if( menuDown || selectDown || linkedRelation ) {
 			closeAllMenu();
 			menuDown = 0;
@@ -1818,17 +1818,17 @@ void mainLoop(void) {
 						static int16 oldMouseY = -1;
 
 						getMouseStatus(&main10, &mouseX, &mouseButton, &mouseY);
-					 
+
 						if (mouseX != oldMouseX && mouseY != oldMouseY) {
 							int objectType;
 							int newCursor1;
 							int newCursor2;
-							
+
 							oldMouseX = mouseX;
 							oldMouseY = mouseY;
-							
+
 							objectType = findObject(mouseX, mouseY, &newCursor1, &newCursor2);
-							
+
 							if (objectType == 9) {
 								changeCursor(CURSOR_EXIT);
 							} else if (objectType != -1) {
diff --git a/engines/cruise/ctp.cpp b/engines/cruise/ctp.cpp
index de14dba761..6c7be713ef 100644
--- a/engines/cruise/ctp.cpp
+++ b/engines/cruise/ctp.cpp
@@ -192,7 +192,7 @@ void makeCtStruct(uint8* str, int16 table[][40], int num, int z) {
 int getNode(int nodeResult[2], int nodeId){
 	if (nodeId < 0 || nodeId >= ctp_routeCoordCount)
 		return -1;
-	
+
 	nodeResult[0] = ctp_routeCoords[nodeId][0];
 	nodeResult[1] = ctp_routeCoords[nodeId][1];
 
@@ -206,7 +206,7 @@ int setNodeColor(int nodeIdx, int nodeColor) {
 	int oldColor = walkboxColor[nodeIdx];
 
 	if(nodeColor == -1)
-		return 
+		return
 
 	walkboxColor[nodeIdx] = nodeColor;
 
@@ -220,7 +220,7 @@ int setNodeState(int nodeIdx, int nodeState) {
 	int oldState = walkboxState[nodeIdx];
 
 	if(nodeState == -1)
-		return 
+		return
 
 	walkboxState[nodeIdx] = nodeState;
 
diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp
index e0bfe70dc0..7ce69448a6 100644
--- a/engines/cruise/dataLoader.cpp
+++ b/engines/cruise/dataLoader.cpp
@@ -257,7 +257,7 @@ int loadFile(const char* name, int idx, int destIdx)
 			int numMaxEntriesInSet = getNumMaxEntiresInSet(ptr);
 
 			if (idx > numMaxEntriesInSet) {
-				return 0;	// exit if limit is reached 
+				return 0;	// exit if limit is reached
 			}
 			return loadSetEntry(name, ptr, idx, destIdx );
 
@@ -296,7 +296,7 @@ int loadFileRange(const char *name, int startIdx, int currentEntryIdx, int numId
 
 			for (i = 0; i < numIdx; i++) {
 				if ((startIdx + i) > numMaxEntriesInSet) {
-					return 0;	// exit if limit is reached 
+					return 0;	// exit if limit is reached
 				}
 				loadSetEntry(name, ptr, startIdx + i, currentEntryIdx + i );
 			}
diff --git a/engines/cruise/decompiler.cpp b/engines/cruise/decompiler.cpp
index 97515f751e..7eca816ec7 100644
--- a/engines/cruise/decompiler.cpp
+++ b/engines/cruise/decompiler.cpp
@@ -281,11 +281,11 @@ void addDecomp(char *string, ...) {
 	va_list va;
 
 	/* fprintf(fHandle,"%d: ",currentLineIdx);
-	 * 
+	 *
 	 * va_start(va,string);
 	 * vfprintf(fHandle,string,va);
 	 * va_end(va);
-	 * 
+	 *
 	 * fprintf(fHandle,"\n"); */
 
 	struct decompileLineStruct *pLineStruct =
@@ -305,11 +305,11 @@ void addDecomp(char *string, ...) {
 	currentLineType = 0;
 
 	/*printf("%d: ",currentOffset);
-	 * 
+	 *
 	 * va_start(va,string);
 	 * vprintf(string,va);
 	 * va_end(va);
-	 * 
+	 *
 	 * printf("\n"); */
 }
 
diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp
index 7adc358bee..b15c8fdb4f 100644
--- a/engines/cruise/function.cpp
+++ b/engines/cruise/function.cpp
@@ -950,7 +950,7 @@ int16 Op_ComputeLine(void) {
 	int x2 = popVar();
 	int y1 = popVar();
 	int x1 = popVar();
-	
+
 	point* pDest = (point*)popPtr();
 
 	int maxValue = cor_droite( x1, y1, x2, y2, pDest);
@@ -1382,7 +1382,7 @@ int16 Op_Strcat(void) {
 	while(*pSource)
 		*(pDest++) = *(pSource++);
 	*(pDest++) = '\0';
-	
+
 	return 0;
 }
 
@@ -1559,7 +1559,7 @@ int16 Op_UserWait(void)
 	return 0;
 }
 
-opcodeFunction opcodeTablePtr[] = 
+opcodeFunction opcodeTablePtr[] =
 {
 	NULL, // 0x00
 	Op_FadeIn,
diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp
index 5a519dbd02..1a1be3940b 100644
--- a/engines/cruise/mainDraw.cpp
+++ b/engines/cruise/mainDraw.cpp
@@ -408,7 +408,7 @@ void buildSegment(void) {
 		int Y2 = di[3];
 		int Y1 = di[1];
 
-		
+
 		int tempAX = Y1;
 		int tempDX = Y2;
 		if (tempAX > tempDX) {
@@ -750,9 +750,9 @@ void buildPolyModel(int positionX, int positionY, int scale, char *pMask, char *
 
 	/*
 	 * NOTE:
-	 * 
+	 *
 	 * The original code continues here with using X, Y instead of startX and StartY.
-	 * 
+	 *
 	 * Original code:
 	 * positionX -= (upscaleValue(startX, m_scaleValue) + 0x8000) >> 16;
 	 * positionY -= (upscaleValue(startX, m_scaleValue) + 0x8000) >> 16;
@@ -836,7 +836,7 @@ void buildPolyModel(int positionX, int positionY, int scale, char *pMask, char *
 
 			flipShort(&minimumScale);
 
-			if ((minimumScale <= scale)) {	
+			if ((minimumScale <= scale)) {
 				if (m_flipLeftRight) {
 					drawPolyMode1((unsigned char *)dataPointer, linesToDraw);
 				} else {
@@ -911,9 +911,9 @@ bool findPoly(char* dataPtr, int positionX, int positionY, int scale, int mouseX
 
 	/*
 	 * NOTE:
-	 * 
+	 *
 	 * The original code continues here with using X, Y instead of startX and StartY.
-	 * 
+	 *
 	 * Original code:
 	 * positionX -= (upscaleValue(startX, m_scaleValue) + 0x8000) >> 16;
 	 * positionY -= (upscaleValue(startX, m_scaleValue) + 0x8000) >> 16;
@@ -997,7 +997,7 @@ bool findPoly(char* dataPtr, int positionX, int positionY, int scale, int mouseX
 
 			flipShort(&minimumScale);
 
-			if ((minimumScale <= scale)) {	
+			if ((minimumScale <= scale)) {
 				if (m_flipLeftRight) {
 					drawPolyMode1((unsigned char *)dataPointer, linesToDraw);
 				} else {
@@ -1065,7 +1065,7 @@ void mainDrawPolygons(int fileIndex, cellStruct *plWork, int X, int scale, int Y
 	int newY;
 	int newScale;
 	char *newFrame;
-	
+
 	int var_8;		// unused
 
 	int sizeTable[4];	// 0 = left, 1 = right, 2 = bottom, 3 = top
@@ -1284,7 +1284,7 @@ void drawCtp(void) {
 void drawMenu(menuStruct *pMenu) {
 	if (pMenu == NULL)
 		return;
-	
+
 	if(pMenu->numElements == 0)
 		return;
 
diff --git a/engines/cruise/module.mk b/engines/cruise/module.mk
index 0af8678b4a..2d5062dc38 100644
--- a/engines/cruise/module.mk
+++ b/engines/cruise/module.mk
@@ -37,6 +37,6 @@ ifdef BUILD_PLUGINS
 PLUGIN := 1
 endif
 
-# Include common rules 
+# Include common rules
 include $(srcdir)/rules.mk
 
diff --git a/engines/cruise/mouse.cpp b/engines/cruise/mouse.cpp
index 20616a72ee..a5e6c12be2 100644
--- a/engines/cruise/mouse.cpp
+++ b/engines/cruise/mouse.cpp
@@ -119,7 +119,7 @@ int16 main10;
 		int hotspotY;
 		const byte *bitmap;
 	};
-	
+
 	static const MouseCursor mouseCursors[] = {
 		{ 1, 1, mouseCursorNormal },
 		{ 0, 0, mouseCursorDisk },
diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp
index 67f9bbab6e..d3cb93c37c 100644
--- a/engines/cruise/overlay.cpp
+++ b/engines/cruise/overlay.cpp
@@ -279,7 +279,7 @@ int loadOverlay(const char *scriptName) {
 
 			if (!ptr) {
 				/*      releaseScript(scriptIdx,scriptName);
-				 * 
+				 *
 				 * if (freeIsNeeded)
 				 * {
 				 * freePtr(unpackedBuffer);
@@ -328,7 +328,7 @@ int loadOverlay(const char *scriptName) {
 
 			if (!ptr) {
 				/*      releaseScript(scriptIdx,scriptName);
-				 * 
+				 *
 				 * if (freeIsNeeded)
 				 * {
 				 * freePtr(unpackedBuffer);
@@ -494,7 +494,7 @@ int loadOverlay(const char *scriptName) {
 	}
 
 	if (ovlData->
-	    specialString1Length /*|| ovlData->specialString2Length */ 
+	    specialString1Length /*|| ovlData->specialString2Length */
 	    || ovlData->stringTable) {
 		int i;
 		//int unpackedSize;
@@ -549,7 +549,7 @@ int loadOverlay(const char *scriptName) {
 
 			if (!ovlData->nameVerbGlob) {
 				/*      releaseScript(scriptIdx,scriptName);
-				 * 
+				 *
 				 * if (freeIsNeeded)
 				 * {
 				 * freePtr(unpackedBuffer);
@@ -572,7 +572,7 @@ int loadOverlay(const char *scriptName) {
 
 			if (!ovlData->arrayNameObj) {
 				/*      releaseScript(scriptIdx,scriptName);
-				 * 
+				 *
 				 * if (freeIsNeeded)
 				 * {
 				 * freePtr(unpackedBuffer);
@@ -598,7 +598,7 @@ int loadOverlay(const char *scriptName) {
 
 				if (!ovlData->stringTable[i].string) {
 					/*      releaseScript(scriptIdx,scriptName);
-					 * 
+					 *
 					 * if (freeIsNeeded)
 					 * {
 					 * freePtr(unpackedBuffer);
diff --git a/engines/cruise/perso.cpp b/engines/cruise/perso.cpp
index e899fa0d1c..c25476ee2a 100644
--- a/engines/cruise/perso.cpp
+++ b/engines/cruise/perso.cpp
@@ -196,7 +196,7 @@ void processActorWalk(int16 resx_y[4], int16 *inc_droite, int16 *inc_droite0,
 
 						return;
 					}
-					
+
 					*inc_droite0 = cor_droite(x1, y1, x2, y2, cor_joueur);
 					*dir_perso = resx_y[2] = direction(x1, y1, x2, y2, *inc_jo1, *inc_jo2);
 					*inc_jo0 = inc_jo;
diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp
index 77cd904973..63edf7cb36 100644
--- a/engines/cruise/saveload.cpp
+++ b/engines/cruise/saveload.cpp
@@ -564,7 +564,7 @@ int saveSavegameData(int saveGameIdx) {
 	currentSaveFile->write(workpal, sizeof(int16) * NBCOLORS);
 
 	currentSaveFile->write(musicName, 15);
-	
+
 	const char dummy[6] = { 0, 0, 0, 0, 0, 0 };
 	currentSaveFile->write(dummy, 6);
 
diff --git a/engines/cruise/vars.h b/engines/cruise/vars.h
index 04568337d6..a325de3f36 100644
--- a/engines/cruise/vars.h
+++ b/engines/cruise/vars.h
@@ -270,7 +270,7 @@ extern int16 ctp_routeCoords[20][2];	// ctpVar3      // path-finding coordinates
 extern int16 ctp_routes[20][10];	// path-finding line information
 
 /* ctp_routes:
-   
+
    correct size would be: ctp_routes[routeCoordCount * 20 * 2]
    array is seperate in 20 * 2 bytes slices.
    first 2 bytes of the slice indicate how many coordinates/lines are following (lineCount)