[Scummvm-cvs-logs] CVS: scummvm/sword2 build_display.cpp,1.75,1.76 console.cpp,1.56,1.57 controls.cpp,1.92,1.93 controls.h,1.20,1.21 debug.cpp,1.50,1.51 function.cpp,1.86,1.87 icons.cpp,1.44,1.45 logic.h,1.46,1.47 maketext.cpp,1.49,1.50 maketext.h,1.17,1.18 memory.cpp,1.36,1.37 mouse.cpp,1.74,1.75 mouse.h,1.20,1.21 protocol.cpp,1.31,1.32 resman.cpp,1.113,1.114 router.cpp,1.48,1.49 save_rest.cpp,1.73,1.74 speech.cpp,1.75,1.76 sword2.cpp,1.147,1.148 walker.cpp,1.48,1.49

Eugene Sandulenko sev at users.sourceforge.net
Sat Jul 30 14:12:57 CEST 2005 

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

Modified Files:
	build_display.cpp console.cpp controls.cpp controls.h 
	debug.cpp function.cpp icons.cpp logic.h maketext.cpp 
	maketext.h memory.cpp mouse.cpp mouse.h protocol.cpp 
	resman.cpp router.cpp save_rest.cpp speech.cpp sword2.cpp 
	walker.cpp 
Log Message:
Remove trailing whitespaces.


Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/build_display.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- build_display.cpp	12 May 2005 13:11:58 -0000	1.75
+++ build_display.cpp	30 Jul 2005 21:11:45 -0000	1.76
@@ -186,7 +186,7 @@
 	byte oldPal[256 * 4];
 
 	debug(2, "DisplayMsg: %s", text);
-	
+
 	if (getFadeStatus() != RDFADE_BLACK) {
 		fadeDown();
 		waitForFade();

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/console.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- console.cpp	9 Jul 2005 13:21:20 -0000	1.56
+++ console.cpp	30 Jul 2005 21:11:45 -0000	1.57
@@ -260,7 +260,7 @@
 
 		DebugPrintf("%9ld %-3d %-4d %-20s %s\n", blocks[i]->size, blocks[i]->id, blocks[i]->uid, type, head->name);
 	}
-		
+
 	free(blocks);
 
 	DebugPrintf("---------------------------------------------------------------------------\n");
@@ -286,7 +286,7 @@
 
 	for (uint i = 0; i < numClusters; i++) {
 		DebugPrintf("%-20s ", resFiles[i].fileName);
-		if (!(resFiles[i].cd & LOCAL_PERM)) {			
+		if (!(resFiles[i].cd & LOCAL_PERM)) {
 			switch (resFiles[i].cd & 3) {
 			case BOTH:
 				DebugPrintf("CD 1 & 2\n");
@@ -368,7 +368,7 @@
 	}
 
 	int start = atoi(argv[1]);
-	
+
 	if (start < 0 || start >= (int) numStarts) {
 		DebugPrintf("Not a legal start position\n");
 		return true;
@@ -674,7 +674,7 @@
 	}
 
 	varNo = atoi(argv[1]);
-	
+
 	// search for a spare slot in the watch-list, but also watch out for
 	// this variable already being in the list
 
@@ -705,7 +705,7 @@
 	}
 
 	varNo = atoi(argv[1]);
-	
+
 	// search for 'varNo' in the watch-list
 	while (showVarNo < MAX_SHOWVARS && _showVar[showVarNo] != varNo)
 		showVarNo++;

Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/controls.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- controls.cpp	9 Jul 2005 13:21:20 -0000	1.92
+++ controls.cpp	30 Jul 2005 21:11:45 -0000	1.93
@@ -57,7 +57,7 @@
 		byte *_surface;
 		bool _original;
 	};
- 
+
 	WidgetSurface *_surfaces;
 	int _numStates;
 	int _state;
@@ -103,7 +103,7 @@
 class FontRendererGui {
 private:
 	Sword2Engine *_vm;
-	
+
 	struct Glyph {
 		byte *_data;
 		int _width;
@@ -170,7 +170,7 @@
 		if (buf)
 			buf[i] = data[i + 2];
 	}
-			
+
 	buf[i] = 0;
 	_vm->_resman->closeResource(textId / SIZE);
 }
@@ -877,7 +877,7 @@
 
 OptionsDialog::OptionsDialog(Sword2Engine *vm) : Dialog(vm) {
 	_fr = new FontRendererGui(_vm, _vm->_controlsFontId);
-		
+
 	_mixer = _vm->_mixer;
 
 	_panel = new Widget(this, 1);

Index: controls.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/controls.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- controls.h	10 May 2005 23:48:48 -0000	1.20
+++ controls.h	30 Jul 2005 21:11:46 -0000	1.21
@@ -85,7 +85,7 @@
 	Widget *_gfxPreview;
 	Button *_okButton;
 	Button *_cancelButton;
-	
+
 	Audio::Mixer *_mixer;
 
 public:
@@ -176,7 +176,7 @@
 public:
 	RestoreDialog(Sword2Engine *vm) : SaveRestoreDialog(vm, kRestoreDialog) {}
 };
- 
+
 } // End of namespace Sword2
 
 #endif

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/debug.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- debug.cpp	12 May 2005 13:12:02 -0000	1.50
+++ debug.cpp	30 Jul 2005 21:11:46 -0000	1.51
@@ -326,7 +326,7 @@
 	// walk-grid
 
 	if (_displayWalkGrid)
