[Scummvm-cvs-logs] CVS: scummvm/saga actor.h,1.86,1.87 animation.h,1.28,1.29 console.h,1.15,1.16 events.h,1.19,1.20 font.h,1.15,1.16 gfx.h,1.35,1.36 interface.h,1.66,1.67 isomap.h,1.24,1.25 list.h,1.10,1.11 objectmap.h,1.23,1.24 puzzle.h,1.5,1.6 rscfile.h,1.14,1.15 saga.h,1.112,1.113 scene.h,1.66,1.67 script.h,1.99,1.100 sndres.h,1.22,1.23 sound.h,1.23,1.24 sprite.h,1.22,1.23 sthread.cpp,1.92,1.93

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

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

Modified Files:
	actor.h animation.h console.h events.h font.h gfx.h 
	interface.h isomap.h list.h objectmap.h puzzle.h rscfile.h 
	saga.h scene.h script.h sndres.h sound.h sprite.h sthread.cpp 
Log Message:
Remove trailing whitespaces.


Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- actor.h	19 Jul 2005 19:05:40 -0000	1.86
+++ actor.h	30 Jul 2005 21:11:20 -0000	1.87
@@ -123,7 +123,7 @@
 
 enum PathCellType {
 	kPathCellEmpty = -1,
-	//kDirUp = 0 .... kDirUpLeft = 7 
+	//kDirUp = 0 .... kDirUpLeft = 7
 	kPathCellBarrier = 0x57
 };
 
