Remove trailing whitespaces.

svn-id: r18604

15 files changed, 43 insertions, 43 deletions

diff --git a/gob/cdrom.cpp b/gob/cdrom.cpp
index ca1eb85ae2..e4a9f8b9ee 100644
--- a/gob/cdrom.cpp
+++ b/gob/cdrom.cpp
@@ -136,7 +136,7 @@ void cd_playMultMusic() {
 		{"avt019.tot", "fra5", "all5", "ang5", "esp5", "ita5"},
 		{"avt022.tot", "fra6", "all6", "ang6", "esp6", "ita6"}
 	};
-	
+
 	for (int i = 0; i < ARRAYSIZE(tracks); i++)
 		if (!scumm_stricmp(game_curTotFile, tracks[i][0])) {
 			cd_globFlag = true;
diff --git a/gob/dataio.cpp b/gob/dataio.cpp
index a3ffabbf6c..77b6423636 100644
--- a/gob/dataio.cpp
+++ b/gob/dataio.cpp
@@ -44,7 +44,7 @@ int16 file_open(const char *path, Common::File::AccessMode mode) {
 
 	if (filesHandles[i].isOpen())
 		return i;
-	
+
 	return -1;
 }
 
@@ -208,7 +208,7 @@ void data_openDataFile(const char *src) {
 
 	debug(7, "DataChunks: %d [for %s]", numDataChunks[file], path);
 
-	dataFiles[file] = dataDesc = 
+	dataFiles[file] = dataDesc =
 	    (struct ChunkDesc *)malloc(sizeof(struct ChunkDesc) *
 	    numDataChunks[file]);
 
diff --git a/gob/draw.cpp b/gob/draw.cpp
index 008f722d20..4585f23905 100644
--- a/gob/draw.cpp
+++ b/gob/draw.cpp
@@ -405,7 +405,7 @@ void draw_spriteOperation(int16 operation) {
 			    szGame_TotResTable + szGame_TotResItem *
 			    game_totResourceTable->itemsCount + offset;
 		} else {
-			dataBuf = 
+			dataBuf =
 			    game_imFileData +
 			    (int32)READ_LE_UINT32(&((int32 *)game_imFileData)[-offset - 1]);
 		}
@@ -604,7 +604,7 @@ void draw_animateCursor(int16 cursor) {
 				draw_cursorAnim++;
 				draw_cursorTimeKey = util_getTimeKey();
 			} else {
-/*				if (draw_noInvalidated && 
+/*				if (draw_noInvalidated &&
 					inter_mouseX == draw_cursorX &&	inter_mouseY == draw_cursorY)
 						return;*/
 			}
@@ -630,7 +630,7 @@ void draw_animateCursor(int16 cursor) {
 		newY = inter_mouseY;
 		if (draw_cursorXDeltaVar != -1) {
 			newX -= (uint16)VAR_OFFSET(draw_cursorIndex * 4 + (draw_cursorXDeltaVar / 4) * 4);
-			newY -= (uint16)VAR_OFFSET(draw_cursorIndex * 4 + (draw_cursorYDeltaVar / 4) * 4); 
+			newY -= (uint16)VAR_OFFSET(draw_cursorIndex * 4 + (draw_cursorYDeltaVar / 4) * 4);
 		}
 
 		minX = MIN(newX, draw_cursorX);
diff --git a/gob/driver_vga.cpp b/gob/driver_vga.cpp
index 8f7da10503..9a171f12e7 100644
--- a/gob/driver_vga.cpp
+++ b/gob/driver_vga.cpp
@@ -34,7 +34,7 @@ void VGAVideoDriver::drawSprite(SurfaceDesc *source, SurfaceDesc *dest, int16 le
 	if (x >= 0 && x < dest->width && y >= 0 && y < dest->height) {
 		int16 width = (right - left) + 1;
 		int16 height = (bottom - top) + 1;
-	
+
 		byte *srcPos = source->vidPtr + (top * source->width) + left;
 		byte *destPos = dest->vidPtr + (y * dest->width) + x;
 		while (height--) {
@@ -78,7 +78,7 @@ void VGAVideoDriver::drawLetter(unsigned char item, int16 x, int16 y, FontDesc *
 	byte *src, *dst;
 	uint16 data;
 	int i, j;
-	
+
 	src = (byte *)fontDesc->dataPtr + (item - fontDesc->startItem) * (fontDesc->itemSize & 0xff);
 	dst = dest->vidPtr + x + dest->width * y;
 
diff --git a/gob/game.cpp b/gob/game.cpp
index b05986890a..84ac83312d 100644
--- a/gob/game.cpp
+++ b/gob/game.cpp
@@ -535,10 +535,10 @@ int16 game_checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId,
 			if (deltaTime == -1 || curtime + deltaTime > timeKey) {
 				if (pResId != 0)
 					*pResId = 0;
-				
+
 				if (pResIndex != 0)
 					*pResIndex = 0;
-				
+
 				return 0;
 			}
 		}
@@ -603,7 +603,7 @@ int16 game_checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId,
 						|| game_mouseButtons == 0))
 						draw_blitCursor();
 
-					if (game_lastCollKey != 0 && 
+					if (game_lastCollKey != 0 &&
 						game_collisionAreas[game_lastCollAreaIndex].funcLeave != 0) {
 						savedIP = inter_execPtr;
 						inter_execPtr =
@@ -828,7 +828,7 @@ int16 game_inputArea(int16 xPos, int16 yPos, int16 width, int16 height, int16 ba
 			}
 			return 0x4800;
 
-		case 0xe08:	// Backspace	
+		case 0xe08:	// Backspace
 			if (pos > 0) {
 				util_cutFromStr(str, pos - 1, 1);
 				pos--;
@@ -1810,14 +1810,14 @@ void game_playTot(int16 skipPlay) {
 				game_totTextData =
 				    (Game_TotTextTable *) (curPtr +
 				    READ_LE_UINT32((char *)game_totFileData + 0x30));
-				
+
 				game_totTextData->itemsCount = (int16)READ_LE_UINT16(&game_totTextData->itemsCount);
 
 				for (i = 0; i < game_totTextData->itemsCount; ++i) {
 					game_totTextData->items[i].offset = (int16)READ_LE_UINT16(&game_totTextData->items[i].offset);
 					game_totTextData->items[i].size = (int16)READ_LE_UINT16(&game_totTextData->items[i].size);
 				}
-				
+
 				needTextFree = 0;
 			}
 
@@ -1825,19 +1825,19 @@ void game_playTot(int16 skipPlay) {
 			if (READ_LE_UINT32(filePtr) != (uint32)-1) {
 				curPtr = game_totFileData;
 
-				game_totResourceTable = 
+				game_totResourceTable =
 					(Game_TotResTable *)(curPtr +
 				    READ_LE_UINT32((char *)game_totFileData + 0x34));
-				
+
 				game_totResourceTable->itemsCount = (int16)READ_LE_UINT16(&game_totResourceTable->itemsCount);
-				
+
 				for (i = 0; i < game_totResourceTable->itemsCount; ++i) {
 					game_totResourceTable->items[i].offset = (int32)READ_LE_UINT32(&game_totResourceTable->items[i].offset);
 					game_totResourceTable->items[i].size = (int16)READ_LE_UINT16(&game_totResourceTable->items[i].size);
 					game_totResourceTable->items[i].width = (int16)READ_LE_UINT16(&game_totResourceTable->items[i].width);
 					game_totResourceTable->items[i].height = (int16)READ_LE_UINT16(&game_totResourceTable->items[i].height);
 				}
-				
+
 				needFreeResTable = 0;
 			}
 
diff --git a/gob/gob.h b/gob/gob.h
index 47020d0d8e..e19c15b856 100644
--- a/gob/gob.h
+++ b/gob/gob.h
@@ -66,6 +66,6 @@ public:
 };
 
 extern GobEngine *_vm;
- 
+
 } // End of namespace Gob
 #endif
diff --git a/gob/goblin.cpp b/gob/goblin.cpp
index 6a87221232..9d80d77955 100644
--- a/gob/goblin.cpp
+++ b/gob/goblin.cpp
@@ -1980,10 +1980,10 @@ void gob_initVarPointers(void) {
 	gob_curGobNextStateVarPtr = (int32 *)VAR_ADDRESS(63);
 	gob_curGobScrXVarPtr = (int32 *)VAR_ADDRESS(64);
 	gob_curGobScrYVarPtr = (int32 *)VAR_ADDRESS(65);
-	gob_curGobLeftVarPtr = (int32 *)VAR_ADDRESS(66);	
+	gob_curGobLeftVarPtr = (int32 *)VAR_ADDRESS(66);
 	gob_curGobTopVarPtr = (int32 *)VAR_ADDRESS(67);
 	gob_curGobRightVarPtr = (int32 *)VAR_ADDRESS(68);
-	gob_curGobBottomVarPtr = (int32 *)VAR_ADDRESS(69);	
+	gob_curGobBottomVarPtr = (int32 *)VAR_ADDRESS(69);
 	gob_curGobDoAnimVarPtr = (int32 *)VAR_ADDRESS(70);
 	gob_curGobOrderVarPtr = (int32 *)VAR_ADDRESS(71);
 	gob_curGobNoTickVarPtr = (int32 *)VAR_ADDRESS(72);
@@ -2020,9 +2020,9 @@ void gob_initVarPointers(void) {
 	gob_curGobXPosVarPtr = (int32 *)VAR_ADDRESS(108);
 	gob_curGobYPosVarPtr = (int32 *)VAR_ADDRESS(109);
 	gob_curGobMaxFrameVarPtr = (int32 *)VAR_ADDRESS(110);
-	
+
 	gob_itemInPocketVarPtr = (int32 *)VAR_ADDRESS(114);
-	
+
 	*gob_itemInPocketVarPtr = -2;
 }
 
diff --git a/gob/goblin.h b/gob/goblin.h
index 13862c1701..7726dcf33c 100644
--- a/gob/goblin.h
+++ b/gob/goblin.h
@@ -80,7 +80,7 @@ typedef struct Gob_Object {
 	char tick;			// +36h
 	char multObjIndex;	// +37h, from which play mult animations
 	char unk14;			// +38h
-	char visible;		// +39h 
+	char visible;		// +39h
 } GCC_PACK Gob_Object;
 
 typedef struct Gob_Pos {
diff --git a/gob/inter.cpp b/gob/inter.cpp
index 437bdad056..c1b91b00c4 100644
--- a/gob/inter.cpp
+++ b/gob/inter.cpp
@@ -164,7 +164,7 @@ void inter_printText(void) {
 	}
 
 	do {
-		for (i = 0; *inter_execPtr != '.' && (byte)*inter_execPtr != 200; 
+		for (i = 0; *inter_execPtr != '.' && (byte)*inter_execPtr != 200;
 			 i++, inter_execPtr++) {
 			buf[i] = *inter_execPtr;
 		}
@@ -1115,7 +1115,7 @@ void inter_keyFunc(void) {
 			if (pressedKeys[0x3e])
 				key |= 0x4000;
 
-			WRITE_VAR(0, key);			
+			WRITE_VAR(0, key);
 			util_waitKey();
 			return;
 		}
@@ -1149,7 +1149,7 @@ void inter_checkSwitchTable(char **ppExec) {
 	value = VAR_OFFSET(value);
 
 	do {
-		len = *(int8*)inter_execPtr++; // must be a signed char typ and char is not default signed on all platforms. 
+		len = *(int8*)inter_execPtr++; // must be a signed char typ and char is not default signed on all platforms.
 
 		if (len == -5)
 			break;
diff --git a/gob/mult.cpp b/gob/mult.cpp
index 878f1b7e9d..c52b50021b 100644
--- a/gob/mult.cpp
+++ b/gob/mult.cpp
@@ -90,7 +90,7 @@ char mult_palFadingBlue;
 
 Color mult_fadePal[5][16];
 
-// Sounds 
+// Sounds
 int16 mult_sndKeysCount;
 Mult_SndKey *mult_sndKeys;
 
@@ -557,7 +557,7 @@ char mult_drawStatics(char stop) {
 			continue;
 
 		for (scen_curStatic = 0, scen_curStaticLayer = mult_staticKeys[mult_counter].layer;
-			 scen_curStaticLayer >= scen_statics[mult_staticIndices[scen_curStatic]].layersCount; 
+			 scen_curStaticLayer >= scen_statics[mult_staticIndices[scen_curStatic]].layersCount;
 			 scen_curStatic++) {
 			scen_curStaticLayer -=
 			    scen_statics[mult_staticIndices[scen_curStatic]].layersCount;
@@ -1091,7 +1091,7 @@ void mult_loadMult(int16 resId) {
 		mult_sndKeys[i].repCount = (int16)READ_LE_UINT16(mult_dataPtr + 8);
 		mult_sndKeys[i].resId = (int16)READ_LE_UINT16(mult_dataPtr + 10);
 		mult_sndKeys[i].soundIndex = (int16)READ_LE_UINT16(mult_dataPtr + 12);
-		
+
 		mult_sndKeys[i].soundIndex = -1;
 		mult_sndKeys[i].resId = -1;
 		mult_dataPtr += 36;
diff --git a/gob/palanim.cpp b/gob/palanim.cpp
index 2d793b7fb9..693d994748 100644
--- a/gob/palanim.cpp
+++ b/gob/palanim.cpp
@@ -72,7 +72,7 @@ char pal_fadeStep(int16 oper) {
 				if (redPalette[i] != newRed
 				    || greenPalette[i] != newGreen
 				    || bluePalette[i] != newBlue) {
-					
+
 					vid_setPalElem(i, newRed, newGreen, newBlue, 0, 0x13);
 
 					redPalette[i] = newRed;
diff --git a/gob/scenery.cpp b/gob/scenery.cpp
index 8826e0a36e..d6ca0d0583 100644
--- a/gob/scenery.cpp
+++ b/gob/scenery.cpp
@@ -119,14 +119,14 @@ int16 scen_loadStatic(char search) {
 	for (i = 0; i < ptr->layersCount; i++) {
 		offset = (int16)READ_LE_UINT16(&((int16 *)dataPtr)[i]);
 		ptr->layers[i] = (Scen_StaticLayer *)(dataPtr + offset - 2);
-		
+
 		ptr->layers[i]->planeCount = (int16)READ_LE_UINT16(&ptr->layers[i]->planeCount);
 
 		for (int j = 0; j < ptr->layers[i]->planeCount; ++j) {
 			ptr->layers[i]->planes[j].destX = (int16)READ_LE_UINT16(&ptr->layers[i]->planes[j].destX);
 			ptr->layers[i]->planes[j].destY = (int16)READ_LE_UINT16(&ptr->layers[i]->planes[j].destY);
 		}
-		
+
 		ptr->layers[i]->backResId = (int16)READ_LE_UINT16(backsPtr);
 		backsPtr++;
 	}
diff --git a/gob/util.cpp b/gob/util.cpp
index 5603748f02..68705cc382 100644
--- a/gob/util.cpp
+++ b/gob/util.cpp
@@ -75,7 +75,7 @@ int16 util_translateKey(int16 key) {
 	} keys[] = {
 		{8,   0x0e08},	// Backspace
 		{13,  0x1C0D},	// Enter
-		{27,  0x011b},	// ESC 
+		{27,  0x011b},	// ESC
 		{127, 0x5300},	// Del
 		{273, 0x4800},	// Up arrow
 		{274, 0x5000},	// Down arrow
diff --git a/gob/video.cpp b/gob/video.cpp
index 2cb02ceec1..8296127b09 100644
--- a/gob/video.cpp
+++ b/gob/video.cpp
@@ -30,9 +30,9 @@ namespace Gob {
 
 VideoDriver *_videoDriver;
 
-	
+
 /* NOT IMPLEMENTED */
-	
+
 //XXX: Use this function to update the screen for now.
 //     This should be moved to a better location later on.
 void vid_waitRetrace(int16) {
@@ -41,13 +41,13 @@ void vid_waitRetrace(int16) {
 		g_system->updateScreen();
 	}
 }
-	
+
 char vid_initDriver(int16 vidMode) {
 	warning("STUB: vid_initDriver");
 
 	// FIXME: Finish all this stuff :)
 	_videoDriver = new VGAVideoDriver();
-	
+
 	return 1;
 }
 
@@ -150,7 +150,7 @@ void vid_freeSurfDesc(SurfaceDesc * surfDesc) {
 	sprAllocated--;
 	if (surfDesc != pPrimarySurfDesc)
 		free(surfDesc);
-	else 
+	else
 		free(surfDesc->vidPtr);
 }
 
@@ -353,7 +353,7 @@ void vid_setPalette(PalDesc *palDesc) {
 		pal[i * 4 + 2] = (palDesc->vgaPal[i].blue << 2) | (palDesc->vgaPal[i].blue >> 4);
 		pal[i * 4 + 3] = 0;
 	}
-	
+
 	g_system->setPalette(pal, 0, numcolors);
 }
 
diff --git a/gob/video.h b/gob/video.h
index 7297b6224a..ea2e7bd2d9 100644
--- a/gob/video.h
+++ b/gob/video.h
@@ -26,7 +26,7 @@
 #include "common/util.h"
 
 namespace Gob {
-	
+
 #define VID_SET_CURSOR(val) { _AH = 1; _CX = (val); geninterrupt(0x10); }
 #define VID_RESTORE_MODE { _AX = 3; geninterrupt(0x10); }
 
@@ -35,7 +35,7 @@ namespace Gob {
 #define TEXT_COL_COUNT	80
 #define TEXT_ROW_COUNT	25
 
-	
+
 typedef struct SurfaceDesc_t {
 	int16 width;
 	int16 height;
@@ -64,7 +64,7 @@ public:
 	virtual ~VideoDriver() {}
 	virtual void drawSprite(SurfaceDesc *source, SurfaceDesc *dest, int16 left, int16 top, int16 right, int16 bottom, int16 x, int16 y, int16 transp) = 0;
 	virtual void fillRect(SurfaceDesc *dest, int16 left, int16 top, int16 right, int16 bottom, byte color) = 0;
-	virtual void putPixel(int16 x, int16 y, byte color, SurfaceDesc *dest) = 0;		
+	virtual void putPixel(int16 x, int16 y, byte color, SurfaceDesc *dest) = 0;
 	virtual void drawLetter(unsigned char item, int16 x, int16 y, FontDesc *fontDesc, byte color1, byte color2, byte transp, SurfaceDesc *dest) = 0;
 	virtual void drawLine(SurfaceDesc *dest, int16 x0, int16 y0, int16 x1, int16 y1, byte color) = 0;
 	virtual void drawPackedSprite(byte *sprBuf, int16 width, int16 height, int16 x, int16 y, byte transp, SurfaceDesc *dest) = 0;