-		_vm->_logic->_router->plotWalkGrid(); 
+		_vm->_logic->_router->plotWalkGrid();
 
 	// player feet coord marker
 

Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- function.cpp	20 Jun 2005 06:29:36 -0000	1.86
+++ function.cpp	30 Jul 2005 21:11:46 -0000	1.87
@@ -813,7 +813,7 @@
 
 		if (_vm->_sound->getSpeechStatus() != RDSE_SAMPLEFINISHED)
 			return IR_REPEAT;
-		
+
 		// New fudge for 'fx' subtitles: If subtitles switched off, and
 		// we don't want to use a wav for this line either, then just
 		// quit back to script right now!
@@ -897,7 +897,7 @@
 		// Set the 'looping_flag' and the text-click-delays. We can
 		// left-click past the text after half a second, and
 		// right-click past it after a quarter of a second.
- 
+
 		ob_logic->looping = 1;
 		_leftClickDelay = 6;
 		_rightClickDelay = 3;

Index: icons.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/icons.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- icons.cpp	12 May 2005 13:12:02 -0000	1.44
+++ icons.cpp	30 Jul 2005 21:11:46 -0000	1.45
@@ -191,7 +191,7 @@
 
 	for (int i = 0; i < ARRAYSIZE(icon_list); i++) {
 		byte *icon = _vm->_resman->openResource(icon_list[i]) + sizeof(StandardHeader);
-		
+
 		// The only case when an icon is grayed is when the player
 		// is dead. Then SAVE is not available.
 

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/logic.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- logic.h	12 May 2005 06:30:16 -0000	1.46
+++ logic.h	30 Jul 2005 21:11:46 -0000	1.47
@@ -168,10 +168,10 @@
 	int32 fnRegisterStartPoint(int32 *params);
 	int32 fnInitBackground(int32 *params);
 	int32 fnSetSession(int32 *params);
-	int32 fnBackSprite(int32 *params);	
-	int32 fnSortSprite(int32 *params);	
-	int32 fnForeSprite(int32 *params);	
-	int32 fnRegisterMouse(int32 *params);	
+	int32 fnBackSprite(int32 *params);
+	int32 fnSortSprite(int32 *params);
+	int32 fnForeSprite(int32 *params);
+	int32 fnRegisterMouse(int32 *params);
 	int32 fnAnim(int32 *params);
 	int32 fnRandom(int32 *params);
 	int32 fnPreLoad(int32 *params);

Index: maketext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/maketext.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- maketext.cpp	12 May 2005 13:12:03 -0000	1.49
+++ maketext.cpp	30 Jul 2005 21:11:46 -0000	1.50
@@ -357,7 +357,7 @@
 			// Apparently overlapping is never considered here?
 			memcpy(dest, source, charPtr->width);
 			source += charPtr->width;
-		}			
+		}
 		rowPtr += spriteWidth;
 	}
 }
@@ -435,7 +435,7 @@
 			x = text_left_margin;
 		else if (x > text_right_margin)
 			x = text_right_margin;
-			
+
 		// Move if too high or too low
 
 		if (y < text_top_margin)