@@ -162,8 +162,8 @@
 
 struct Location {
 	int32 x;					// logical coordinates
-	int32 y;					// 
-	int32 z;					// 
+	int32 y;					//
+	int32 z;					//
 	Location() {
 		x = y = z = 0;
 	}
@@ -232,7 +232,7 @@
 class CommonObjectData {
 public:
 //constant
-	bool disabled;					// disabled in init section 
+	bool disabled;					// disabled in init section
 	int32 index;					// index in local array
 	uint16 id;						// object id
 	int32 scriptEntrypointNumber;	// script entrypoint number
@@ -276,12 +276,12 @@
 
 typedef SortedList<CommonObjectDataPointer> CommonObjectOrderList;
 
-class ObjectData: public CommonObjectData {	
+class ObjectData: public CommonObjectData {
 public:
 	//constant
 	uint16 interactBits;
 	ObjectData() {
-		memset(this, 0, sizeof(*this)); 
+		memset(this, 0, sizeof(*this));
 	}
 };
 
@@ -306,7 +306,7 @@
 	int32 actionCycle;
 	uint16 targetObject;
 	const HitZone *lastZone;
-	
+
 	int32 cycleFrameSequence;
 	uint8 cycleDelay;
 	uint8 cycleTimeCount;
@@ -321,7 +321,7 @@
 	uint8 dragonMoveType;
 
 	int32 frameNumber;			// current frame number
-	
+
 	int32 tileDirectionsAlloced;
 	byte *tileDirections;
 
@@ -349,12 +349,12 @@
 		out->writeByte(cycleDelay);
 		out->writeByte(cycleTimeCount);
 		out->writeByte(cycleFlags);
-		out->writeSint16LE(fallVelocity);			
-		out->writeSint16LE(fallAcceleration);			
-		out->writeSint16LE(fallPosition);			
-		out->writeByte(dragonBaseFrame);			
-		out->writeByte(dragonStepCycle);			
-		out->writeByte(dragonMoveType);			
+		out->writeSint16LE(fallVelocity);
+		out->writeSint16LE(fallAcceleration);
+		out->writeSint16LE(fallPosition);
+		out->writeByte(dragonBaseFrame);
+		out->writeByte(dragonStepCycle);
+		out->writeByte(dragonMoveType);
 		out->writeSint32LE(frameNumber);
 
 		out->writeSint32LE(tileDirectionsAlloced);
@@ -391,23 +391,23 @@
 		cycleTimeCount = in->readByte();
 		cycleFlags = in->readByte();
 		if (version > 1) {
-			fallVelocity = in->readSint16LE();			
-			fallAcceleration = in->readSint16LE();			
-			fallPosition = in->readSint16LE();			
+			fallVelocity = in->readSint16LE();
+			fallAcceleration = in->readSint16LE();
+			fallPosition = in->readSint16LE();
 		} else {
 			fallVelocity = fallAcceleration = fallPosition = 0;
 		}
 		if (version > 2) {
-			dragonBaseFrame = in->readByte();			
-			dragonStepCycle = in->readByte();			
-			dragonMoveType = in->readByte();			
+			dragonBaseFrame = in->readByte();
+			dragonStepCycle = in->readByte();
+			dragonMoveType = in->readByte();
 		} else {
 			dragonBaseFrame = dragonStepCycle = dragonMoveType = 0;
 		}
 
 		frameNumber = in->readSint32LE();
 
-		
+
 		setTileDirectionsSize(in->readSint32LE(), true);
 		for (i = 0; i < tileDirectionsAlloced; i++) {
 			tileDirections[i] = in->readByte();
@@ -444,7 +444,7 @@
 			return;
 		}
 		walkStepsAlloced = size;
-		walkStepsPoints = (Point*)realloc(walkStepsPoints, walkStepsAlloced * sizeof(*walkStepsPoints));		
+		walkStepsPoints = (Point*)realloc(walkStepsPoints, walkStepsAlloced * sizeof(*walkStepsPoints));
 	}
 
 	void addWalkStepPoint(const Point &point) {
@@ -453,7 +453,7 @@
 	}
 
 	ActorData() {
-		memset(this, 0, sizeof(*this)); 
+		memset(this, 0, sizeof(*this));
 	}
 	~ActorData() {
 		free(frames);
@@ -480,8 +480,8 @@
 	bool playing;
 	int playingTime;
 
-	SpeechData() { 
-		memset(this, 0, sizeof(*this)); 
+	SpeechData() {
+		memset(this, 0, sizeof(*this));
 	}
 
 	FontEffectFlags getFontFlags(int i) {
@@ -509,14 +509,14 @@
 	int actorIdToIndex(uint16 id) { return (id == ID_PROTAG ) ? 0 : objectIdToIndex(id); }
 	uint16 actorIndexToId(int index) { return (index == 0 ) ? ID_PROTAG : objectIndexToId(kGameObjectActor, index); }
 	ActorData *getActor(uint16 actorId);
-	
+
 // clarification: Obj - means game object, such Hat, Spoon etc,  Object - means Actor,Obj,HitZone,StepZone
 
 	bool validObjId(uint16 id) { return (id >= objectIndexToId(kGameObjectObject, 0)) && (id < objectIndexToId(kGameObjectObject, _objsCount)); }
 	int objIdToIndex(uint16 id) { return objectIdToIndex(id); }
 	uint16 objIndexToId(int index) { return objectIndexToId(kGameObjectObject, index); }
 	ObjectData *getObj(uint16 objId);
-	
+
 	int getObjectScriptEntrypointNumber(uint16 id) {
 		int objectType;
 		objectType = objectTypeId(id);
@@ -545,14 +545,14 @@
 	uint16 hitTest(const Point &testPoint, bool skipProtagonist);
 	void takeExit(uint16 actorId, const HitZone *hitZone);
 	bool actorEndWalk(uint16 actorId, bool recurse);
-	bool actorWalkTo(uint16 actorId, const Location &toLocation);		
+	bool actorWalkTo(uint16 actorId, const Location &toLocation);
 	ActorFrameRange *getActorFrameRange(uint16 actorId, int frameType);
 	void actorFaceTowardsPoint(uint16 actorId, const Location &toLocation);
 	void actorFaceTowardsObject(uint16 actorId, uint16 objectId);
 
 	void realLocation(Location &location, uint16 objectId, uint16 walkFlags);
 
-//	speech 
+//	speech
 	void actorSpeech(uint16 actorId, const char **strings, int stringsCount, int sampleResourceId, int speechFlags);
 	void nonActorSpeech(const Common::Rect &box, const char **strings, int stringsCount, int sampleResourceId, int speechFlags);
 	void simulSpeech(const char *string, uint16 *actorIds, int actorIdsCount, int speechFlags, int sampleResourceId);
@@ -571,7 +571,7 @@
 
 	void setProtagState(int state);
 	int getProtagState() { return _protagState; }
-	
+
 private:
 	bool loadActorResources(ActorData *actor);
 	void stepZoneAction(ActorData *actor, const HitZone *hitZone, bool exit, bool stopped);
@@ -588,7 +588,7 @@
 		return !((testPoint.x < 0) || (testPoint.x >= _xCellCount) ||
 			(testPoint.y < 0) || (testPoint.y >= _yCellCount));
 	}
-	void setPathCell(const Point &testPoint, int8 value) {		
+	void setPathCell(const Point &testPoint, int8 value) {
 		if (!validPathCellPoint(testPoint)) {
 			error("Actor::setPathCell wrong point");
 		}
@@ -610,8 +610,8 @@
 	void removePathPoints();
 	bool validFollowerLocation(const Location &location);
 	void moveDragon(ActorData *actor);
-	
-	
+
+
 protected:
 //constants
 	int _actorsCount;
@@ -671,7 +671,7 @@
 		if (_pathListIndex >= _pathListAlloced) {
 			_pathListAlloced += 100;
 			_pathList = (Point*) realloc(_pathList, _pathListAlloced * sizeof(*_pathList));
-			
+
 		}
 		_pathList[_pathListIndex] = point;
 	}

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- animation.h	25 Jul 2005 16:22:32 -0000	1.28
+++ animation.h	30 Jul 2005 21:11:21 -0000	1.29
@@ -75,7 +75,7 @@
 
 	uint16 completed;
 	uint16 cycles;
-	
+
 	int frameTime;
 
 	AnimationState state;
@@ -83,7 +83,7 @@
 	uint16 flags;
 
 	AnimationData(const byte *animResourceData, size_t animResourceLength) {
-		memset(this, 0, sizeof(*this)); 
+		memset(this, 0, sizeof(*this));
 		resourceLength = animResourceLength;
 		resourceData = (byte*)malloc(animResourceLength);
 		memcpy(resourceData, animResourceData, animResourceLength);

Index: console.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/console.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- console.h	19 Jul 2005 19:05:42 -0000	1.15
+++ console.h	30 Jul 2005 21:11:21 -0000	1.16
@@ -50,7 +50,7 @@
 	bool cmdSceneChange(int argc, const char **argv);
 	bool cmdActionMapInfo(int argc, const char **argv);
 	bool cmdObjectMapInfo(int argc, const char **argv);
-	
+
 
 private:
 	SagaEngine *_vm;

Index: events.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- events.h	4 Jun 2005 15:02:17 -0000	1.19
+++ events.h	30 Jul 2005 21:11:21 -0000	1.20
@@ -117,7 +117,7 @@
 
 struct EVENT {
 	unsigned int type;
-	unsigned int code; // Event operation category & flags 
+	unsigned int code; // Event operation category & flags
 	int op;            // Event operation
 	long param;        // Optional event parameter
 	long param2;
@@ -132,7 +132,7 @@
 
 	EVENT *chain;    // Event chain (For consecutive events)
 	EVENT() {
-		memset(this, 0, sizeof(*this)); 
+		memset(this, 0, sizeof(*this));
 	}
 };
 

Index: font.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/font.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- font.h	19 Jul 2005 19:05:42 -0000	1.15
+++ font.h	30 Jul 2005 21:11:21 -0000	1.16
@@ -33,14 +33,14 @@
 
 #define FONT_SHOWUNDEFINED 1	// Define to draw undefined characters * as ?'s
 
-// The first defined character (!) is the only one that may 
+// The first defined character (!) is the only one that may
 // have a valid offset of '0'
 #define FONT_FIRSTCHAR 33
 
 #define FONT_CH_SPACE 32
 #define FONT_CH_QMARK 63
 
-// Minimum font header size without font data 
+// Minimum font header size without font data
 // (6 + 512 + 256 + 256 + 256 )
 #define FONT_DESCSIZE 1286
 
@@ -64,7 +64,7 @@
 	FontId fontId;
 	const char *text;
 	TextListEntry() {
-		memset(this, 0, sizeof(*this)); 
+		memset(this, 0, sizeof(*this));
 	}
 };
 
@@ -112,7 +112,7 @@
 
 	void textDraw(FontId fontId, Surface *ds, const char *string, const Common::Point &point, int color, int effectColor, FontEffectFlags flags);
 	void textDrawRect(FontId fontId, Surface *ds, const char *text, const Common::Rect &rect, int color, int effectColor, FontEffectFlags flags);
-	
+
 	void validate(FontId fontId) {
 		if ((fontId < 0) || (fontId >= _loadedFonts)) {
 			error("Font::validate: Invalid font id.");

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- gfx.h	19 Jul 2005 19:05:43 -0000	1.35
+++ gfx.h	30 Jul 2005 21:11:21 -0000	1.36
@@ -89,7 +89,7 @@
 };
 
 struct Surface : Graphics::Surface {
-	
+
 	void transitionDissolve(const byte *sourceBuffer, const Common::Rect &sourceRect, int flags, double percent);
 	void drawPalette();
 	void drawPolyLine(const Point *points, int count, int color);
@@ -110,7 +110,7 @@
 
 		if (rect.isValidRect()) {
 			fillRect(rect, color);
-		}		
+		}
 	}
 };
 

Index: interface.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- interface.h	29 Jul 2005 16:37:06 -0000	1.66
+++ interface.h	30 Jul 2005 21:11:21 -0000	1.67
@@ -86,12 +86,12 @@
 	size_t imageLength;
 	int imageWidth;
 	int imageHeight;
-	
+
 	PanelButton *currentButton;
 	int buttonsCount;
 	PanelButton *buttons;
 	SpriteList sprites;
-	
+
 	InterfacePanel() {
 		x = y = 0;
 		image = NULL;
@@ -108,14 +108,14 @@
 		}
 		return NULL;
 	}
-	
+
 	void getRect(Rect &rect) {
 		rect.left = x;
 		rect.top = y;
 		rect.setWidth(imageWidth);
 		rect.setHeight(imageHeight);
 	}
- 
+
 	void calcPanelButtonRect(const PanelButton* panelButton, Rect &rect) {
 		rect.left = x + panelButton->xOffset;
 		rect.right = rect.left + panelButton->width;
@@ -232,7 +232,7 @@
 	void processKeyUp(uint16 ascii);
 
 	bool _textInput;
-	
+
 	bool _statusTextInput;
 	StatusTextInputState _statusTextInputState;
 	char _statusTextInputString[STATUS_TEXT_INPUT_MAX];
@@ -266,7 +266,7 @@
 		}
 		return _inventory[cell];
 	}
-	
+
 	PanelButton *inventoryHitTest(const Point& mousePoint) {
 		return _mainPanel.hitTest(mousePoint, kPanelButtonInventory);
 	}
@@ -358,7 +358,7 @@
 		}
 		return _verbTypeToPanelButton[verb];
 	}
-	
+
 	void validateOptionButtons() {
 		if (!_vm->isSaveListFull() && (_optionSaveFileTitleNumber == 0) && (_optionPanel.currentButton != NULL)) {
 			if (_optionPanel.currentButton->id == kTextLoad) {
@@ -406,7 +406,7 @@
 	int _statusOnceColor;
 	int _leftPortrait;
 	int _rightPortrait;
-	
+
 	Point _lastMousePoint;
 
 	uint16 *_inventory;
@@ -431,7 +431,7 @@
 	Rect _optionSaveRectTop;
 	Rect _optionSaveRectSlider;
 	Rect _optionSaveRectBottom;
-	
+
 	char _textInputString[SAVE_TITLE_SIZE];
 	uint _textInputStringLength;
 	uint _textInputPos;

Index: isomap.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/isomap.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- isomap.h	9 Jul 2005 16:23:44 -0000	1.24
+++ isomap.h	30 Jul 2005 21:11:21 -0000	1.25
@@ -112,7 +112,7 @@
 };
 
 struct TilePlatformData {
-	int16 metaTile;	
+	int16 metaTile;
 	int16 height;
 	int16 highestPixel;
 	byte vBits;
@@ -180,8 +180,8 @@
 	void drawTiles(Surface *ds, const Location *location);
 	void drawMetaTile(Surface *ds, uint16 metaTileIndex, const Point &point, int16 absU, int16 absV);
 	void drawSpriteMetaTile(Surface *ds, uint16 metaTileIndex, const Point &point, Location &location, int16 absU, int16 absV);
-	void drawPlatform(Surface *ds, uint16 platformIndex, const Point &point, int16 absU, int16 absV, int16 absH);	
-	void drawSpritePlatform(Surface *ds, uint16 platformIndex, const Point &point, const Location &location, int16 absU, int16 absV, int16 absH);	
+	void drawPlatform(Surface *ds, uint16 platformIndex, const Point &point, int16 absU, int16 absV, int16 absH);
+	void drawSpritePlatform(Surface *ds, uint16 platformIndex, const Point &point, const Location &location, int16 absU, int16 absV, int16 absH);
 	void drawTile(Surface *ds, uint16 tileIndex, const Point &point, const Location *location);
 	int16 smoothSlide(int16 value, int16 min, int16 max) {
 		if (value < min) {
@@ -200,7 +200,7 @@
 			}
 		}
 		return value;
-	}	
+	}
 	int16 findMulti(int16 tileIndex, int16 absU, int16 absV, int16 absH);
 	void pushPoint(int16 u, int16 v, uint16 cost, uint16 direction);
 	void pushDragonPoint(int16 u, int16 v, uint16 direction);
@@ -210,7 +210,7 @@
 
 
 	byte *_tileData;
-	size_t _tileDataLength;	
+	size_t _tileDataLength;
 	uint16 _tilesCount;
 	IsoTileData *_tilesTable;
 
@@ -218,14 +218,14 @@
 	TilePlatformData *_tilePlatformList;
 	uint16 _metaTilesCount;
 	MetaTileData *_metaTileList;
-	
+
 	uint16 _multiCount;
 	MultiTileEntryData *_multiTable;
 	uint16 _multiDataCount;
 	int16 *_multiTableData;
 
 	TileMapData _tileMap;
-	
+
 	Point _mapPosition;
 
 // path finding stuff
@@ -273,7 +273,7 @@
 			return &cell[u][v];
 		}
 	};
