[Scummvm-cvs-logs] CVS: scummvm/gob cdrom.cpp,1.2,1.3 dataio.cpp,1.8,1.9 draw.cpp,1.11,1.12 driver_vga.cpp,1.10,1.11 game.cpp,1.23,1.24 gob.h,1.8,1.9 goblin.cpp,1.18,1.19 goblin.h,1.4,1.5 inter.cpp,1.21,1.22 mult.cpp,1.10,1.11 palanim.cpp,1.8,1.9 scenery.cpp,1.17,1.18 util.cpp,1.14,1.15 video.cpp,1.12,1.13 video.h,1.7,1.8

[Eugene Sandulenko]

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

Modified Files:
	cdrom.cpp dataio.cpp draw.cpp driver_vga.cpp game.cpp gob.h 
	goblin.cpp goblin.h inter.cpp mult.cpp palanim.cpp scenery.cpp 
	util.cpp video.cpp video.h 
Log Message:
Remove trailing whitespaces.


Index: cdrom.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/cdrom.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cdrom.cpp	15 Apr 2005 00:07:14 -0000	1.2
+++ cdrom.cpp	30 Jul 2005 21:10:59 -0000	1.3
@@ -136,7 +136,7 @@
 		{"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;

Index: dataio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/dataio.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dataio.cpp	10 May 2005 22:55:47 -0000	1.8
+++ dataio.cpp	30 Jul 2005 21:10:59 -0000	1.9
@@ -44,7 +44,7 @@
 
 	if (filesHandles[i].isOpen())
 		return i;
-	
+
 	return -1;
 }
 
@@ -208,7 +208,7 @@
 
 	debug(7, "DataChunks: %d [for %s]", numDataChunks[file], path);
 
-	dataFiles[file] = dataDesc = 
+	dataFiles[file] = dataDesc =
 	    (struct ChunkDesc *)malloc(sizeof(struct ChunkDesc) *
 	    numDataChunks[file]);
 

Index: draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/draw.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- draw.cpp	22 Jun 2005 19:32:09 -0000	1.11
+++ draw.cpp	30 Jul 2005 21:10:59 -0000	1.12
@@ -405,7 +405,7 @@
 			    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 @@
 				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 @@
 		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);

Index: driver_vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/driver_vga.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- driver_vga.cpp	14 Jun 2005 20:01:46 -0000	1.10
+++ driver_vga.cpp	30 Jul 2005 21:10:59 -0000	1.11
@@ -34,7 +34,7 @@
 	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 @@
 	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;
 

Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/game.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- game.cpp	19 Jul 2005 09:10:04 -0000	1.23
+++ game.cpp	30 Jul 2005 21:10:59 -0000	1.24
@@ -535,10 +535,10 @@
 			if (deltaTime == -1 || curtime + deltaTime > timeKey) {
 				if (pResId != 0)
 					*pResId = 0;
-				
+
 				if (pResIndex != 0)
 					*pResIndex = 0;
-				
+
 				return 0;
 			}
 		}
@@ -603,7 +603,7 @@
 						|| 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 @@
 			}
 			return 0x4800;
 
-		case 0xe08:	// Backspace	
+		case 0xe08:	// Backspace
 			if (pos > 0) {
 				util_cutFromStr(str, pos - 1, 1);
 				pos--;
@@ -1810,14 +1810,14 @@
 				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 @@
 			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;
 			}
 

Index: gob.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/gob.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gob.h	13 May 2005 21:24:30 -0000	1.8
+++ gob.h	30 Jul 2005 21:10:59 -0000	1.9
@@ -66,6 +66,6 @@
 };
 
 extern GobEngine *_vm;
- 
+
 } // End of namespace Gob
 #endif

Index: goblin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/goblin.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- goblin.cpp	10 Jul 2005 13:37:03 -0000	1.18
+++ goblin.cpp	30 Jul 2005 21:10:59 -0000	1.19
@@ -1980,10 +1980,10 @@
 	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 @@
 	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;
 }
 

Index: goblin.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/goblin.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- goblin.h	1 May 2005 10:15:30 -0000	1.4
+++ goblin.h	30 Jul 2005 21:11:00 -0000	1.5
@@ -80,7 +80,7 @@
 	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 {

Index: inter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/inter.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- inter.cpp	19 Jul 2005 09:10:05 -0000	1.21
+++ inter.cpp	30 Jul 2005 21:11:00 -0000	1.22
@@ -164,7 +164,7 @@
 	}
 
 	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 @@
 			if (pressedKeys[0x3e])
 				key |= 0x4000;
 
-			WRITE_VAR(0, key);			
+			WRITE_VAR(0, key);
 			util_waitKey();
 			return;
 		}
@@ -1149,7 +1149,7 @@
 	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;

Index: mult.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/mult.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mult.cpp	5 May 2005 11:11:49 -0000	1.10
+++ mult.cpp	30 Jul 2005 21:11:00 -0000	1.11
@@ -90,7 +90,7 @@
 
 Color mult_fadePal[5][16];
 
-// Sounds 
+// Sounds
 int16 mult_sndKeysCount;
 Mult_SndKey *mult_sndKeys;
 
@@ -557,7 +557,7 @@
 			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 @@
 		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;

Index: palanim.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/palanim.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- palanim.cpp	14 Jun 2005 20:05:31 -0000	1.8
+++ palanim.cpp	30 Jul 2005 21:11:00 -0000	1.9
@@ -72,7 +72,7 @@
 				if (redPalette[i] != newRed
 				    || greenPalette[i] != newGreen
 				    || bluePalette[i] != newBlue) {
-					
+
 					vid_setPalElem(i, newRed, newGreen, newBlue, 0, 0x13);
 
 					redPalette[i] = newRed;

Index: scenery.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/scenery.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- scenery.cpp	22 Jun 2005 19:32:10 -0000	1.17
+++ scenery.cpp	30 Jul 2005 21:11:00 -0000	1.18
@@ -119,14 +119,14 @@
 	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++;
 	}

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/util.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- util.cpp	6 May 2005 15:59:33 -0000	1.14
+++ util.cpp	30 Jul 2005 21:11:00 -0000	1.15
@@ -75,7 +75,7 @@
 	} keys[] = {
 		{8,   0x0e08},	// Backspace
 		{13,  0x1C0D},	// Enter
-		{27,  0x011b},	// ESC 
+		{27,  0x011b},	// ESC
 		{127, 0x5300},	// Del
 		{273, 0x4800},	// Up arrow
 		{274, 0x5000},	// Down arrow

Index: video.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/video.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- video.cpp	22 Jun 2005 19:32:10 -0000	1.12
+++ video.cpp	30 Jul 2005 21:11:00 -0000	1.13
@@ -30,9 +30,9 @@
 
 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 @@
 		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 @@
 	sprAllocated--;
 	if (surfDesc != pPrimarySurfDesc)
 		free(surfDesc);
-	else 
+	else
 		free(surfDesc->vidPtr);
 }
 
@@ -353,7 +353,7 @@
 		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);
 }
 

Index: video.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/video.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- video.h	24 Jun 2005 15:22:39 -0000	1.7
+++ video.h	30 Jul 2005 21:11:00 -0000	1.8
@@ -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 @@
 #define TEXT_COL_COUNT	80
 #define TEXT_ROW_COUNT	25
 
-	
+
 typedef struct SurfaceDesc_t {
 	int16 width;
 	int16 height;
@@ -64,7 +64,7 @@
 	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;