Index: maketext.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/maketext.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- maketext.h	2 May 2005 05:41:00 -0000	1.17
+++ maketext.h	30 Jul 2005 21:11:46 -0000	1.18
@@ -32,7 +32,7 @@
 
 // Usually the only texts on screen are the subtitles and the mouse-over text,
 // but there can also be a considerable number of debugging messages...
-    
+
 #define MAX_text_blocs MAX_DEBUG_TEXTS + 1
 
 enum {
@@ -93,7 +93,7 @@
 	uint16 charHeight(uint32 fontRes);
 	FrameHeader* findChar(byte ch, byte *charSet);
 	void copyChar(FrameHeader *charPtr, byte *spritePtr, uint16 spriteWidth, uint8 pen);
-	
+
 public:
 	FontRenderer(Sword2Engine *vm) : _vm(vm) {
 		for (int i = 0; i < MAX_text_blocs; i++)

Index: memory.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/memory.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- memory.cpp	12 May 2005 13:12:03 -0000	1.36
+++ memory.cpp	30 Jul 2005 21:11:46 -0000	1.37
@@ -232,7 +232,7 @@
 	_memBlockIndex[idx]->ptr = NULL;
 
 	_totAlloc -= _memBlockIndex[idx]->size;
-	
+
 	// Remove the memory block from the index
 	_numBlocks--;
 

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mouse.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- mouse.cpp	9 Jul 2005 13:21:20 -0000	1.74
+++ mouse.cpp	30 Jul 2005 21:11:46 -0000	1.75
@@ -999,11 +999,11 @@
 		setMouse(0);
 
 		// so we know to set the mouse pointer back to normal if 2nd
-		// hot-spot doesn't register because mouse pulled away 
+		// hot-spot doesn't register because mouse pulled away
 		// quickly (onto nothing)
 
 		mouse_flicked_off = 1;
-		
+
 		// reset luggage only when necessary
 	} else {
 		// Mouse was flicked off for one cycle, but then moved onto

Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mouse.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- mouse.h	24 Apr 2005 12:13:03 -0000	1.20
+++ mouse.h	30 Jul 2005 21:11:46 -0000	1.21
@@ -70,7 +70,7 @@
 	uint8 runTimeComp;	// type of runtime compression used for the
 				// frame data
 	uint8 noAnimFrames;	// number of frames in the anim
-	int8 xHotSpot;		
+	int8 xHotSpot;
 	int8 yHotSpot;
 	uint8 mousew;
 	uint8 mouseh;
@@ -82,7 +82,7 @@
 
 // The MOUSE_holding mode is entered when the conversation menu is closed, and
 // exited when the mouse cursor moves off that menu area. I don't know why yet.
- 
+
 // mouse unit - like ObjectMouse, but with anim resource & pc (needed if
 // sprite is to act as mouse detection mask)
 

Index: protocol.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/protocol.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- protocol.cpp	12 May 2005 13:12:03 -0000	1.31
+++ protocol.cpp	30 Jul 2005 21:11:46 -0000	1.32
@@ -42,7 +42,7 @@
 	palette[1] = 0;
 	palette[2] = 0;
 	palette[3] = 0;
-   
+
 	return palette;
 }
 

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- resman.cpp	12 May 2005 13:12:04 -0000	1.113
+++ resman.cpp	30 Jul 2005 21:11:46 -0000	1.114
@@ -36,7 +36,7 @@
 
 // Welcome to the easy resource manager - written in simple code for easy
 // maintenance
-// 
+//
 // The resource compiler will create two files
 //
 //	resource.inf which is a list of ascii cluster file names
@@ -154,7 +154,7 @@
 	for (i = 0; i < _totalClusters; i++) {
 		file.read(cdInf[i].clusterName, sizeof(cdInf[i].clusterName));
 		cdInf[i].cd = file.readByte();
-		
+
 		if (file.ioFailed())
 			error("Cannot read cd.inf");
 	}
@@ -209,7 +209,7 @@
 void convertEndian(byte *file, uint32 len) {
 	int i;
 	StandardHeader *hdr = (StandardHeader *)file;
-	
+
 	file += sizeof(StandardHeader);
 
 	SWAP32(hdr->compSize);
@@ -404,7 +404,7 @@
 		// Relative resource within the file
 		// First we have to find the file via the _resConvTable
 		uint16 actual_res = _resConvTable[(res * 2) + 1];
-		
+
 		debug(5, "openResource %s res %d", _resFiles[cluFileNum].fileName, res);
 
 		// If we're loading a cluster that's only available from one

Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/router.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- router.cpp	12 May 2005 13:12:11 -0000	1.48
+++ router.cpp	30 Jul 2005 21:11:47 -0000	1.49
@@ -38,8 +38,8 @@
 /****************************************************************************
  *    JROUTER.C				polygon router with modular walks
  *       					using a tree of modules
- *       					21 july 94  
- *  3  november 94  
+ *       					21 july 94
+ *  3  november 94
  *  System currently works by scanning grid data and coming up with a	ROUTE
  *  as a series of way points(nodes), the smoothest eight directional PATH
  * 	through these nodes is then found, and a WALK created to fit the PATH.
@@ -47,9 +47,9 @@
  *	Two funtions are called by the user, RouteFinder creates a route as a
  *	module list, HardWalk creates an animation list from the module list.
  *	The split is only provided to allow the possibility of turning the
- *	autorouter over two game cycles.     
+ *	autorouter over two game cycles.
  ****************************************************************************
- *    
+ *
  *	Routine timings on osborne 486
  *
  *	Read floor resource (file already loaded)	 112 pixels
@@ -59,7 +59,7 @@
  *
  *
  ****************************************************************************
- *    
+ *
  *  Modified 12 Oct 95
  *
  *	Target Points within 1 pixel of a line are ignored ???
@@ -101,7 +101,7 @@
 	// in middle of route, the old route will be safely cleared from
 	// memory just before they create a new one
 
-	slotNo = returnSlotNo(Logic::_scriptVars[ID]); 
+	slotNo = returnSlotNo(Logic::_scriptVars[ID]);
 
 	// if this slot is already used, then it can't be needed any more
 	// because this id is creating a new route!
@@ -126,12 +126,12 @@
 
 WalkData *Router::getRouteMem() {
 	uint8 slotNo = returnSlotNo(Logic::_scriptVars[ID]);
-	
+
 	return (WalkData *)_routeSlots[slotNo];
 }
 
 void Router::freeRouteMem() {
-	uint8 slotNo = returnSlotNo(Logic::_scriptVars[ID]); 
+	uint8 slotNo = returnSlotNo(Logic::_scriptVars[ID]);
 
 	free(_routeSlots[slotNo]);
 	_routeSlots[slotNo] = NULL;
@@ -147,8 +147,8 @@
 int32 Router::routeFinder(ObjectMega *ob_mega, ObjectWalkdata *ob_walkdata, int32 x, int32 y, int32 dir) {
 	/*********************************************************************
 	 * RouteFinder.C		polygon router with modular walks
-	 * 						21 august 94  
-	 *						3  november 94  
+	 * 						21 august 94
+	 *						3  november 94
 	 * routeFinder creates a list of modules that enables HardWalk to
 	 * create an animation list.
 	 *
@@ -157,15 +157,15 @@
 	 * directional PATH through these nodes is then found, this
 	 * information is made available to HardWalk for a WALK to be created
 	 * to fit the PATH.
-	 *    
+	 *
 	 * 30 november 94 return values modified
-	 *    
+	 *
 	 * return	0 = failed to find a route
-	 *    
+	 *
 	 *    		1 = found a route
 	 *
 	 *    		2 = mega already at target
-	 *    
+	 *
 	 *********************************************************************/
 
 	int32 routeFlag = 0;
@@ -181,7 +181,7 @@
 
 	// All route data now loaded start finding a route
 
-	// Check if we can get a route through the floor. changed 12 Oct95 JPS 
+	// Check if we can get a route through the floor. changed 12 Oct95 JPS
 
 	routeFlag = getRoute();
 
@@ -223,7 +223,7 @@
 		// The path is in module format, but steps taken in each
 		// direction are not accurate
 
-		// if target dir = 8 then the walk isn't linked to an anim so 
+		// if target dir = 8 then the walk isn't linked to an anim so
 		// we can create a route without sliding and miss the exact
 		// target
 
@@ -265,9 +265,9 @@
 	 * a ROUTE as a series of way points(nodes).
 	 *
 	 * static routeData _route[O_ROUTE_SIZE];
-	 *    
+	 *
 	 * return 	0 = failed to find a route
-	 *    
+	 *
 	 *		1 = found a route
 	 *
 	 *		2 = mega already at target
@@ -291,7 +291,7 @@
 
 	if (routeGot == 0) {
 		// still looking for a route check if target is within a pixel
-		// of a line 
+		// of a line
 
 		// scan through the nodes linking each node to its nearest
 		// neighbour until no more nodes change
@@ -340,7 +340,7 @@
 	// Secondly when walking in a given direction the number of steps
 	// required to reach the end of that run is not calculated accurately.
 	// This is because I was unable to derive a function to relate number
-	// of steps taken between two points to the shrunken step size   
+	// of steps taken between two points to the shrunken step size
 
 	int i;
 	int32 steps = 0;
@@ -393,7 +393,7 @@
 			dDS = dDS + NO_DIRECTIONS;
 
 		// Determine the amount of turning involved in each possible
-		// path 
+		// path
 
 		dS = turntable[dS];
 		dD = turntable[dD];
@@ -403,7 +403,7 @@
 		dDS = turntable[dDS];
 
 		// get the best path out ie assume next section uses best
-		// direction 
+		// direction
 
 		if (dSD < dSS)
 			dSS = dSD;
@@ -447,8 +447,8 @@
 
 		assert(options);
 
-		i = 0; 
-		steps = 0; 
+		i = 0;
+		steps = 0;
 
 		do {
 			int32 opt = 1 << turns[i];
@@ -467,7 +467,7 @@
 
 	_smoothPath[steps].dir = 9;
 	_smoothPath[steps].num = ROUTE_END_FLAG;
-	return 1;				 
+	return 1;
 }
 
 int32 Router::smoothCheck(int32 best, int32 p, int32 dirS, int32 dirD) {
@@ -611,8 +611,8 @@
 
 		break;
 	}
-	
-	return k;	
+
+	return k;
 }
 
 void Router::slidyPath() {
@@ -715,7 +715,7 @@
 
 	// if this mega does actually have slow-out frames
 	if (_usingSlowOutFrames) {
-		// overwrite the next step (half a cycle) of the walk 
+		// overwrite the next step (half a cycle) of the walk
 		// (ie .step - 0..5)
 
 		do {
@@ -790,11 +790,11 @@
  	if (_usingSlowOutFrames && _lastCount >= _framesPerStep) {
 		// place stop frames here
 		// slowdown at the end of the last walk
-	
+
 		slowOutFrameNo = _lastCount - _framesPerStep;
 
 		debug(5, "SLOW OUT: slowOutFrameNo(%d) = _lastCount(%d) - _framesPerStep(%d)", slowOutFrameNo, _lastCount, _framesPerStep);
-	
+
 		// overwrite the last step (half a cycle) of the walk
 
 		do {
@@ -810,7 +810,7 @@
 			debug(5, "walkAnim[%d].frame = %d",slowOutFrameNo,walkAnim[slowOutFrameNo].frame);
 			slowOutFrameNo++;
 		} while (slowOutFrameNo < _lastCount);
-	
+
 		// add stationary frame(s) (OPTIONAL)
 
 		for (slowOutFrameNo = _framesPerStep; slowOutFrameNo < _numberOfSlowOutFrames; slowOutFrameNo++) {
@@ -834,7 +834,7 @@
 	 * the route
 	 *
 	 *	Parameters:	georgeg, mouseg
-	 *	Returns:	rout 
+	 *	Returns:	rout
 	 *
 	 * produce a module list from the line data
 	 *********************************************************************/
@@ -1081,7 +1081,7 @@
 					do {
 						frameCount++;
 						walkAnim[_lastCount + frameCount - 1].x += errorX * frameCount / frames;
-					} while (frameCount < frames);	
+					} while (frameCount < frames);
 				}
 
 				if (errorY != 0) {
@@ -1090,7 +1090,7 @@
 					do {
 						frameCount++;
 						walkAnim[_lastCount + frameCount - 1].y += errorY * frameCount / frames;
-					} while (frameCount < frames);	
+					} while (frameCount < frames);
 				}
 
 				// Now is the time to put in the turn frames
@@ -1099,7 +1099,7 @@
 				if (frames < _framesPerStep) {
 					// this ensures that we don't put in
 					// turn frames for this walk or the
-					// next		
+					// next
 					_currentDir = 99;
 				}
 
@@ -1120,11 +1120,11 @@
 
 						_frame = _lastCount - _framesPerStep;
 						do {
-							// turning left 
+							// turning left
 							walkAnim[_frame].frame += _firstWalkingTurnLeftFrame;
 							_frame++;
 						} while (_frame < _lastCount);
-					} else if (lastDir == 1 || lastDir == -7 || lastDir == 2 || lastDir == -6) {	
+					} else if (lastDir == 1 || lastDir == -7 || lastDir == 2 || lastDir == -6) {
 						// turn at the end of the
 						// current walk
 
@@ -1272,7 +1272,7 @@
 	return;
 }
 
-#ifndef FORCE_SLIDY 
+#ifndef FORCE_SLIDY
 
 // THE SOLID PATH ROUTINES
 
@@ -1332,7 +1332,7 @@
 		solid = 2;
 		_modularPath[1].dir = _smoothPath[0].dir;
 		_modularPath[1].num = 0;
-	}	
+	}
 
 	_modularPath[solid - 1].x = _smoothPath[smooth - 1].x;
 	_modularPath[solid - 1].y = _smoothPath[smooth - 1].y;
@@ -1564,7 +1564,7 @@
 					}
 
 					// check each turn condition in turn