-	
+
 	int16 _queueCount;
 	int16 _readCount;
 	SearchArray _searchArray;

Index: list.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/list.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- list.h	9 Jul 2005 23:07:46 -0000	1.10
+++ list.h	30 Jul 2005 21:11:21 -0000	1.11
@@ -84,17 +84,17 @@
 	}
 
 	iterator reorderUp(iterator pos, CompareFunction compareFunction) {
-		iterator i(pos);		
+		iterator i(pos);
 		int res;
 
-		--i;		
+		--i;
 		while (i != Common::List<T>::end()) {
 			res = compareFunction(i.operator*(), pos.operator*());
 			if (res <= 0) {
 
 				T temp(*pos);
 				erase(pos);
-				++i;				
+				++i;
 				return insert(i, temp);
 			}
 			--i;
@@ -103,9 +103,9 @@
 	}
 
 	iterator reorderDown(iterator pos, CompareFunction compareFunction) {
-		iterator i(pos);		
+		iterator i(pos);
 		int res;
-		
+
 		++i;
 		while (i != Common::List<T>::end()) {
 			res = compareFunction(i.operator*(), pos.operator*());

Index: objectmap.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/objectmap.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- objectmap.h	19 Jul 2005 19:05:46 -0000	1.23
+++ objectmap.h	30 Jul 2005 21:11:21 -0000	1.24
@@ -41,7 +41,7 @@
 public:
 	HitZone(MemoryReadStreamEndian *readStream, int index);
 	~HitZone();
-	
+
 	int getNameIndex() const {
 		return _nameIndex;
 	}
@@ -76,11 +76,11 @@
 		return objectIndexToId(kGameObjectStepZone, _index);
 	}
 	bool getSpecialPoint(Point &specialPoint) const;
-	void draw(SagaEngine *vm, Surface *ds, int color);	
+	void draw(SagaEngine *vm, Surface *ds, int color);
 	bool hitTest(const Point &testPoint);
 
 private:
-	int _flags;				// Saga::HitZoneFlags 
+	int _flags;				// Saga::HitZoneFlags
 	int _clickAreasCount;
 	int _rightButtonVerb;
 	int _nameIndex;

Index: puzzle.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/puzzle.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- puzzle.h	15 Jul 2005 15:23:19 -0000	1.5
+++ puzzle.h	30 Jul 2005 21:11:21 -0000	1.6
@@ -77,7 +77,7 @@
 	void movePiece(Point mousePt);
 
 private:
-	void initPieceInfo(int i, int16 curX, int16 curY, byte offX, byte offY, int16 trgX, 
+	void initPieceInfo(int i, int16 curX, int16 curY, byte offX, byte offY, int16 trgX,
 					   int16 trgY, uint8 flag, uint8 count, Point point0, Point point1,
 					   Point point2, Point point3, Point point4, Point point5);
 

Index: rscfile.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- rscfile.h	30 Jul 2005 17:28:58 -0000	1.14
+++ rscfile.h	30 Jul 2005 21:11:21 -0000	1.15
@@ -40,7 +40,7 @@
 	bool _deletePatchFile;
 	Common::File *_patchFile;
 	GamePatchDescription *_patchDescription;
-	
+
 	PatchData(GamePatchDescription *patchDescription): _patchDescription(patchDescription), _deletePatchFile(true) {
 		_patchFile = new Common::File();
 	}
@@ -131,7 +131,7 @@
 	SagaEngine *_vm;
 	ResourceContext *_contexts;
 	int _contextsCount;
-	
+
 	bool loadContext(ResourceContext *context);
 
 };

Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- saga.h	30 Jul 2005 14:41:25 -0000	1.112
+++ saga.h	30 Jul 2005 21:11:21 -0000	1.113
@@ -102,7 +102,7 @@
 
 enum ScriptTimings {
 	kScriptTimeTicksPerSecond = (728L/10L),
-	kRepeatSpeedTicks = (728L/10L)/3,   
+	kRepeatSpeedTicks = (728L/10L)/3,
 	kNormalFadeDuration = 320, // 64 steps, 5 msec each
 	kQuickFadeDuration = 64,  // 64 steps, 1 msec each
 	kPuzzleHintTime = 30000000L  // 30 secs. used in timer
@@ -128,9 +128,9 @@
 	//	in the specified direction, and the actual specified effect of
 	//	the zone will be delayed until the actor leaves the zone.
 	kHitZoneAutoWalk = (1 << 2),
-	
+
 	//      When set on a hit zone, this causes the character not to walk
-	//      to the object (but they will look at it).	
+	//      to the object (but they will look at it).
 	kHitZoneNoWalk = (1 << 2),
 
 	//	zone activates only when character stops walking
@@ -148,7 +148,7 @@
 	kPanelButtonArrow = 2,
 	kPanelButtonConverseText = 4,
 	kPanelButtonInventory = 8,
-	
+
 	kPanelButtonOption = 0x10,
 	kPanelButtonOptionSlider = 0x20,
 	kPanelButtonOptionSaveFiles = 0x40,
@@ -296,7 +296,7 @@
 	kSoundPCM = 0,
 	kSoundVOX = 1,
 	kSoundVOC = 2,
-	kSoundWAV = 3	
+	kSoundWAV = 3
 };
 
 enum GameFeatures {
@@ -378,7 +378,7 @@
 struct GameDisplayInfo {
 	int logicalWidth;
 	int logicalHeight;
-	
+
 	int pathStartY;
 	int sceneHeight;
 
@@ -389,7 +389,7 @@
 	int statusTextY;
 	int statusTextColor;
 	int statusBGColor;
-	
+
 	int saveReminderXOffset;
 	int saveReminderYOffset;
 	int saveReminderWidth;
@@ -547,7 +547,7 @@
 	}
 	void fillSaveList();
 	char *calcSaveFileName(uint slotNumber);
-	
+
 	SaveFileData *getSaveFile(uint idx);
 	uint getSaveSlotNumber(uint idx);
 	uint getNewSaveSlotNumber();
@@ -562,7 +562,7 @@
 	int _soundEnabled;
 	int _musicEnabled;
 
-	
+
 	SndRes *_sndRes;
 	Sound *_sound;
 	Music *_music;
@@ -619,7 +619,7 @@
 
  private:
 	Common::String _targetName;
-	
+
 	uint _saveFilesMaxCount;
 	uint _saveFilesCount;
 	SaveFileData _saveFiles[MAX_SAVES];
@@ -654,7 +654,7 @@
 	const GameSoundInfo *getSfxInfo() const { return _gameDescription->sfxInfo; }
 	const GameSoundInfo *getMusicInfo() const { return _gameDescription->musicInfo; }
 
-	const GameFontDescription *getFontDescription(int index) { 
+	const GameFontDescription *getFontDescription(int index) {
 		assert(index < _gameDescription->fontsCount);
 		return &_gameDescription->fontDescriptions[index];
 	}
@@ -670,9 +670,9 @@
 	const Common::Rect &getDisplayClip() const { return _displayClip;}
 	int getDisplayWidth() const { return _gameDisplayInfo.logicalWidth; }
 	int getDisplayHeight() const { return _gameDisplayInfo.logicalHeight;}
-	int getSceneHeight() const { return _gameDisplayInfo.sceneHeight; }	
+	int getSceneHeight() const { return _gameDisplayInfo.sceneHeight; }
 	const GameDisplayInfo & getDisplayInfo() { return _gameDisplayInfo; }
-	
+
 	const char *getTextString(int textStringId);
 	void getExcuseInfo(int verb, const char *&textString, int &soundResourceId);
 };

Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- scene.h	25 Jul 2005 17:35:35 -0000	1.66
+++ scene.h	30 Jul 2005 21:11:21 -0000	1.67
@@ -270,7 +270,7 @@
 	void loadSceneEntryList(const byte* resourcePointer, size_t resourceLength);
 	void processSceneResources();
 
- 
+
 	SagaEngine *_vm;
 
 	ResourceContext *_sceneContext;

Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- script.h	30 Jul 2005 14:41:25 -0000	1.99
+++ script.h	30 Jul 2005 21:11:21 -0000	1.100
@@ -153,14 +153,14 @@
 	opMul = 0x2E,
 	opDiv = 0x2F,
 	opMod = 0x30,
-//...	
+//...
 	opEq = 0x33,
 	opNe = 0x34,
 	opGt = 0x35,
 	opLt = 0x36,
 	opGe = 0x37,
 	opLe = 0x38,
-//...	
+//...
 	opRsh = 0x3F,
 	opLsh = 0x40,
 	opAnd = 0x41,
@@ -232,7 +232,7 @@
 		voiceLUT.freeMem();
 		free(moduleBase);
 		free(entryPoints);
-		memset(this, 0x0, sizeof(*this)); 
+		memset(this, 0x0, sizeof(*this));
 	}
 };
 
@@ -240,7 +240,7 @@
 public:
 	uint16 *_stackBuf;
 	uint16 _stackSize;					// stack size in uint16
-	
+
 	uint16 _stackTopIndex;
 	uint16 _frameIndex;
 
@@ -249,8 +249,8 @@
 	byte *_moduleBase;					//
 	uint16 _moduleBaseSize;
 
-	byte *_commonBase;					// 
-	byte *_staticBase;					// 
+	byte *_commonBase;					//
+	byte *_staticBase;					//
 	VoiceLUT *_voiceLUT;				//
 	StringsTable *_strings;				//
 
@@ -304,7 +304,7 @@
 		}
 		return (int16)_stackBuf[_stackTopIndex++];
 	}
-	
+
 
 // wait stuff
 	void wait(int waitType) {
@@ -323,7 +323,7 @@
 	}
 
 	ScriptThread() {
-		memset(this, 0xFE, sizeof(*this)); 
+		memset(this, 0xFE, sizeof(*this));
 		_stackBuf = NULL;
 	}
 	~ScriptThread() {
@@ -342,7 +342,7 @@
 
 	Script(SagaEngine *vm);
 	~Script();
-	
+
 	void loadModule(int scriptModuleNumber);
 	void freeModules();
 
@@ -356,7 +356,7 @@
 	void whichObject(const Point& mousePoint);
 	void hitObject(bool leftButton);
 	void playfieldClick(const Point& mousePoint, bool leftButton);
-	
+
 	void setLeftButtonVerb(int verb);
 	int getLeftButtonVerb() const { return _leftButtonVerb; }
 	void setRightButtonVerb(int verb);
@@ -371,12 +371,12 @@
 		_currentObject[0] = _currentObject[0] = ID_NOTHING;
 		setPointerVerb();
 	}
-	
+
 private:
 	SagaEngine *_vm;
 	bool _voiceLUTPresent;
 	ResourceContext *_scriptContext;
-	
+
 	uint16 _modulesLUTEntryLen;
 	ModuleData *_modules;
 	int _modulesCount;