-					if (lastDir != 99 && _currentDir != 99 && _usingWalkingTurnFrames) {	
+					if (lastDir != 99 && _currentDir != 99 && _usingWalkingTurnFrames) {
 						// only for george
 						// 1 and -7 going right -1 and
 						// 7 going left
@@ -1582,7 +1582,7 @@
 								walkAnim[_frame].frame += _firstWalkingTurnLeftFrame;
 								_frame++;
 							} while (_frame < _lastCount);
-						} else if (lastDir == 1 || lastDir == -7 || lastDir == 2 || lastDir == -6) {	
+						} else if (lastDir == 1 || lastDir == -7 || lastDir == 2 || lastDir == -6) {
 							// turn at the end of
 							// the current walk
 
@@ -1603,7 +1603,7 @@
 		p++;
 		lastDir = _currentDir;
 
-		// can only be valid first time round 
+		// can only be valid first time round
 		slowStart = false;
 	} while (_modularPath[p].dir < NO_DIRECTIONS);
 
@@ -1683,7 +1683,7 @@
  	// For all the nodes that have new values and a distance less than
 	// enddist, ie dont check for new routes from a point we checked
 	// before or from a point that is already further away than the best
-	// route so far. 
+	// route so far.
 
 	for (int i = 0; i < _nNodes; i++) {
 		if (_node[i].dist < _node[_nNodes].dist && _node[i].level == level) {
@@ -1719,12 +1719,12 @@
 int32 Router::newCheck(int32 status, int32 x1, int32 y1, int32 x2, int32 y2) {
 	/*********************************************************************
 	 * newCheck routine checks if the route between two points can be
-	 * achieved without crossing any of the bars in the Bars array. 
+	 * achieved without crossing any of the bars in the Bars array.
 	 *
 	 * newCheck differs from check in that that 4 route options are
 	 * considered corresponding to actual walked routes.
 	 *
-	 * Note distance doesnt take account of shrinking ??? 
+	 * Note distance doesnt take account of shrinking ???
 	 *
 	 * Note Bars array must be properly calculated ie min max dx dy co
 	 *********************************************************************/
@@ -1905,7 +1905,7 @@
 // CHECK ROUTINES
 
 bool Router::check(int32 x1, int32 y1, int32 x2, int32 y2) {
-	// call the fastest line check for the given line 
+	// call the fastest line check for the given line
 	// returns true if line didn't cross any bars
 
 	if (x1 == x2 && y1 == y2)
@@ -1937,7 +1937,7 @@
 	int32 co = (y1 * dirx) - (x1 * diry);		// new line equation
 
 	for (int i = 0; i < _nBars && linesCrossed; i++) {
-		// skip if not on module 
+		// skip if not on module
 		if (xmax >= _bars[i].xmin && xmin <= _bars[i].xmax && ymax >= _bars[i].ymin && ymin <= _bars[i].ymax) {
 			// Okay, it's a valid line. Calculate an intercept. Wow
 			// but all this arithmetic we must have loads of time
@@ -1952,13 +1952,13 @@
 
 				// skip if not on module
 				if (xc >= xmin - 1 && xc <= xmax + 1) {
-					// skip if not on line 
+					// skip if not on line
 					if (xc >= _bars[i].xmin - 1 && xc <= _bars[i].xmax + 1) {
 						int32 yc = ((_bars[i].co * diry) - (co * _bars[i].dy)) / slope;
 
 						// skip if not on module
 						if (yc >= ymin - 1 && yc <= ymax + 1) {
-							// skip if not on line 
+							// skip if not on line
 							if (yc >= _bars[i].ymin - 1 && yc <= _bars[i].ymax + 1) {
 								linesCrossed = false;
 							}
@@ -1992,7 +1992,7 @@
 			else {
 				int32 ldy = y - _bars[i].y1;
 				int32 xc = _bars[i].x1 + (_bars[i].dx * ldy) / _bars[i].dy;
-				// skip if not on module 
+				// skip if not on module
 				if (xc >= xmin - 1 && xc <= xmax + 1)
 					linesCrossed = false;
 			}
@@ -2012,7 +2012,7 @@
 	// anything
 
 	for (int i = 0; i < _nBars && linesCrossed; i++) {
-		// skip if not on module 
+		// skip if not on module
 		if (x >= _bars[i].xmin && x <= _bars[i].xmax && ymax >= _bars[i].ymin && ymin <= _bars[i].ymax) {
 			// Okay, it's a valid line calculate an intercept. Wow
 			// but all this arithmetic we must have loads of time
@@ -2025,7 +2025,7 @@
 			else {
 				int32 ldx = x - _bars[i].x1;
 				int32 yc = _bars[i].y1 + (_bars[i].dy * ldx) / _bars[i].dx;
-				// the intercept overlaps 
+				// the intercept overlaps
 				if (yc >= ymin - 1 && yc <= ymax + 1)
 					linesCrossed = false;
 			}
@@ -2047,22 +2047,22 @@
 	// so ignore if it hits anything
 
 	for (int i = 0; i < _nBars && onLine == 0; i++) {
-		// overlapping line 
+		// overlapping line
 		if (xmax >= _bars[i].xmin && xmin <= _bars[i].xmax && ymax >= _bars[i].ymin && ymin <= _bars[i].ymax) {
 			int32 xc, yc;
 
 			// okay this line overlaps the target calculate
-			// an y intercept for x 
+			// an y intercept for x
 
 			// vertical line so we know it overlaps y
 			if (_bars[i].dx == 0)
-				yc = 0; 	
+				yc = 0;
 			else {
 				int ldx = x - _bars[i].x1;
 				yc = _bars[i].y1 + (_bars[i].dy * ldx) / _bars[i].dx;
 			}
 
-			// overlapping point for y 
+			// overlapping point for y
 			if (yc >= ymin && yc <= ymax) {
 				// target on a line so drop out
 				onLine = 3;
@@ -2076,7 +2076,7 @@
 					xc = _bars[i].x1 + (_bars[i].dx * ldy) / _bars[i].dy;
 				}
 
-				// skip if not on module 
+				// skip if not on module
 				if (xc >= xmin && xc <= xmax) {
 					// target on a line so drop out
 					onLine = 3;
@@ -2209,7 +2209,7 @@
 	/*********************************************************************
 	 * extractRoute gets route from the node data after a full scan, route
 	 * is written with just the basic way points and direction options for
-	 * heading to the next point. 
+	 * heading to the next point.
 	 *********************************************************************/
 
 	int32 prev;
@@ -2308,7 +2308,7 @@
 		// ANY direction
 		_route[p].dirS = _route[p - 1].dirS;
 		_route[p].dirD = _route[p - 1].dirD;
-	} else { 
+	} else {
 		_route[p].dirS = _targetDir;
 		_route[p].dirD = _targetDir;
 	}
@@ -2377,7 +2377,7 @@
 
 void Router::plotCross(int16 x, int16 y, uint8 colour) {
 	_vm->_screen->drawLine(x - 1, y - 1, x + 1, y + 1, colour);
-	_vm->_screen->drawLine(x + 1, y - 1, x - 1, y + 1, colour);	
+	_vm->_screen->drawLine(x + 1, y - 1, x - 1, y + 1, colour);
 }
 
 void Router::loadWalkGrid() {

Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/save_rest.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- save_rest.cpp	12 May 2005 13:12:11 -0000	1.73
+++ save_rest.cpp	30 Jul 2005 21:11:47 -0000	1.74
@@ -56,7 +56,7 @@
 	SWAP32(header.feet_x);
 	SWAP32(header.feet_y);
 	SWAP32(header.music_id);
-	
+
 	// ObjectHub
 	SWAP32(header.player_hub.type);
 	SWAP32(header.player_hub.logic_level);
@@ -317,8 +317,8 @@
 
 	// Clean out the system kill list (no more objects to kill)
 	_logic->resetKillList();
-	
-	// Object hub is just after the standard header 
+
+	// Object hub is just after the standard header
 	memcpy(_resman->openResource(CUR_PLAYER_ID) + sizeof(StandardHeader), &_saveGameHeader.player_hub, sizeof(ObjectHub));
 
 	_resman->closeResource(CUR_PLAYER_ID);

Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/speech.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- speech.cpp	12 May 2005 13:12:12 -0000	1.75
+++ speech.cpp	30 Jul 2005 21:11:47 -0000	1.76
@@ -119,11 +119,11 @@
 
 	// Leave space above their head
 	_textY -= GAP_ABOVE_HEAD;
-			
+
 	// Adjust the text coords for RDSPR_DISPLAYALIGN
 
 	ScreenInfo *screenInfo = _vm->_screen->getScreenInfo();
-	
+
 	_textX -= screenInfo->scroll_offset_x;
 	_textY -= screenInfo->scroll_offset_y;
 }

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- sword2.cpp	9 Jul 2005 13:21:20 -0000	1.147
+++ sword2.cpp	30 Jul 2005 21:11:47 -0000	1.148
@@ -77,7 +77,7 @@
 DetectedGameList Engine_SWORD2_detectGames(const FSList &fslist) {
 	DetectedGameList detectedGames;
 	const Sword2GameSettings *g;
-	
+
 	// TODO: It would be nice if we had code here which distinguishes
 	// between the 'sword2' and 'sword2demo' targets. The current code
 	// can't do that since they use the same detectname.
@@ -225,7 +225,7 @@
 	Logic::_scriptVars = (uint32 *)(_resman->openResource(1) + sizeof(StandardHeader));
 	_resman->openResource(CUR_PLAYER_ID);
 }
-    
+
 int Sword2Engine::init(GameDetector &detector) {
 	// Get some falling RAM and put it in your pocket, never let it slip
 	// away
@@ -302,7 +302,7 @@
 		startGame();
 
 	_screen->initialiseRenderCycle();
-	
+
 	return 0;
 }
 
@@ -378,7 +378,7 @@
 		_screen->buildDisplay();
 #endif
 	}
-	
+
 	return 0;
 }
 
@@ -489,7 +489,7 @@
 	OSystem::Event event;
 
 	uint32 now = _system->getMillis();
-	
+
 	while (_system->pollEvent(event)) {
 		switch (event.type) {
 		case OSystem::EVENT_KEYDOWN:
@@ -641,7 +641,7 @@
 	// Don't allow Pause while screen fading or while black
 	if (_screen->getFadeStatus() != RDFADE_NONE)
 		return;
-	
+
 	_sound->pauseAllSound();
 	_mouse->pauseGame();
 

Index: walker.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/walker.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- walker.cpp	12 May 2005 13:12:13 -0000	1.48
+++ walker.cpp	30 Jul 2005 21:11:47 -0000	1.49
@@ -90,7 +90,7 @@
 		// an anim eg. repeatedly clicking on same object to repeat
 		// an anim - no mega frame will appear in between runs of the
 		// anim.
-		
+
 		if (ob_mega->feet_x == target_x && ob_mega->feet_y == target_y && ob_mega->current_dir == target_dir) {
 			Logic::_scriptVars[RESULT] = 0;
 			return IR_CONT;

More information about the Scummvm-git-logs mailing list