@@ -391,10 +391,10 @@
 	uint _staticSize;
 
 	ScriptThreadList _threadList;
-	
+
 	ScriptThread *_conversingThread;
 
-//verb	
+//verb
 	bool _firstObjectSet;
 	bool _secondObjectNeeded;
 	uint16 _currentObject[2];
@@ -404,10 +404,10 @@
 	int _leftButtonVerb;
 	int _rightButtonVerb;
 
-public:	
+public:
 	uint16 _pendingObject[2];
 	int _pendingVerb;
-	uint16 _pointerObject;	
+	uint16 _pointerObject;
 
 	bool _skipSpeeches;
 	bool _abortEnabled;

Index: sndres.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sndres.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sndres.h	26 Jul 2005 19:40:58 -0000	1.22
+++ sndres.h	30 Jul 2005 21:11:21 -0000	1.23
@@ -44,7 +44,7 @@
 	bool load(ResourceContext *context, uint32 resourceId, SoundBuffer &buffer, bool onlyHeader);
 	bool loadVocSound(byte *soundResource, size_t soundResourceLength, SoundBuffer &buffer);
 	bool loadWavSound(byte *soundResource, size_t soundResourceLength, SoundBuffer &buffer);
-	
+
 	ResourceContext *_sfxContext;
 	ResourceContext *_voiceContext;
 

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sound.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- sound.h	26 Jul 2005 19:40:58 -0000	1.23
+++ sound.h	30 Jul 2005 21:11:21 -0000	1.24
@@ -39,7 +39,7 @@
 	int sampleBits;
 	bool stereo;
 	bool isSigned;
-	
+
 	byte *buffer;
 	size_t size;
 	bool isBigEndian;

Index: sprite.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sprite.h	19 Jul 2005 19:05:52 -0000	1.22
+++ sprite.h	30 Jul 2005 21:11:21 -0000	1.23
@@ -65,11 +65,11 @@
 public:
 	SpriteList _mainSprites;
 
-	
+
 
 	Sprite(SagaEngine *vm);
 	~Sprite(void);
-	
+
 	// draw scaled sprite using background scene mask
 	void drawOccluded(Surface *ds, const Rect &clipRect, SpriteList &spriteList, int spriteNumber, const Point &screenCoord, int scale, int depth);
 
@@ -88,7 +88,7 @@
 private:
 	void decodeRLEBuffer(const byte *inputBuffer, size_t inLength, size_t outLength);
 	void scaleBuffer(const byte *src, int width, int height, int scale);
-	
+
 	SagaEngine *_vm;
 	ResourceContext *_spriteContext;
 	byte *_decodeBuf;

Index: sthread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- sthread.cpp	30 Jul 2005 14:41:25 -0000	1.92
+++ sthread.cpp	30 Jul 2005 21:11:21 -0000	1.93
@@ -139,7 +139,7 @@
 				if (thread->_sleepTime == 0)
 					thread->_flags &= ~kTFlagWaiting;
 				break;
-			
+
 			case kWaitTypeWalk:
 				{
 					ActorData *actor;

More information about the Scummvm-git-logs mailing list