[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.65,1.66 actor.h,1.13,1.14 akos.cpp,1.43,1.44 boxes.cpp,1.12,1.13 bundle.cpp,1.27,1.28 charset.cpp,2.13,2.14 charset.h,2.7,2.8 costume.cpp,1.12,1.13 costume.h,1.7,1.8 debugger.cpp,1.16,1.17 debugrl.cpp,1.1.1.1,1.2 dialogs.cpp,1.36,1.37 dialogs.h,1.14,1.15 gfx.cpp,2.31,2.32 gfx.h,1.20,1.21 imuse.cpp,2.12,2.13 instrument.cpp,2.10,2.11 instrument.h,2.4,2.5 intern.h,2.42,2.43 object.cpp,1.65,1.66 resource.cpp,1.54,1.55 resource_v2.cpp,1.8,1.9 resource_v3.cpp,1.5,1.6 resource_v4.cpp,1.4,1.5 saveload.cpp,1.53,1.54 script.cpp,1.44,1.45 script_v5.cpp,1.13,1.14 script_v6.cpp,1.69,1.70 script_v8.cpp,2.138,2.139 scumm.h,1.153,1.154 scummvm.cpp,2.54,2.55 sound.cpp,1.87,1.88 sound.h,1.26,1.27 string.cpp,1.85,1.86 usage_bits.cpp,1.5,1.6 vars.cpp,1.38,1.39 verbs.cpp,1.22,1.23

Pawel Kolodziejski aquadran at users.sourceforge.net
Thu Mar 6 09:59:30 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv11076

Modified Files:
	actor.cpp actor.h akos.cpp boxes.cpp bundle.cpp charset.cpp 
	charset.h costume.cpp costume.h debugger.cpp debugrl.cpp 
	dialogs.cpp dialogs.h gfx.cpp gfx.h imuse.cpp instrument.cpp 
	instrument.h intern.h object.cpp resource.cpp resource_v2.cpp 
	resource_v3.cpp resource_v4.cpp saveload.cpp script.cpp 
	script_v5.cpp script_v6.cpp script_v8.cpp scumm.h scummvm.cpp 
	sound.cpp sound.h string.cpp usage_bits.cpp vars.cpp verbs.cpp 
Log Message:
and more cleanup

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- actor.cpp	2 Mar 2003 15:51:56 -0000	1.65
+++ actor.cpp	6 Mar 2003 17:57:35 -0000	1.66
@@ -32,8 +32,7 @@
 
 #include <math.h>
 
-void Actor::initActor(int mode)
-{
+void Actor::initActor(int mode) {
 	if (mode == 1) {
 		costume = 0;
 		room = 0;
@@ -91,14 +90,12 @@
 	}
 }
 
-void Actor::stopActorMoving()
-{
+void Actor::stopActorMoving() {
 	_vm->stopScriptNr(walk_script);
 	moving = 0;
 }
 
-void Actor::setActorWalkSpeed(uint newSpeedX, uint newSpeedY)
-{
+void Actor::setActorWalkSpeed(uint newSpeedX, uint newSpeedY) {
 	if (newSpeedX == speedx && newSpeedY == speedy)
 		return;
 
@@ -110,8 +107,7 @@
 	}
 }
 
-int Scumm::getAngleFromPos(int x, int y)
-{
+int Scumm::getAngleFromPos(int x, int y) {
 	if (_gameId == GID_DIG || _gameId == GID_CMI) {
 		double temp = atan2((double)x, (double)-y);
 		return normalizeAngle((int)(temp * 180 / 3.1415926535));
@@ -128,8 +124,7 @@
 	}
 }
 
-int Actor::calcMovementFactor(int newX, int newY)
-{
+int Actor::calcMovementFactor(int newX, int newY) {
 	int actorX, actorY;
 	int diffX, diffY;
 	int32 XYFactor, YXFactor;
@@ -181,8 +176,7 @@
 	return actorWalkStep();
 }
 
-int Actor::remapDirection(int dir, bool is_walking)
-{
+int Actor::remapDirection(int dir, bool is_walking) {
 	int specdir;
 	byte flags;
 	bool flipX;
@@ -250,8 +244,7 @@
 	return normalizeAngle(dir) | 1024;
 }
 
-int Actor::updateActorDirection(bool is_walking)
-{
+int Actor::updateActorDirection(bool is_walking) {
 	int from, to;
 	int diff;
 	int dirType;
@@ -290,16 +283,12 @@
 	return dir;
 }
 
-void Actor::setBox(int box)
-{
+void Actor::setBox(int box) {
 	walkbox = box;
-
 	setupActorScale();
 }
 
-
-int Actor::actorWalkStep()
-{
+int Actor::actorWalkStep() {
 	int tmpX, tmpY;
 	int actorX, actorY;
 	int distX, distY;
@@ -353,8 +342,7 @@
 }
 
 
-void Actor::setupActorScale()
-{
+void Actor::setupActorScale() {
 	uint16 scale;
 
 	if (_vm->_features & GF_NO_SCALLING) {
@@ -408,8 +396,7 @@
 	scaley = (byte)scale;
 }
 
-void Actor::startAnimActor(int f)
-{
+void Actor::startAnimActor(int f) {
 	if (_vm->_features & GF_NEW_COSTUMES) {
 		switch (f) {
 		case 1001:
@@ -482,8 +469,7 @@
 	}
 }
 
-void Actor::animateActor(int anim)
-{
+void Actor::animateActor(int anim) {
 	int cmd, dir;
 
 	if (_vm->_features & GF_NEW_COSTUMES) {
@@ -521,8 +507,7 @@
 	}
 }
 
-void Actor::setDirection(int direction)
-{
+void Actor::setDirection(int direction) {
 	uint aMask;
 	int i;
 	uint16 vald;
@@ -550,8 +535,7 @@
 	needBgReset = true;
 }
 
-void Actor::putActor(int dstX, int dstY, byte newRoom)
-{
+void Actor::putActor(int dstX, int dstY, byte newRoom) {
 	if (visible && _vm->_currentRoom != newRoom && _vm->_vars[_vm->VAR_TALK_ACTOR] == number) {
 		_vm->clearMsgQueue();
 	}
@@ -582,8 +566,7 @@
 	}
 }
 
-int Actor::getActorXYPos(int &xPos, int &yPos)
-{
+int Actor::getActorXYPos(int &xPos, int &yPos) {
 	if (!isInCurrentRoom())
 		return -1;
 
@@ -592,8 +575,7 @@
 	return 0;
 }
 
-AdjustBoxResult Actor::adjustXYToBeInBox(int dstX, int dstY, int pathfrom)
-{
+AdjustBoxResult Actor::adjustXYToBeInBox(int dstX, int dstY, int pathfrom) {
 	AdjustBoxResult abr, tmp;
 	uint threshold;
 	uint best;
@@ -691,8 +673,7 @@
 	return abr;
 }
 
-void Actor::adjustActorPos()
-{
+void Actor::adjustActorPos() {
 	AdjustBoxResult abr;
 	byte flags;
 
@@ -719,8 +700,7 @@
 	}
 }
 
-void Actor::factToObject(int obj)
-{
+void Actor::factToObject(int obj) {
 	int x2, y2, dir;
 	
 	if (!isInCurrentRoom())
@@ -733,8 +713,7 @@
 	turnToDirection(dir);
 }
 
-void Actor::turnToDirection(int newdir)
-{
+void Actor::turnToDirection(int newdir) {
 	if (newdir == -1)
 		return;
 
@@ -746,8 +725,7 @@
 	}
 }
 
-void Actor::hideActor()
-{
+void Actor::hideActor() {
 	if (!visible)
 		return;
 
@@ -761,8 +739,7 @@
 	needBgReset = true;
 }
 
-void Actor::showActor()
-{
+void Actor::showActor() {
 	if (_vm->_currentRoom == 0 || visible)
 		return;
 
@@ -779,8 +756,7 @@
 	needRedraw = true;
 }
 
-void Scumm::showActors()
-{
+void Scumm::showActors() {
 	int i;
 	Actor *a;
 
@@ -791,8 +767,7 @@
 	}
 }
 
-void Scumm::stopTalk()
-{
+void Scumm::stopTalk() {
 	int act;
 
 	_sound->stopTalkSound();
@@ -813,14 +788,12 @@
 	restoreCharsetBg();
 }
 
-void Scumm::clearMsgQueue()
-{
+void Scumm::clearMsgQueue() {
 	_messagePtr = (byte *)" ";
 	stopTalk();
 }
 
-void Scumm::walkActors()
-{
+void Scumm::walkActors() {
 	int i;
 	Actor *a;
 
@@ -835,8 +808,7 @@
 }
 
 /* Used in Scumm v5 only. Play sounds associated with actors */
-void Scumm::playActorSounds()
-{
+void Scumm::playActorSounds() {
 	int i;
 	Actor *a;
 
@@ -857,13 +829,12 @@
 
 #define DRAW_ORDER(x)	((x)->y - ((x)->layer << 11))
 
-void Scumm::processActors()
-{
+void Scumm::processActors() {
 	int i;
 	Actor **actors, *a, **ac, **ac2, *tmp, **end;
 	int numactors = 0;
 
-	actors = new Actor*[NUM_ACTORS];
+	actors = new Actor * [NUM_ACTORS];
 	
 	// Make a list of all actors in this room
 	for (i = 1; i < NUM_ACTORS; i++) {
@@ -907,8 +878,7 @@
 
 // Used in Scumm v8, to allow the verb coin to be drawn over the inventory
 // chest. I'm assuming that draw order won't matter here.
-void Scumm::processUpperActors()
-{
+void Scumm::processUpperActors() {
 	Actor *a;
 	int i;
 
@@ -922,8 +892,7 @@
 	}
 }
 
-void Actor::drawActorCostume()
-{
+void Actor::drawActorCostume() {
 	if (!needRedraw)
 		return;
 
@@ -1054,8 +1023,7 @@
 	}
 }
 
-void Actor::animateCostume()
-{
+void Actor::animateCostume() {
 	if (costume == 0)
 		return;
 
@@ -1081,8 +1049,7 @@
 	}
 }
 
-void Actor::animateLimb(int limb, int f)
-{
+void Actor::animateLimb(int limb, int f) {
 	// This methods is very similiar to animateCostume(). 
 	// However, instead of animating *all* the limbs, it only animates
 	// the specified limb to be at the frame specified by "f". 
@@ -1117,9 +1084,7 @@
 	}
 }
 
-
-void Scumm::setActorRedrawFlags(bool fg, bool bg)
-{
+void Scumm::setActorRedrawFlags(bool fg, bool bg) {
 	int i, j;
 
 	if (_fullRedraw) {
@@ -1149,8 +1114,7 @@
 	}
 }
 
-int Scumm::getActorFromPos(int x, int y)
-{
+int Scumm::getActorFromPos(int x, int y) {
 	int i;
 
 	if (!testGfxAnyUsageBits(x >> 3))
@@ -1165,8 +1129,7 @@
 	return 0;
 }
 
-void Scumm::actorTalk()
-{
+void Scumm::actorTalk() {
 	int oldact;
 	Actor *a;
 
@@ -1210,8 +1173,7 @@
 	CHARSET_1();
 }
 
-void Actor::setActorCostume(int c)
-{
+void Actor::setActorCostume(int c) {
 	int i;
 
 	costumeNeedsInit = true;
@@ -1236,8 +1198,7 @@
 
 }
 
-void Actor::startWalkActor(int destX, int destY, int dir)
-{
+void Actor::startWalkActor(int destX, int destY, int dir) {
 	AdjustBoxResult abr;
 
 	abr = adjustXYToBeInBox(destX, destY, walkbox);
@@ -1284,8 +1245,7 @@
 	walkdata.curbox = walkbox;
 }
 
-void Actor::startWalkAnim(int cmd, int angle)
-{
+void Actor::startWalkAnim(int cmd, int angle) {
 	if (angle == -1)
 		angle = facing;
 
@@ -1321,8 +1281,7 @@
 	}
 }
 
-void Actor::walkActor()
-{
+void Actor::walkActor() {
 	int j;
 	int16 foundPathX, foundPathY;
 
@@ -1382,8 +1341,7 @@
 	calcMovementFactor(walkdata.destx, walkdata.desty);
 }
 
-void Actor::walkActorOld()
-{
+void Actor::walkActorOld() {
 	ScummPoint gateLoc[5];	// Gate locations
 	int new_dir, next_box;
 
@@ -1475,16 +1433,14 @@
 	goto restart;
 }
 
-byte *Actor::getActorName()
-{
+byte *Actor::getActorName() {
 	byte *ptr = _vm->getResourceAddress(rtActorName, number);
 	if (ptr == NULL)
 		return (byte *)" ";
 	return ptr;
 }
 
-void Actor::remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold)
-{
+void Actor::remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold) {
 	byte *akos, *rgbs, *akpl;
 	int akpl_size, i;
 	int r, g, b;
@@ -1558,8 +1514,7 @@
 	}
 }
 
-void Scumm::resetActorBgs()
-{
+void Scumm::resetActorBgs() {
 	Actor *a;
 	int i, j;
 
@@ -1581,8 +1536,7 @@
 	}
 }
 
-void Actor::classChanged(int cls, bool value)
-{
+void Actor::classChanged(int cls, bool value) {
 	switch(cls) {
 	case 20:	// Never clip
 		break;
@@ -1601,7 +1555,6 @@
 	}
 }
 
-bool Actor::isInClass(int cls)
-{
+bool Actor::isInClass(int cls) {
 	return _vm->getClass(number, cls);
 }

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- actor.h	26 Jan 2003 10:54:33 -0000	1.13
+++ actor.h	6 Mar 2003 17:57:36 -0000	1.14
@@ -108,7 +108,7 @@
 public:
 
 	// Constructor, sets all data to 0
-	  Actor() {
+	Actor() {
 		memset(this, 0, sizeof(Actor));
 	} void initActorClass(Scumm *scumm) {
 		_vm = scumm;

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- akos.cpp	3 Mar 2003 00:45:38 -0000	1.43
+++ akos.cpp	6 Mar 2003 17:57:37 -0000	1.44
@@ -99,8 +99,7 @@
 	AKC_EndSeq = 0xC0FF
 };
 
-bool Scumm::akos_hasManyDirections(Actor *a)
-{
+bool Scumm::akos_hasManyDirections(Actor *a) {
 	byte *akos;
 	AkosHeader *akhd;
 
@@ -111,16 +110,14 @@
 	return (akhd->flags & 2) != 0;
 }
 
-int Scumm::akos_frameToAnim(Actor *a, int frame)
-{
+int Scumm::akos_frameToAnim(Actor *a, int frame) {
 	if (akos_hasManyDirections(a))
 		return toSimpleDir(1, a->facing) + frame * 8;
 	else
 		return newDirToOldDir(a->facing) + frame * 4;
 }
 
-void Scumm::akos_decodeData(Actor *a, int frame, uint usemask)
-{
+void Scumm::akos_decodeData(Actor *a, int frame, uint usemask) {
 	uint anim;
 	byte *akos, *r;
 	AkosHeader *akhd;
@@ -195,8 +192,7 @@
 	} while ((uint16)mask);
 }
 
-void AkosRenderer::setPalette(byte *new_palette)
-{
+void AkosRenderer::setPalette(byte *new_palette) {
 	byte *the_akpl;
 	uint size, i;
 
@@ -220,8 +216,7 @@
 	}
 }
 
-void AkosRenderer::setCostume(int costume)
-{
+void AkosRenderer::setCostume(int costume) {
 	akos = _vm->getResourceAddress(rtCostume, costume);
 	assert(akos);
 
@@ -234,15 +229,13 @@
 	codec = READ_LE_UINT16(&akhd->codec);
 }
 
-void AkosRenderer::setFacing(Actor *a)
-{
+void AkosRenderer::setFacing(Actor *a) {
 	_mirror = (newDirToOldDir(a->facing) != 0 || akhd->flags & 1);
 	if (a->flip)
 		_mirror = !_mirror;
 }
 
-byte AkosRenderer::drawLimb(const CostumeData &cost, int limb)
-{
+byte AkosRenderer::drawLimb(const CostumeData &cost, int limb) {
 	uint code;
 	byte *p;
 	AkosOffset *off;
@@ -330,14 +323,12 @@
 	return true;
 }
 
-void AkosRenderer::codec1_genericDecode()
-{
+void AkosRenderer::codec1_genericDecode() {
 	byte *src, *dst;
 	byte len, maskbit;
 	uint y, color, height;
 	const byte *scaleytab, *mask;
 
-
 	y = v1.y;
 
 	len = v1.replen;
@@ -394,15 +385,13 @@
 	} while (1);
 }
 
-void AkosRenderer::codec1_spec1()
-{
+void AkosRenderer::codec1_spec1() {
 	byte *src, *dst;
 	byte len, maskbit;
 	uint y, color, height;
 	byte pcolor;
 	const byte *scaleytab, *mask;
 
-
 	y = v1.y;
 
 	len = v1.replen;
@@ -462,20 +451,17 @@
 	} while (1);
 }
 
-void AkosRenderer::codec1_spec2()
-{
+void AkosRenderer::codec1_spec2() {
 	warning("codec1_spec2"); // TODO
 }
 
-void AkosRenderer::codec1_spec3()
-{
+void AkosRenderer::codec1_spec3() {
 	byte *src, *dst;
 	byte len, maskbit;
 	uint y, color, height;
 	uint pcolor;
 	const byte *scaleytab, *mask;
 
-
 	y = v1.y;
 
 	len = v1.replen;
@@ -639,9 +625,7 @@
 	0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF,
 };
 
-
-void AkosRenderer::codec1()
-{
+void AkosRenderer::codec1() {
 	int num_colors;
 	bool use_scaling;
 	int i, j;
@@ -651,10 +635,8 @@
 	bool masking;
 	int step;
 
-
 	/* implement custom scale table */
 
-
 	v1.scaletable = default_scale_table;
 
 	// FIXME - which value for VAR_CUSTOMSCALETABLE in V8 ?
@@ -785,7 +767,7 @@
 	if (_mirror)
 		v1.scaleXstep = -v1.scaleXstep;
 
-	if ((int) y_top >= (int) outheight || y_bottom <= 0)
+	if ((int) y_top >= (int)outheight || y_bottom <= 0)
 		return;
 
 	if ((int)x_left >= (int)outwidth || x_right <= 0)
@@ -852,8 +834,8 @@
 	masking = false;
 	if (_zbuf) {
 		masking = _vm->isMaskActiveAt(x_left, y_top, x_right, y_bottom,
-		                _vm->getResourceAddress(rtBuffer, 9) +
-		                _vm->gdi._imgBufOffs[_zbuf] + _vm->_screenStartStrip) != 0;
+										_vm->getResourceAddress(rtBuffer, 9) +
+										_vm->gdi._imgBufOffs[_zbuf] + _vm->_screenStartStrip) != 0;
 	}
 
 	v1.mask_ptr = NULL;
@@ -884,8 +866,7 @@
 }
 
 
-void AkosRenderer::codec1_ignorePakCols(int num)
-{
+void AkosRenderer::codec1_ignorePakCols(int num) {
 	int n;
 	byte repcolor;
 	byte replen;
@@ -1003,7 +984,7 @@
 	akos16.dataptr = src + 4;
 }
 
-void AkosRenderer::akos16PutOnScreen(byte * dest, byte * src, byte transparency, int32 count) {
+void AkosRenderer::akos16PutOnScreen(byte *dest, byte *src, byte transparency, int32 count) {
 	byte tmp_data;
 
 	if (count == 0)
@@ -1083,7 +1064,7 @@
 				} else {
 					AKOS16_FILL_BITS()
 					akos16.color = ((byte)akos16.bits) & akos16.mask;
-					AKOS16_EAT_BITS(akos16.shift)					
+					AKOS16_EAT_BITS(akos16.shift)
 					AKOS16_FILL_BITS()
 				}
 			} else {
@@ -1140,14 +1121,14 @@
 	}
 }
 
-void AkosRenderer::akos16ApplyMask(byte * dest, byte * maskptr, byte bits, int32 count, byte fillwith) {
+void AkosRenderer::akos16ApplyMask(byte *dest, byte *maskptr, byte bits, int32 count, byte fillwith) {
 	byte tmp;
 	byte tmp_data = *(maskptr++);
 	byte bitpos = 1 << (7 - bits);
 
 	if (count == 0)
 		return;
-	
+
 	for(;;) {
 		tmp = tmp_data;
 		do {
@@ -1165,8 +1146,8 @@
 	}
 }
 
-void AkosRenderer::akos16Decompress(byte * dest, int32 pitch, byte * src, int32 t_width, int32 t_height, int32 dir, int32 numskip_before, int32 numskip_after, byte transparency) {
-	byte * tmp_buf = akos16.buffer;
+void AkosRenderer::akos16Decompress(byte *dest, int32 pitch, byte *src, int32 t_width, int32 t_height, int32 dir, int32 numskip_before, int32 numskip_after, byte transparency) {
+	byte *tmp_buf = akos16.buffer;
 
 	if (dir < 0) {
 		dest -= (t_width - 1);
@@ -1192,8 +1173,8 @@
 	}
 }
 
-void AkosRenderer::akos16DecompressMask(byte * dest, int32 pitch, byte * src, int32 t_width, int32 t_height, int32 dir, int32 numskip_before, int32 numskip_after, byte transparency, byte * maskptr, int32 bitpos_start) {
-	byte * tmp_buf = akos16.buffer;
+void AkosRenderer::akos16DecompressMask(byte *dest, int32 pitch, byte *src, int32 t_width, int32 t_height, int32 dir, int32 numskip_before, int32 numskip_after, byte transparency, byte * maskptr, int32 bitpos_start) {
+	byte *tmp_buf = akos16.buffer;
 	int maskpitch;
 
 	if (dir < 0) {
@@ -1334,20 +1315,19 @@
 	int32 numskip_before = skip_x + (skip_y * _width);
 	int32 numskip_after = _width - cur_x;
 
-	byte * dest = outptr + width_unk + height_unk * _vm->_realWidth;
+	byte *dest = outptr + width_unk + height_unk * _vm->_realWidth;
 
 	if (_zbuf == 0) {
 		akos16Decompress(dest, pitch, srcptr, cur_x, out_height, dir, numskip_before, numskip_after, 255);
 		return;
 	}
 
-	byte * ptr = _vm->_screenStartStrip + _vm->getResourceAddress(rtBuffer, 9) + _vm->gdi._imgBufOffs[_zbuf];
+	byte *ptr = _vm->_screenStartStrip + _vm->getResourceAddress(rtBuffer, 9) + _vm->gdi._imgBufOffs[_zbuf];
 	ptr += _numStrips * clip_top + (clip_left / 8);
 	akos16DecompressMask(dest, pitch, srcptr, cur_x, out_height, dir, numskip_before, numskip_after, 255, ptr, clip_left / 8);
 }
 
-bool Scumm::akos_increaseAnims(byte *akos, Actor *a)
-{
+bool Scumm::akos_increaseAnims(byte *akos, Actor *a) {
 	byte *aksq, *akfo;
 	int i;
 	uint size;
@@ -1366,13 +1346,11 @@
 	return result;
 }
 
-
 #define GW(o) ((int16)READ_LE_UINT16(aksq+curpos+(o)))
 #define GUW(o) READ_LE_UINT16(aksq+curpos+(o))
 #define GB(o) aksq[curpos+(o)]
 
-bool Scumm::akos_increaseAnim(Actor *a, int chan, byte *aksq, uint16 *akfo, int numakfo)
-{
+bool Scumm::akos_increaseAnim(Actor *a, int chan, byte *aksq, uint16 *akfo, int numakfo) {
 	byte active;
 	uint old_curpos, curpos, end;
 	uint code;
@@ -1604,8 +1582,7 @@
 	return curpos != old_curpos;
 }
 
-void Scumm::akos_queCommand(byte cmd, Actor *a, int param_1, int param_2)
-{
+void Scumm::akos_queCommand(byte cmd, Actor *a, int param_1, int param_2) {
 	switch (cmd) {
 	case 1:
 		a->putActor(0, 0, 0);
@@ -1657,9 +1634,7 @@
 	}
 }
 
-
-bool Scumm::akos_compare(int a, int b, byte cmd)
-{
+bool Scumm::akos_compare(int a, int b, byte cmd) {
 	switch (cmd) {
 	case 0:
 		return a == b;

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- boxes.cpp	16 Feb 2003 16:54:17 -0000	1.12
+++ boxes.cpp	6 Mar 2003 17:57:39 -0000	1.13
@@ -78,8 +78,7 @@
 PathVertex *unkMatrixProc1(PathVertex *vtx, PathNode *node);
 
 
-byte Scumm::getMaskFromBox(int box)
-{
+byte Scumm::getMaskFromBox(int box) {
 	Box *ptr = getBoxBaseAddr(box);
 	if (!ptr)
 		return 0;
@@ -90,8 +89,7 @@
 		return ptr->old.mask;
 }
 
-void Scumm::setBoxFlags(int box, int val)
-{
+void Scumm::setBoxFlags(int box, int val) {
 	debug(2, "setBoxFlags(%d, 0x%02x)", box, val);
 
 	/* FULL_THROTTLE stuff */
@@ -108,8 +106,7 @@
 	}
 }
 
-byte Scumm::getBoxFlags(int box)
-{
+byte Scumm::getBoxFlags(int box) {
 	Box *ptr = getBoxBaseAddr(box);
 	if (!ptr)
 		return 0;
@@ -119,8 +116,7 @@
 		return ptr->old.flags;
 }
 
-void Scumm::setBoxScale(int box, int scale)
-{
+void Scumm::setBoxScale(int box, int scale) {
 	Box *b = getBoxBaseAddr(box);
 	if (_features & GF_AFTER_V8)
 		b->v8.scale = TO_LE_32(scale);
@@ -128,14 +124,12 @@
 		b->old.scale = TO_LE_16(scale);
 }
 
-void Scumm::setBoxScaleSlot(int box, int slot)
-{
+void Scumm::setBoxScaleSlot(int box, int slot) {
 	Box *b = getBoxBaseAddr(box);
 	b->v8.scaleSlot = TO_LE_32(slot);
 }
 
-int Scumm::getScale(int box, int x, int y)
-{
+int Scumm::getScale(int box, int x, int y) {
 	Box *ptr = getBoxBaseAddr(box);
 	assert(ptr);
 
@@ -148,19 +142,19 @@
 
 			if (s.y1 == s.y2 && s.x1 == s.x2)
 				error("Invalid scale slot %d", slot);
-			
+
 			if (s.y1 != s.y2) {
 				if (y < 0)
 					y = 0;
-				
+
 				scaleY = (s.scale2 - s.scale1) * (y - s.y1) / (s.y2 - s.y1) + s.scale1;
 				if (s.x1 == s.x2) {
 					return scaleY;
 				}
 			}
-		
+
 			scaleX = (s.scale2 - s.scale1) * (x - s.x1) / (s.x2 - s.x1) + s.scale1;
-		
+
 			if (s.y1 == s.y2) {
 				return scaleX;
 			} else {
@@ -187,8 +181,7 @@
 	}
 }
 
-int Scumm::getBoxScale(int box)
-{
+int Scumm::getBoxScale(int box) {
 	if (_features & GF_NO_SCALLING)
 		return 255;
 	Box *ptr = getBoxBaseAddr(box);
@@ -200,8 +193,7 @@
 		return FROM_LE_16(ptr->old.scale);
 }
 
-byte Scumm::getNumBoxes()
-{
+byte Scumm::getNumBoxes() {
 	byte *ptr = getResourceAddress(rtMatrix, 2);
 	if (!ptr)
 		return 0;
@@ -211,8 +203,7 @@
 		return ptr[0];
 }
 
-Box *Scumm::getBoxBaseAddr(int box)
-{
+Box *Scumm::getBoxBaseAddr(int box) {
 	byte *ptr = getResourceAddress(rtMatrix, 2);
 	if (!ptr)
 		return NULL;
@@ -228,8 +219,7 @@
 		return (Box *)(ptr + box * SIZEOF_BOX + 2);
 }
 
-int Scumm::getSpecialBox(int x, int y)
-{
+int Scumm::getSpecialBox(int x, int y) {
 	int i;
 	int numOfBoxes;
 	byte flag;
@@ -249,8 +239,7 @@
 	return (-1);
 }
 
-bool Scumm::checkXYInBoxBounds(int b, int x, int y)
-{
+bool Scumm::checkXYInBoxBounds(int b, int x, int y) {
 	BoxCoords box;
 
 	if (b == 0 && (!(_features & GF_SMALL_HEADER)))
@@ -294,8 +283,7 @@
 	return true;
 }
 
-void Scumm::getBoxCoordinates(int boxnum, BoxCoords *box)
-{
+void Scumm::getBoxCoordinates(int boxnum, BoxCoords *box) {
 	Box *bp = getBoxBaseAddr(boxnum);
 
 	if (_features & GF_AFTER_V8) {
@@ -343,8 +331,7 @@
 	}
 }
 
-uint Scumm::distanceFromPt(int x, int y, int ptx, int pty)
-{
+uint Scumm::distanceFromPt(int x, int y, int ptx, int pty) {
 	int diffx, diffy;
 
 	diffx = abs(ptx - x);
@@ -361,8 +348,7 @@
 	return diffx + diffy;
 }
 
-ScummPoint Scumm::closestPtOnLine(int ulx, int uly, int llx, int lly, int x, int y)
-{
+ScummPoint Scumm::closestPtOnLine(int ulx, int uly, int llx, int lly, int x, int y) {
 	int lydiff, lxdiff;
 	int32 dist, a, b, c;
 	int x2, y2;
@@ -441,8 +427,7 @@
 	return pt;
 }
 
-bool Scumm::inBoxQuickReject(int b, int x, int y, int threshold)
-{
+bool Scumm::inBoxQuickReject(int b, int x, int y, int threshold) {
 	int t;
 	BoxCoords box;
 
@@ -470,12 +455,11 @@
 	return true;
 }
 
-AdjustBoxResult Scumm::getClosestPtOnBox(int b, int x, int y)
-{
+AdjustBoxResult Scumm::getClosestPtOnBox(int b, int x, int y) {
 	ScummPoint pt;
 	AdjustBoxResult best;
 	uint dist;
-	uint bestdist = (uint) 0xFFFF;
+	uint bestdist = (uint)0xFFFF;
 	BoxCoords box;
 
 	getBoxCoordinates(b, &box);
@@ -516,8 +500,7 @@
 	return best;
 }
 
-byte *Scumm::getBoxMatrixBaseAddr()
-{
+byte *Scumm::getBoxMatrixBaseAddr() {
 	byte *ptr = getResourceAddress(rtMatrix, 1);
 	if (*ptr == 0xFF)
 		ptr++;
@@ -530,8 +513,7 @@
  * way to 'to' (this can be 'to' itself or a third box).
  * If there is no connection -1 is return.
  */
-int Scumm::getPathToDestBox(byte from, byte to)
-{
+int Scumm::getPathToDestBox(byte from, byte to) {
 	byte *boxm;
 	byte i;
 	int dest = -1;
@@ -561,8 +543,7 @@
  * Computes the next point actor a has to walk towards in a straight
  * line in order to get from box1 to box3 via box2.
  */
-bool Scumm::findPathTowards(Actor *a, byte box1nr, byte box2nr, byte box3nr, int16 &foundPathX, int16 &foundPathY)
-{
+bool Scumm::findPathTowards(Actor *a, byte box1nr, byte box2nr, byte box3nr, int16 &foundPathX, int16 &foundPathY) {
 	BoxCoords box1;
 	BoxCoords box2;
 	ScummPoint tmp;
@@ -695,25 +676,23 @@
 	return false;
 }
 
-void Scumm::createBoxMatrix()
-{
+void Scumm::createBoxMatrix() {
 	int num, i, j;
 	byte flags;
 	int table_1[66], table_2[66];
 	int counter, val;
 	int code;
 
-
 	// A heap (an optiimsation to avoid calling malloc/free extremly often)
 	_maxBoxVertexHeap = 1000;
 	createResource(rtMatrix, 4, _maxBoxVertexHeap);
 	_boxPathVertexHeap = getResourceAddress(rtMatrix, 4);
 	_boxPathVertexHeapIndex = _boxMatrixItem = 0;
-	
+
 	// Temporary 64*65 distance matrix
 	createResource(rtMatrix, 3, 65 * 64);
 	_boxMatrixPtr3 = getResourceAddress(rtMatrix, 3);
-	
+
 	// The result "matrix" in the special format used by Scumm.
 	createResource(rtMatrix, 1, BOX_MATRIX_SIZE);
 	_boxMatrixPtr1 = getResourceAddress(rtMatrix, 1);
@@ -825,8 +804,7 @@
 	nukeResource(rtMatrix, 3);
 }
 
-PathVertex *unkMatrixProc1(PathVertex *vtx, PathNode *node)
-{
+PathVertex *unkMatrixProc1(PathVertex *vtx, PathNode *node) {
 	if (node == NULL || vtx == NULL)
 		return NULL;
 
@@ -848,8 +826,7 @@
 	return NULL;
 }
 
-PathNode *Scumm::unkMatrixProc2(PathVertex *vtx, int i)
-{
+PathNode *Scumm::unkMatrixProc2(PathVertex *vtx, int i) {
 	PathNode *node;
 
 	if (vtx == NULL)
@@ -874,8 +851,7 @@
 
 
 /* Check if two boxes are neighbours */
-bool Scumm::areBoxesNeighbours(int box1nr, int box2nr)
-{
+bool Scumm::areBoxesNeighbours(int box1nr, int box2nr) {
 	int j, k, m, n;
 	int tmp_x, tmp_y;
 	bool result;
@@ -984,15 +960,13 @@
 	return result;
 }
 
-void Scumm::addToBoxMatrix(byte b)
-{
+void Scumm::addToBoxMatrix(byte b) {
 	if (++_boxMatrixItem > BOX_MATRIX_SIZE)
 		error("Box matrix overflow");
 	*_boxMatrixPtr1++ = b;
 }
 
-void *Scumm::addToBoxVertexHeap(int size)
-{
+void *Scumm::addToBoxVertexHeap(int size) {
 	byte *ptr = _boxPathVertexHeap;
 
 	_boxPathVertexHeap += size;
@@ -1004,16 +978,14 @@
 	return ptr;
 }
 
-PathVertex *Scumm::addPathVertex()
-{
+PathVertex *Scumm::addPathVertex() {
 	_boxPathVertexHeap = getResourceAddress(rtMatrix, 4);
 	_boxPathVertexHeapIndex = 0;
 
 	return (PathVertex *)addToBoxVertexHeap(sizeof(PathVertex));
 }
 
-void Scumm::findPathTowardsOld(Actor *actor, byte trap1, byte trap2, byte final_trap, ScummPoint gateLoc[5])
-{
+void Scumm::findPathTowardsOld(Actor *actor, byte trap1, byte trap2, byte final_trap, ScummPoint gateLoc[5]) {
 	ScummPoint pt;
 	ScummPoint gateA[2];
 	ScummPoint gateB[2];
@@ -1054,8 +1026,7 @@
 	return;
 }
 
-void Scumm::getGates(int trap1, int trap2, ScummPoint gateA[2], ScummPoint gateB[2])
-{
+void Scumm::getGates(int trap1, int trap2, ScummPoint gateA[2], ScummPoint gateB[2]) {
 	int i, j;
 	int dist[8];
 	int minDist[3];
@@ -1161,7 +1132,6 @@
 	}
 }
 
-bool Scumm::compareSlope(int X1, int Y1, int X2, int Y2, int X3, int Y3)
-{
+bool Scumm::compareSlope(int X1, int Y1, int X2, int Y2, int X3, int Y3) {
 	return (Y2 - Y1) * (X3 - X1) <= (Y3 - Y1) * (X2 - X1);
 }

Index: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- bundle.cpp	25 Jan 2003 20:07:15 -0000	1.27
+++ bundle.cpp	6 Mar 2003 17:57:44 -0000	1.28
@@ -90,8 +90,7 @@
 	0, 0, 1, 3, 7, 15, 31, 63
 };
 
-Bundle::Bundle()
-{
+Bundle::Bundle() {
 	_lastSong = -1;
 	_initializedImcTables = false;
 
@@ -99,16 +98,14 @@
 	_bundleMusicTable = NULL;
 }
 
-Bundle::~Bundle()
-{
+Bundle::~Bundle() {
  if (_bundleVoiceTable)
 	free(_bundleVoiceTable);
  if (_bundleMusicTable)
 	free(_bundleMusicTable);
 }
 
-void Bundle::initializeImcTables()
-{
+void Bundle::initializeImcTables() {
 	if (_initializedImcTables == true)
 		return;
 
@@ -157,8 +154,7 @@
 	_initializedImcTables = true;
 }
 
-bool Bundle::openVoiceFile(const char *filename, const char *directory)
-{
+bool Bundle::openVoiceFile(const char *filename, const char *directory) {
 	int32 tag, offset;
 
 	initializeImcTables();
@@ -200,8 +196,7 @@
 	return true;
 }
 
-bool Bundle::openMusicFile(const char *filename, const char *directory)
-{
+bool Bundle::openMusicFile(const char *filename, const char *directory) {
 	int32 tag, offset;
 
 	initializeImcTables();
@@ -243,8 +238,7 @@
 	return true;
 }
 
-int32 Bundle::decompressVoiceSampleByIndex(int32 index, byte *comp_final)
-{
+int32 Bundle::decompressVoiceSampleByIndex(int32 index, byte *comp_final) {
 	int32 i, tag, num, final_size, output_size;
 	byte *comp_input, *comp_output;
 
@@ -297,8 +291,7 @@
 	return final_size;
 }
 
-int32 Bundle::decompressMusicSampleByIndex(int32 index, int32 number, byte *comp_final)
-{
+int32 Bundle::decompressMusicSampleByIndex(int32 index, int32 number, byte *comp_final) {
 	int32 i = 0;
 	int tag, num, final_size;
 	byte *comp_input;
@@ -346,8 +339,7 @@
 	return final_size;
 }
 
-int32 Bundle::decompressVoiceSampleByName(char *name, byte *comp_final)
-{
+int32 Bundle::decompressVoiceSampleByName(char *name, byte *comp_final) {
 	int32 final_size = 0, i;
 
 	if (_voiceFile.isOpen() == false) {
@@ -388,8 +380,7 @@
 	return final_size;
 }
 
-int32 Bundle::getNumberOfMusicSamplesByIndex(int32 index)
-{
+int32 Bundle::getNumberOfMusicSamplesByIndex(int32 index) {
 	if (_musicFile.isOpen() == false) {
 		warning("Bundle: music file is not open!");
 		return 0;
@@ -400,8 +391,7 @@
 	return _musicFile.readUint32BE();
 }
 
-int32 Bundle::getNumberOfMusicSamplesByName(char *name)
-{
+int32 Bundle::getNumberOfMusicSamplesByName(char *name) {
 	int32 number = 0, i;
 
 	if (_musicFile.isOpen() == false) {
@@ -419,10 +409,14 @@
 	return number;
 }
 
-#define NextBit bit = mask & 1; mask >>= 1; if (!--bitsleft) {mask = READ_LE_UINT16(srcptr); srcptr += 2; bitsleft=16;}
+#define NextBit bit = mask & 1; mask >>= 1;				\
+								if (!--bitsleft) {								\
+									mask = READ_LE_UINT16(srcptr);	\
+									srcptr += 2;										\
+									bitsleft = 16;									\
+								}
 
-int32 Bundle::compDecode(byte *src, byte *dst)
-{
+int32 Bundle::compDecode(byte *src, byte *dst) {
 	byte *result, *srcptr = src, *dstptr = dst;
 	int data, size, bit, bitsleft = 16, mask = READ_LE_UINT16(srcptr);
 	srcptr += 2;
@@ -454,8 +448,7 @@
 }
 #undef NextBit
 
-int32 Bundle::decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 input_size)
-{
+int32 Bundle::decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 input_size) {
 	int32 output_size, channels;
 	int32 offset1, offset2, offset3, length, k, c, s, j, r, t, z;
 	byte *src, *t_table, *p, *ptr;

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -d -r2.13 -r2.14
--- charset.cpp	4 Mar 2003 02:43:43 -0000	2.13
+++ charset.cpp	6 Mar 2003 17:57:44 -0000	2.14
@@ -23,8 +23,7 @@
 #include "scumm.h"
 #include "nut_renderer.h"
 
-void CharsetRendererCommon::setCurID(byte id)
-{
+void CharsetRendererCommon::setCurID(byte id) {
 	_vm->checkRange(_vm->_maxCharsets - 1, 0, _curId, "Printing with bad charset %d");
 
 	_curId = id;
@@ -38,8 +37,7 @@
 }
 
 // do spacing for variable width old-style font
-int CharsetRendererClassic::getCharWidth(byte chr)
-{
+int CharsetRendererClassic::getCharWidth(byte chr) {
 	int spacing = 0;
 
 	int offs = READ_LE_UINT32(_fontPtr + chr * 4 + 4);
@@ -55,10 +53,9 @@
 	return spacing;
 }
 
-int CharsetRendererOld256::getCharWidth(byte chr)
-{
+int CharsetRendererOld256::getCharWidth(byte chr) {
 	int spacing = 0;
-	
+
 	spacing = *(_fontPtr - 11 + chr);
 
 	// FIXME - this fixes the inventory icons in Zak256/Indy3
@@ -67,12 +64,11 @@
 	if ((_vm->_gameId == GID_ZAK256 || _vm->_gameId == GID_INDY3_256)
 			&& (chr >= 1 && chr <= 4))
 		spacing = 6;
-	
+
 	return spacing;
 }
 
-int CharsetRenderer::getStringWidth(int arg, byte *text)
-{
+int CharsetRenderer::getStringWidth(int arg, byte *text) {
 	int pos = 0;
 	int width = 1;
 	byte chr;
@@ -115,8 +111,7 @@
 	return width;
 }
 
-void CharsetRenderer::addLinebreaks(int a, byte *str, int pos, int maxwidth)
-{
+void CharsetRenderer::addLinebreaks(int a, byte *str, int pos, int maxwidth) {
 	int lastspace = -1;
 	int curw = 1;
 	byte chr;
@@ -176,8 +171,8 @@
 }
 
 
-void CharsetRendererOld256::printChar(int chr)
-{																// Indy3 / Zak256
+void CharsetRendererOld256::printChar(int chr) {
+	// Indy3 / Zak256
 	VirtScreen *vs;
 	byte *char_ptr, *dest_ptr;
 	unsigned int buffer = 0, mask = 0, x = 0, y = 0;
@@ -222,12 +217,9 @@
 
 	if (_top + 8 > _strBottom)
 		_strBottom = _top + 8;
-
 }
 
-
-void CharsetRendererClassic::printChar(int chr)
-{
+void CharsetRendererClassic::printChar(int chr) {
 	int width, height;
 	int offsX, offsY;
 	int d;
@@ -342,8 +334,7 @@
 	_top -= offsY;
 }
 
-void CharsetRendererClassic::drawBits(VirtScreen *vs, byte *dst, byte *mask, int drawTop, int width, int height)
-{
+void CharsetRendererClassic::drawBits(VirtScreen *vs, byte *dst, byte *mask, int drawTop, int width, int height) {
 	byte maskmask;
 	int y, x;
 	int maskpos;
@@ -391,8 +382,7 @@
 }
 
 CharsetRendererNut::CharsetRendererNut(Scumm *vm)
-	 : CharsetRenderer(vm)
-{
+	 : CharsetRenderer(vm) {
 	_current = 0;
 
 	for (int i = 0; i < 5; i++) {
@@ -406,37 +396,31 @@
 	}
 }
 
-CharsetRendererNut::~CharsetRendererNut()
-{
+CharsetRendererNut::~CharsetRendererNut() {
 	for (int i = 0; i < 5; i++)
 		delete _fr[i];
 }
 
-void CharsetRendererNut::setCurID(byte id)
-{
+void CharsetRendererNut::setCurID(byte id) {
 	assert(id < 5);
 	_curId = id;
 	_current = _fr[id];
 	assert(_current);
 }
 
-int CharsetRendererNut::getCharWidth(byte chr)
-{
+int CharsetRendererNut::getCharWidth(byte chr) {
 	assert(_current);
 	return _current->getCharWidth(chr);
 }
 
-int CharsetRendererNut::getFontHeight()
-{
+int CharsetRendererNut::getFontHeight() {
 	// FIXME / TODO: how to implement this properly???
 	assert(_current);
 	return _current->getCharHeight('|');
 }
 
-void CharsetRendererNut::printChar(int chr)
-{
+void CharsetRendererNut::printChar(int chr) {
 	assert(_current);
-	
 	if (chr == '@')
 		return;
 

Index: charset.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.h,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -d -r2.7 -r2.8
--- charset.h	31 Dec 2002 21:41:24 -0000	2.7
+++ charset.h	6 Mar 2003 17:57:44 -0000	2.8
@@ -66,7 +66,6 @@
 	virtual int getFontHeight() = 0;
 };
 
-
 class CharsetRendererCommon : public CharsetRenderer {
 protected:
 	byte *_fontPtr;
@@ -92,7 +91,6 @@
 	
 	void printChar(int chr);
 };
-
 
 class CharsetRendererOld256 : public CharsetRendererCommon {
 protected:

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- costume.cpp	14 Jan 2003 10:05:38 -0000	1.12
+++ costume.cpp	6 Mar 2003 17:57:45 -0000	1.13
@@ -28,8 +28,7 @@
 
 const byte revBitMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
 
-void CostumeRenderer::ignorePakCols(int a)
-{
+void CostumeRenderer::ignorePakCols(int a) {
 	int n;
 
 	n = _height;
@@ -78,8 +77,7 @@
 	238, 30, 158, 94, 222, 62, 190, 126, 254
 };
 
-byte CostumeRenderer::mainRoutine(int slot, int frame)
-{
+byte CostumeRenderer::mainRoutine(int slot, int frame) {
 	int xmove, ymove, i, b, s;
 	uint scal;
 	byte scaling;
@@ -297,9 +295,9 @@
 	else
 		masking =
 			_vm->isMaskActiveAt(_left, _top, _right, _bottom,
-			                    _vm->getResourceAddress(rtBuffer, 9) +
-			                    _vm->gdi._imgBufOffs[_zbuf] +
-			                    _vm->_screenStartStrip);
+													_vm->getResourceAddress(rtBuffer, 9) +
+													_vm->gdi._imgBufOffs[_zbuf] +
+													_vm->_screenStartStrip);
 
 	if (masking || charsetmask) {
 		_mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + _ypos * _numStrips + _vm->_screenStartStrip;
@@ -362,8 +360,7 @@
 	return b;
 }
 
-void CostumeRenderer::proc6()
-{
+void CostumeRenderer::proc6() {
 	byte *src, *dst;
 	byte len, height, pcolor, width;
 	uint y;
@@ -412,8 +409,7 @@
 	} while (1);
 }
 
-void CostumeRenderer::proc5()
-{
+void CostumeRenderer::proc5() {
 	byte *mask, *src, *dst;
 	byte maskbit, len, height, pcolor;
 	uint y, scrheight;
@@ -475,8 +471,7 @@
 	} while (1);
 }
 
-void CostumeRenderer::proc4()
-{
+void CostumeRenderer::proc4() {
 	byte *mask, *src, *dst;
 	byte maskbit, len, height, pcolor;
 	uint y, scrheight;
@@ -538,8 +533,7 @@
 	} while (1);
 }
 
-void CostumeRenderer::proc3()
-{
+void CostumeRenderer::proc3() {
 	byte *mask, *src, *dst;
 	byte maskbit, len, height, pcolor, width;
 	int color, t;
@@ -600,8 +594,7 @@
 	} while (1);
 }
 
-void CostumeRenderer::proc2()
-{
+void CostumeRenderer::proc2() {
 	byte *mask, *src, *dst;
 	byte maskbit, len, height, pcolor, width;
 	int color, t;
@@ -662,8 +655,7 @@
 	} while (1);
 }
 
-void CostumeRenderer::proc1()
-{
+void CostumeRenderer::proc1() {
 	byte *mask, *src, *dst, *dstorg;
 	byte maskbit, len, height, pcolor, width;
 	int color, t;
@@ -721,8 +713,7 @@
 	} while (1);
 }
 
-void CostumeRenderer::proc6_ami()
-{
+void CostumeRenderer::proc6_ami() {
 	byte len;
 	byte *src, *dst;
 	byte width, height, pcolor;
@@ -772,8 +763,7 @@
 	} while (1);
 }
 
-void CostumeRenderer::proc5_ami()
-{
+void CostumeRenderer::proc5_ami() {
 	byte *mask, *src, *dst;
 	byte maskbit, len, width, height, pcolor;
 	uint y, scrheight;
@@ -838,8 +828,7 @@
 	} while (1);
 }
 
-void CostumeRenderer::proc4_ami()
-{
+void CostumeRenderer::proc4_ami() {
 	byte *mask, *src, *dst;
 	byte maskbit, len, width, height, pcolor;
 	uint y, scrheight;
@@ -902,8 +891,7 @@
 	} while (1);
 }
 
-void CostumeRenderer::proc3_ami()
-{
+void CostumeRenderer::proc3_ami() {
 	byte *mask, *src, *dst;
 	byte maskbit, len, height, pcolor, width;
 	int color, t;
@@ -966,8 +954,7 @@
 	} while (1);
 }
 
-void CostumeRenderer::proc2_ami()
-{
+void CostumeRenderer::proc2_ami() {
 	byte *mask, *src, *dst;
 	byte maskbit, len, height, pcolor, width;
 	int color, t;
@@ -1031,8 +1018,7 @@
 	} while (1);
 }
 
-void CostumeRenderer::proc1_ami()
-{
+void CostumeRenderer::proc1_ami() {
 	byte *mask, *src, *dst;
 	byte maskbit, len, height, pcolor, width;
 	uint y;
@@ -1096,8 +1082,7 @@
 	} while (1);
 }
 
-void CostumeRenderer::proc_special(byte mask2)
-{
+void CostumeRenderer::proc_special(byte mask2) {
 	byte *mask, *src, *dst, *dstorg;
 	byte maskbit, len, height, pcolor, width;
 	uint y;
@@ -1194,11 +1179,9 @@
 		StartPos:;
 		} while (--len);
 	} while (1);
-
 }
 
-void LoadedCostume::loadCostume(int id)
-{
+void LoadedCostume::loadCostume(int id) {
 	_ptr = _vm->getResourceAddress(rtCostume, id);
 
 	if (_vm->_features & GF_AFTER_V6) {
@@ -1227,8 +1210,7 @@
 	_dataptr = _ptr + READ_LE_UINT16(_ptr + _numColors + 8);
 }
 
-byte CostumeRenderer::drawLimb(const CostumeData &cost, int limb)
-{
+byte CostumeRenderer::drawLimb(const CostumeData &cost, int limb) {
 	int i;
 	int code;
 
@@ -1252,13 +1234,11 @@
 
 }
 
-int Scumm::cost_frameToAnim(Actor *a, int frame)
-{
+int Scumm::cost_frameToAnim(Actor *a, int frame) {
 	return newDirToOldDir(a->facing) + frame * 4;
 }
 
-void Scumm::cost_decodeData(Actor *a, int frame, uint usemask)
-{
+void Scumm::cost_decodeData(Actor *a, int frame, uint usemask) {
 	byte *p, *r;
 	uint mask, j;
 	int i;
@@ -1332,8 +1312,7 @@
 	} while ((uint16)mask);
 }
 
-void CostumeRenderer::setPalette(byte *palette)
-{
+void CostumeRenderer::setPalette(byte *palette) {
 	int i;
 	byte color;
 
@@ -1349,18 +1328,15 @@
 	}
 }
 
-void CostumeRenderer::setFacing(Actor *a)
-{
+void CostumeRenderer::setFacing(Actor *a) {
 	_mirror = newDirToOldDir(a->facing) != 0 || (_loaded._ptr[7] & 0x80);
 }
 
-void CostumeRenderer::setCostume(int costume)
-{
+void CostumeRenderer::setCostume(int costume) {
 	_loaded.loadCostume(costume);
 }
 
-byte LoadedCostume::increaseAnims(Actor *a)
-{
+byte LoadedCostume::increaseAnims(Actor *a) {
 	int i;
 	byte r = 0;
 
@@ -1371,8 +1347,7 @@
 	return r;
 }
 
-byte LoadedCostume::increaseAnim(Actor *a, int slot)
-{
+byte LoadedCostume::increaseAnim(Actor *a, int slot) {
 	int highflag;
 	int i, end;
 	byte code, nc;
@@ -1420,8 +1395,7 @@
 	} while (1);
 }
 
-bool Scumm::isCostumeInUse(int cost)
-{
+bool Scumm::isCostumeInUse(int cost) {
 	int i;
 	Actor *a;
 

Index: costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- costume.h	7 Jan 2003 17:35:20 -0000	1.7
+++ costume.h	6 Mar 2003 17:57:45 -0000	1.8
@@ -41,7 +41,6 @@
 	byte increaseAnim(Actor *a, int slot);
 };
 
-
 class CostumeRenderer : public BaseCostumeRenderer {
 public:
 	uint _outheight;

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- debugger.cpp	2 Mar 2003 07:50:49 -0000	1.16
+++ debugger.cpp	6 Mar 2003 17:57:46 -0000	1.17
@@ -19,8 +19,7 @@
 
 extern uint16 _debugLevel;
 
-ScummDebugger::ScummDebugger()
-{
+ScummDebugger::ScummDebugger() {
 	_s = 0;
 	_frame_countdown = 0;
 	_dvar_count = 0;
@@ -29,8 +28,7 @@
 }
 
 // Initialisation Functions
-void ScummDebugger::attach(Scumm *s)
-{
+void ScummDebugger::attach(Scumm *s) {
 	if (_s)
 		detach();
 	
@@ -72,8 +70,7 @@
 	}
 }
 
-void ScummDebugger::detach()
-{
+void ScummDebugger::detach() {
 #ifdef USE_CONSOLE
 	if (_s->_debuggerDialog)
 		_s->_debuggerDialog->setInputeCallback(0, 0);
@@ -84,7 +81,6 @@
 	_detach_now = false;
 }
 
-
 // Temporary execution handler
 void ScummDebugger::on_frame() {
 	if (_frame_countdown == 0)
@@ -108,8 +104,7 @@
 
 // Console handler
 #ifdef USE_CONSOLE
-bool ScummDebugger::debuggerInputCallback(ConsoleDialog *console, const char *input, void *refCon)
-{
+bool ScummDebugger::debuggerInputCallback(ConsoleDialog *console, const char *input, void *refCon) {
 	ScummDebugger *debugger = (ScummDebugger *)refCon;
 	
 	return debugger->RunCommand((char*)input);
@@ -139,8 +134,7 @@
 }
 
 // Main Debugger Loop 
-void ScummDebugger::enter()
-{
+void ScummDebugger::enter() {
 #ifdef USE_CONSOLE
 	if (!_s->_debuggerDialog) {
 		_s->_debuggerDialog = new ConsoleDialog(_s->_newgui, _s->_realWidth);
@@ -396,23 +390,24 @@
 
 	if (!strcmp(argv[2], "pickup")) {
 		for (i = 1; i < _s->_maxInventoryItems; i++) {
-                	if (_s->_inventory[i] == (uint16)obj) {
-                        	_s->putOwner(obj, _s->_vars[_s->VAR_EGO]);
-                        	_s->runHook(obj);
-                        	return true;
-                	}
-        	}
-		
+			if (_s->_inventory[i] == (uint16)obj) {
+				_s->putOwner(obj, _s->_vars[_s->VAR_EGO]);
+				_s->runHook(obj);
+				return true;
+			}
+		}
+
 		if (argc == 3)
-        		_s->addObjectToInventory(obj, _s->_currentRoom);
+			_s->addObjectToInventory(obj, _s->_currentRoom);
 		else
-        		_s->addObjectToInventory(obj, atoi(argv[3]));
-       		_s->putOwner(obj, _s->_vars[_s->VAR_EGO]);
-        	_s->putClass(obj, 32, 1);
-        	_s->putState(obj, 1);
-        	_s->removeObjectFromRoom(obj);
-        	_s->clearDrawObjectQueue();
-        	_s->runHook(obj);
+			_s->addObjectToInventory(obj, atoi(argv[3]));
+
+		_s->putOwner(obj, _s->_vars[_s->VAR_EGO]);
+		_s->putClass(obj, 32, 1);
+		_s->putState(obj, 1);
+		_s->removeObjectFromRoom(obj);
+		_s->clearDrawObjectQueue();
+		_s->runHook(obj);
 	} else {
 		Debug_Printf("Unknown object command '%s'\n", argv[2]);
 	}
@@ -459,7 +454,6 @@
 }
 
 bool ScummDebugger::Cmd_DebugLevel(int argc, const char **argv) {
-	
 	if (argc == 1) {
 		if (_s->_debugMode == false)
 			Debug_Printf("Debugging is not enabled at this time\n");
@@ -503,19 +497,18 @@
 	return true;
 }
 
-void ScummDebugger::printBox(int box)
-{
+void ScummDebugger::printBox(int box) {
 	BoxCoords coords;
 	int flags = _s->getBoxFlags(box);
 	int mask = _s->getMaskFromBox(box);
 	int scale = _s->getBoxScale(box);
 
 	_s->getBoxCoordinates(box, &coords);
-	
+
 	// Print out coords, flags, zbuffer mask
 	Debug_Printf("%d: [%d x %d] [%d x %d] [%d x %d] [%d x %d], flags=0x%02x, mask=%d, scale=%d\n",
-	              box,
-	              coords.ul.x, coords.ul.y, coords.ll.x, coords.ll.y,
-	              coords.ur.x, coords.ur.y, coords.lr.x, coords.lr.y,
-	              flags, mask, scale);
+								box,
+								coords.ul.x, coords.ul.y, coords.ll.x, coords.ll.y,
+								coords.ur.x, coords.ur.y, coords.lr.x, coords.lr.y,
+								flags, mask, scale);
 }

Index: debugrl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugrl.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- debugrl.cpp	21 Aug 2002 16:07:27 -0000	1.1.1.1
+++ debugrl.cpp	6 Mar 2003 17:57:47 -0000	1.2
@@ -1,3 +1,23 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002/2003 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Header$
+ */
+
 #ifdef HAVE_READLINE
 
 #include "debugrl.h"
@@ -14,13 +34,11 @@
 	(char *)NULL
 };
 
-
 // forwards decls
 char **scumm_debugger_completion(const char *text, int start, int end);
 char *scumm_debugger_command_generator(const char *text, int state);
 
-void initialize_readline()
-{
+void initialize_readline() {
 	/* Allow conditional parsing of the ~/.inputrc file. */
 	rl_readline_name = "scummvm";
 
@@ -28,11 +46,8 @@
 	rl_attempted_completion_function = scumm_debugger_completion;
 }
 
-char **scumm_debugger_completion(const char *text, int start, int end)
-{
-
+char **scumm_debugger_completion(const char *text, int start, int end) {
 	char **matches;
-
 	matches = (char **)NULL;
 
 	// If this word is at the start of the line, then it is a command
@@ -53,13 +68,10 @@
 	return (matches);
 }
 
-
 /* Generator function for command completion.  STATE lets us know whether
    to start from scratch; without any state (i.e. STATE == 0), then we
    start at the top of the list. */
-char *scumm_debugger_command_generator(const char *text, int state)
-{
-
+char *scumm_debugger_command_generator(const char *text, int state) {
 	static int list_index, len;
 	char *name;
 

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- dialogs.cpp	8 Feb 2003 01:27:21 -0000	1.36
+++ dialogs.cpp	6 Mar 2003 17:57:47 -0000	1.37
@@ -85,14 +85,14 @@
 	{96, "game name and version"}, //that's how it's supposed to be
 	{77, "Select a game to LOAD"},
 	{76, "Name your SAVE game"},
-        {70, "save"}, //boot8
+	{70, "save"}, //boot8
 	{71, "load"}, //boot9
 	{72, "play"}, //boot10
 	{73, "cancel"}, //boot11
 	{74, "quit"}, //boot12
 	{75, "ok"}, //boot13
 	{85, "game paused"}, // boot3					
-	
+
 	/* this is the almost complete string map for v7
 	{63, "how may I serve you?"},
 	{64, "the dig v1.0"}, //(game name/version)
@@ -158,15 +158,13 @@
 #pragma mark -
 
 
-void ScummDialog::addResText(int x, int y, int w, int h, int resID)
-{
+void ScummDialog::addResText(int x, int y, int w, int h, int resID) {
 	// Get the string
 	new StaticTextWidget(this, x, y, w, h, queryResString(resID), kTextAlignCenter);
 }
 
 
-const ScummVM::String ScummDialog::queryResString(int stringno)
-{
+const ScummVM::String ScummDialog::queryResString(int stringno) {
 	char *result;
 	int string;
 
@@ -184,7 +182,7 @@
 	if (result && *result == '/') {
 		byte tmp[256];
 		_scumm->translateText((byte *)result, tmp);
-		strcpy(result, (char*)tmp);
+		strcpy(result, (char *)tmp);
 	}
 
 	if (!result || *result == '\0') {								// Gracelessly degrade to english :)
@@ -234,7 +232,7 @@
 				
 				for (i = 1; i < _scumm->_maxVerbs; i++) {
 					if (value == _scumm->_verbs[i].verbid && !_scumm->_verbs[i].type && !_scumm->_verbs[i].saveid) {
-						char* verb = (char*)_scumm->getResourceAddress(rtVerb, i);
+						char *verb = (char *)_scumm->getResourceAddress(rtVerb, i);
 						if (verb) {
 							tmp += verb;
 						}
@@ -250,7 +248,7 @@
 				if (!value)
 					break;
 
-				char* name = (char*)_scumm->getObjOrActorName(value);
+				char *name = (char *)_scumm->getObjOrActorName(value);
 				if (name) {
 					tmp += name;
 				}
@@ -263,7 +261,7 @@
 					value = _scumm->readVar(value);
 
 				if (value) {
-					char *str = (char*)_scumm->getStringAddress(value);
+					char *str = (char *)_scumm->getStringAddress(value);
 					if (str) {
 						tmp += str;
 					}
@@ -290,12 +288,10 @@
 	return tmp;
 }
 
-const char *ScummDialog::queryCustomString(int stringno)
-{
+const char *ScummDialog::queryCustomString(int stringno) {
 	return string_map_table_custom[stringno];
 }
 
-
 #pragma mark -
 
 enum {
@@ -307,26 +303,24 @@
 };
 
 SaveLoadDialog::SaveLoadDialog(NewGui *gui, Scumm *scumm)
-	: ScummDialog(gui, scumm, 30, 18, 260, 162)
-{
+	: ScummDialog(gui, scumm, 30, 18, 260, 162) {
 	const int x = 196;
 
 	// The headline
 	addResText(0, 7, 260, 16, 1);
-	
+
 	// The five buttons on the side
 	_saveButton = addPushButton(x, 20, queryResString(4), kSaveCmd, 'S');
 	_loadButton = addPushButton(x, 40, queryResString(5), kLoadCmd, 'L');
 	addButton(x, 60, queryResString(6), kPlayCmd, 'P');	// Play
 	addButton(x, 80, queryCustomString(17), kOptionsCmd, 'O');	// Options
 	addButton(x, 100, queryResString(8), kQuitCmd, 'Q');	// Quit
-	
+
 	// The save game list
 	_savegameList = new ListWidget(this, 8, 20, 182, 134);
 }
 
-void SaveLoadDialog::open()
-{
+void SaveLoadDialog::open() {
 	switchToLoadMode();
 
 #ifdef _WIN32_WCE
@@ -336,8 +330,7 @@
 	ScummDialog::open();
 }
 
-void SaveLoadDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data)
-{
+void SaveLoadDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
 	switch (cmd) {
 	case kSaveCmd:
 		if (!_saveMode) {
@@ -392,16 +385,14 @@
 }
 
 void SaveLoadDialog::close() {
-
-	ScummDialog::close();	
+	ScummDialog::close();
 
 #ifdef _WIN32_WCE
 	force_keyboard(false);
 #endif
 }
 
-void SaveLoadDialog::fillList()
-{
+void SaveLoadDialog::fillList() {
 	// Get savegame names
 	ScummVM::StringList l;
 	char name[32];
@@ -424,22 +415,19 @@
 	_savegameList->setNumberingMode(_saveMode ? kListNumberingOne : kListNumberingZero);
 }
 
-void SaveLoadDialog::save()
-{
+void SaveLoadDialog::save() {
 	// Save the selected item
 	_scumm->requestSave(_savegameList->getSelected() + 1, _savegameList->getSelectedString().c_str());
 	close();
 }
 
-void SaveLoadDialog::load()
-{
+void SaveLoadDialog::load() {
 	// Load the selected item
 	_scumm->requestLoad(_savegameList->getSelected());
 	close();
 }
 
-void SaveLoadDialog::switchToSaveMode()
-{
+void SaveLoadDialog::switchToSaveMode() {
 	_saveMode = true;
 	_saveButton->setState(true);
 	_loadButton->setState(false);
@@ -450,8 +438,7 @@
 	draw();
 }
 
-void SaveLoadDialog::switchToLoadMode()
-{
+void SaveLoadDialog::switchToLoadMode() {
 	_saveMode = false;
 	_saveButton->setState(false);
 	_loadButton->setState(true);
@@ -462,10 +449,8 @@
 	draw();
 }
 
-
 #pragma mark -
 
-
 enum {
 	kMasterVolumeChanged	= 'mavc',
 	kMusicVolumeChanged		= 'muvc',
@@ -480,8 +465,7 @@
 };
 
 OptionsDialog::OptionsDialog(NewGui *gui, Scumm *scumm)
-	: ScummDialog(gui, scumm, 40, 30, 240, 124)
-{
+	: ScummDialog(gui, scumm, 40, 30, 240, 124) {
 	//
 	// Add the buttons
 	//
@@ -493,7 +477,6 @@
 	addButton(kButtonWidth+12, _h-24, "Keys", kKeysCmd, 'K');
 #endif
 
-
 	//
 	// Sound controllers
 	//
@@ -523,7 +506,6 @@
 	subtitlesCheckbox = new CheckboxWidget(this, 15, 62, 200, 16, "Show subtitles", 0, 'S');
 	amigaPalCheckbox  = new CheckboxWidget(this, 15, 80, 200, 16, "Amiga palette conversion", 0, 'P');
 
-
 	//
 	// Finally create the sub dialogs
 	//
@@ -533,16 +515,14 @@
 #endif
 }
 
-OptionsDialog::~OptionsDialog()
-{
+OptionsDialog::~OptionsDialog() {
 	delete _aboutDialog;
 #ifdef _WIN32_WCE
 	delete _keysDialog;
 #endif
 }
 
-void OptionsDialog::open()
-{
+void OptionsDialog::open() {
 	ScummDialog::open();
 
 	// display current sound settings
@@ -563,8 +543,7 @@
 	amigaPalCheckbox->setState((_scumm->_features & GF_AMIGA) != 0);
 }
 
-void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data)
-{
+void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
 	switch (cmd) {
 	case kKeysCmd:
 #ifdef _WIN32_WCE
@@ -632,8 +611,7 @@
 #pragma mark -
 
 AboutDialog::AboutDialog(NewGui *gui, Scumm *scumm)
-	: ScummDialog(gui, scumm, 30, 20, 260, 124)
-{
+	: ScummDialog(gui, scumm, 30, 20, 260, 124) {
 	addButton(110, 100, queryCustomString(23), kCloseCmd, 'C');	// Close dialog - FIXME
 	new StaticTextWidget(this, 10, 10, 240, 16, "ScummVM " SCUMMVM_VERSION " (" SCUMMVM_CVS ")", kTextAlignCenter);
 	new StaticTextWidget(this, 10, 30, 240, 16, "http://www.scummvm.org", kTextAlignCenter);
@@ -645,21 +623,18 @@
 #pragma mark -
 
 InfoDialog::InfoDialog(NewGui *gui, Scumm *scumm, int res)
-	: ScummDialog(gui, scumm, 0, 80, 0, 16) // dummy x and w
-{
+: ScummDialog(gui, scumm, 0, 80, 0, 16) { // dummy x and w
 	setInfoText(queryResString (res));
 }
 
 InfoDialog::InfoDialog(NewGui *gui, Scumm *scumm, const String& message)
-	: ScummDialog(gui, scumm, 0, 80, 0, 16) // dummy x and w
-{
+: ScummDialog(gui, scumm, 0, 80, 0, 16) { // dummy x and w
 	setInfoText(message);
 }
 
-void InfoDialog::setInfoText(const String& message)
-{
+void InfoDialog::setInfoText(const String& message) {
 	int width = _gui->getStringWidth(message.c_str()) + 16;
-	
+
 	_x = (_scumm->_realWidth - width) >> 1;
 	_w = width;
 
@@ -669,8 +644,7 @@
 #pragma mark -
 
 PauseDialog::PauseDialog(NewGui *gui, Scumm *scumm)
-	: InfoDialog(gui, scumm, 10)
-{
+	: InfoDialog(gui, scumm, 10) {
 }
 
 #ifdef _WIN32_WCE
@@ -683,18 +657,17 @@
 
 
 KeysDialog::KeysDialog(NewGui *gui, Scumm *scumm)
-	: ScummDialog(gui, scumm, 30, 20, 260, 160)
-{	
+	: ScummDialog(gui, scumm, 30, 20, 260, 160) {
 	addButton(200, 20, queryCustomString(24), kMapCmd, 'M');	// Map
 	addButton(200, 40, "OK", kOKCmd, 'O');						// OK
 	addButton(200, 60, "Cancel", kCancelCmd, 'C');				// Cancel
-	
+
 	_actionsList = new ListWidget(this, 10, 20, 180, 90);
 	_actionsList->setNumberingMode(kListNumberingZero);
 
 	_actionTitle = new StaticTextWidget(this, 10, 120, 240, 16, queryCustomString(25), kTextAlignCenter);
 	_keyMapping = new StaticTextWidget(this, 10, 140, 240, 16, "", kTextAlignCenter);
-	
+
 	_actionTitle->setFlags(WIDGET_CLEARBG);
 	_keyMapping->setFlags(WIDGET_CLEARBG);
 
@@ -711,7 +684,6 @@
 }
 
 void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
-
 	switch(cmd) {
 
 	case kListSelectionChangedCmd:

Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dialogs.h	21 Dec 2002 12:34:16 -0000	1.14
+++ dialogs.h	6 Mar 2003 17:57:48 -0000	1.15
@@ -56,11 +56,11 @@
 
 protected:
 	ListWidget       *_savegameList;
-	
+
 	PushButtonWidget *_saveButton;
 	PushButtonWidget *_loadButton;
 	
-	bool			_saveMode;
+	bool _saveMode;
 
 	void fillList();
 	void save();
@@ -69,13 +69,11 @@
 	void switchToLoadMode();
 };
 
-
 class AboutDialog : public ScummDialog {
 public:
 	AboutDialog(NewGui *gui, Scumm *scumm);
 };
 
-
 class OptionsDialog : public ScummDialog {
 protected:
 	Dialog		*_aboutDialog;
@@ -88,11 +86,10 @@
 	~OptionsDialog();
 
 	virtual void open();
-
 	virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
 
 protected:
-	
+
 	int _soundVolumeMaster;
 	int _soundVolumeMusic;
 	int _soundVolumeSfx;
@@ -100,7 +97,7 @@
 	SliderWidget *masterVolumeSlider;
 	SliderWidget *musicVolumeSlider;
 	SliderWidget *sfxVolumeSlider;
-	
+
 	StaticTextWidget *masterVolumeLabel;
 	StaticTextWidget *musicVolumeLabel;
 	StaticTextWidget *sfxVolumeLabel;
@@ -116,13 +113,14 @@
 	// from resources
 	InfoDialog(NewGui *gui, Scumm *scumm, int res);
 
-	virtual void handleMouseDown(int x, int y, int button, int clickCount)
-		{ close(); }
-	virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers)
-		{
-			setResult(ascii);
-			close();
-		}
+	virtual void handleMouseDown(int x, int y, int button, int clickCount) { 
+		close();
+	}
+	virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers) {
+		setResult(ascii);
+		close();
+	}
+
 protected:
 	void setInfoText (const String& message);
 };

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.31
retrieving revision 2.32
diff -u -d -r2.31 -r2.32
--- gfx.cpp	4 Mar 2003 02:43:43 -0000	2.31
+++ gfx.cpp	6 Mar 2003 17:57:49 -0000	2.32
@@ -182,13 +182,11 @@
 };
 
 
-static inline uint colorWeight(int red, int green, int blue)
-{
+static inline uint colorWeight(int red, int green, int blue) {
 	return 3 * red * red + 6 * green * green + 2 * blue * blue;
 }
 
-void Scumm::getGraphicsPerformance()
-{
+void Scumm::getGraphicsPerformance() {
 	int i;
 
 	for (i = 10; i != 0; i--) {
@@ -212,8 +210,7 @@
 		initScreens(0, 16, _realWidth, 144);
 }
 
-void Scumm::initScreens(int a, int b, int w, int h)
-{
+void Scumm::initScreens(int a, int b, int w, int h) {
 	int i;
 
 	for (i = 0; i < 3; i++) {
@@ -238,8 +235,7 @@
 }
 
 void Scumm::initVirtScreen(int slot, int number, int top, int width, int height, bool twobufs,
-													 bool scrollable)
-{
+													 bool scrollable) {
 	VirtScreen *vs = &virtscr[slot];
 	int size;
 
@@ -269,7 +265,7 @@
 			size += _realWidth * 4;
 		}
 	}
-	
+
 	createResource(rtBuffer, slot + 1, size);
 	vs->screenPtr = getResourceAddress(rtBuffer, slot + 1);
 	memset(vs->screenPtr, 0, size);			// reset background
@@ -283,8 +279,7 @@
 	}
 }
 
-VirtScreen *Scumm::findVirtScreen(int y)
-{
+VirtScreen *Scumm::findVirtScreen(int y) {
 	VirtScreen *vs = virtscr;
 	int i;
 
@@ -296,8 +291,7 @@
 	return NULL;
 }
 
-void Scumm::updateDirtyRect(int virt, int left, int right, int top, int bottom, int dirtybit)
-{
+void Scumm::updateDirtyRect(int virt, int left, int right, int top, int bottom, int dirtybit) {
 	VirtScreen *vs = &virtscr[virt];
 	int lp, rp;
 
@@ -337,8 +331,7 @@
 	setVirtscreenDirty(vs, left, top, right, bottom);
 }
 
-void Scumm::setVirtscreenDirty(VirtScreen *vs, int left, int top, int right, int bottom)
-{
+void Scumm::setVirtscreenDirty(VirtScreen *vs, int left, int top, int right, int bottom) {
 	int lp = left >> 3;
 	int rp = right >> 3;
 
@@ -358,8 +351,7 @@
 	}
 }
 
-void Scumm::setDirtyRange(int slot, int top, int bottom)
-{
+void Scumm::setDirtyRange(int slot, int top, int bottom) {
 	int i;
 	VirtScreen *vs = &virtscr[slot];
 	for (i = 0; i < gdi._numStrips; i++) {
@@ -368,8 +360,7 @@
 	}
 }
 
-void Scumm::drawDirtyScreenParts()
-{
+void Scumm::drawDirtyScreenParts() {
 	int i;
 	VirtScreen *vs;
 	byte *src;
@@ -402,15 +393,13 @@
 	}
 }
 
-void Scumm::updateDirtyScreen(int slot)
-{
+void Scumm::updateDirtyScreen(int slot) {
 	gdi.updateDirtyScreen(&virtscr[slot]);
 }
 
 // Blit the data from the given VirtScreen to the display. If the camera moved,
 // a full blit is done, otherwise only the visible dirty areas are updated.
-void Gdi::updateDirtyScreen(VirtScreen *vs)
-{
+void Gdi::updateDirtyScreen(VirtScreen *vs) {
 	if (vs->height == 0)
 		return;
 
@@ -419,13 +408,13 @@
 	} else {
 		int i;
 		int start, w, top, bottom;
-	
+
 		w = 8;
 		start = 0;
 
 		for (i = 0; i < _numStrips; i++) {
 			bottom = vs->bdirty[i];
-	
+
 			if (bottom) {
 				top = vs->tdirty[i];
 				vs->tdirty[i] = vs->height;
@@ -449,8 +438,7 @@
 }
 
 // Blit the specified rectangle from the given virtual screen to the display.
-void Gdi::drawStripToScreen(VirtScreen *vs, int x, int w, int t, int b)
-{
+void Gdi::drawStripToScreen(VirtScreen *vs, int x, int w, int t, int b) {
 	byte *ptr;
 	int height;
 
@@ -476,14 +464,12 @@
 	_vm->_system->copy_rect(ptr, _vm->_realWidth, x, vs->topline + t, w, height);
 }
 
-void Gdi::clearUpperMask()
-{
+void Gdi::clearUpperMask() {
 	memset(_vm->getResourceAddress(rtBuffer, 9), 0, _imgBufOffs[1] - _imgBufOffs[0]);
 }
 
 // Reset the background behind an actor or blast object
-void Gdi::resetBackground(int top, int bottom, int strip)
-{
+void Gdi::resetBackground(int top, int bottom, int strip) {
 	VirtScreen *vs = &_vm->virtscr[0];
 	byte *backbuff_ptr, *bgbak_ptr;
 	int offs, numLinesToProcess;
@@ -512,8 +498,7 @@
 	}
 }
 
-void Scumm::blit(byte *dst, byte *src, int w, int h)
-{
+void Scumm::blit(byte *dst, byte *src, int w, int h) {
 	assert(h > 0);
 	assert(src != NULL);
 	assert(dst != NULL);
@@ -527,8 +512,7 @@
 
 #pragma mark -
 
-void Scumm::initBGBuffers(int height)
-{
+void Scumm::initBGBuffers(int height) {
 	byte *ptr;
 	int size, itemsize, i;
 	byte *room;
@@ -579,14 +563,13 @@
 	}
 }
 
-void Scumm::drawFlashlight()
-{
+void Scumm::drawFlashlight() {
 	int i, j, offset, x, y;
 
 	// Remove the flash light first if it was previously drawn
 	if (_flashlightIsDrawn) {
 		updateDirtyRect(0, _flashlight.x, _flashlight.x + _flashlight.w,
-		                   _flashlight.y, _flashlight.y + _flashlight.h, USAGE_BIT_DIRTY);
+										_flashlight.y, _flashlight.y + _flashlight.h, USAGE_BIT_DIRTY);
 		
 		if (_flashlight.buffer) {
 			i = _flashlight.h;
@@ -600,7 +583,7 @@
 
 	if (_flashlightXStrips == 0 || _flashlightYStrips == 0)
 		return;
-	
+
 	// Calculate the area of the flashlight
 	if (_gameId == GID_ZAK256) {
 		x = _virtual_mouse_x;
@@ -612,9 +595,9 @@
 	}
 	_flashlight.w = _flashlightXStrips * 8;
 	_flashlight.h = _flashlightYStrips * 8;
-	_flashlight.x = x - _flashlight.w/2 - _screenStartStrip * 8;
-	_flashlight.y = y - _flashlight.h/2;
-	
+	_flashlight.x = x - _flashlight.w / 2 - _screenStartStrip * 8;
+	_flashlight.y = y - _flashlight.h / 2;
+
 	// Clip the flashlight at the borders
 	if (_flashlight.x < 0)
 		_flashlight.x = 0;
@@ -626,7 +609,7 @@
 		_flashlight.y = virtscr[0].height - _flashlight.h;
 
 	// Redraw any actors "under" the flashlight
-	for (i = _flashlight.x/8; i < (_flashlight.x+_flashlight.w)/8; i++) {
+	for (i = _flashlight.x / 8; i < (_flashlight.x + _flashlight.w) / 8; i++) {
 		setGfxUsageBit(_screenStartStrip + i, USAGE_BIT_DIRTY);
 		virtscr[0].tdirty[i] = 0;
 		virtscr[0].bdirty[i] = virtscr[0].height;
@@ -662,8 +645,7 @@
 
 // Redraw background as needed, i.e. the left/right sides if scrolling took place etc.
 // Note that this only updated the virtual screen, not the actual display.
-void Scumm::redrawBGAreas()
-{
+void Scumm::redrawBGAreas() {
 	int i;
 	int val;
 	int diff;
@@ -713,8 +695,7 @@
 	_BgNeedsRedraw = false;
 }
 
-void Scumm::redrawBGStrip(int start, int num)
-{
+void Scumm::redrawBGStrip(int start, int num) {
 	int s = _screenStartStrip + start;
 
 	assert(s >= 0 && (size_t) s < sizeof(gfxUsageBits) / (3 * sizeof(gfxUsageBits[0])));
@@ -723,11 +704,10 @@
 		setGfxUsageBit(s + i, USAGE_BIT_DIRTY);
 
 	gdi.drawBitmap(getResourceAddress(rtRoom, _roomResource) + _IM00_offs,
-	               &virtscr[0], s, 0, virtscr[0].height, s, num, 0);
+								&virtscr[0], s, 0, virtscr[0].height, s, num, 0);
 }
 
-void Scumm::restoreCharsetBg()
-{
+void Scumm::restoreCharsetBg() {
 	if (gdi._mask_left != -1) {
 		restoreBG(gdi._mask_left, gdi._mask_top, gdi._mask_right, gdi._mask_bottom);
 		_charset->_hasMask = false;
@@ -740,8 +720,7 @@
 	_charset->_nextTop = _string[0].ypos;
 }
 
-void Scumm::restoreBG(int left, int top, int right, int bottom, byte backColor)
-{
+void Scumm::restoreBG(int left, int top, int right, int bottom, byte backColor) {
 	VirtScreen *vs;
 	int topline, height, width;
 	byte *backbuff, *bgbak;
@@ -803,16 +782,14 @@
 	}
 }
 
-int Scumm::hasCharsetMask(int x, int y, int x2, int y2)
-{
+int Scumm::hasCharsetMask(int x, int y, int x2, int y2) {
 	if (!_charset->_hasMask || y > gdi._mask_bottom || x > gdi._mask_right ||
 			y2 < gdi._mask_top || x2 < gdi._mask_left)
 		return 0;
 	return 1;
 }
 
-byte Scumm::isMaskActiveAt(int l, int t, int r, int b, byte *mem)
-{
+byte Scumm::isMaskActiveAt(int l, int t, int r, int b, byte *mem) {
 	int w, h, i;
 
 	l >>= 3;
@@ -842,8 +819,7 @@
 }
 
 void Gdi::drawBitmap(byte *ptr, VirtScreen *vs, int x, int y, const int h,
-										 int stripnr, int numstrip, byte flag)
-{
+										 int stripnr, int numstrip, byte flag) {
 	assert(ptr);
 	assert(h > 0);
 	byte *backbuff_ptr, *bgbak_ptr, *smap_ptr;
@@ -1045,8 +1021,7 @@
 }
 
 
-bool Gdi::decompressBitmap(byte *bgbak_ptr, byte *smap_ptr, int numLinesToProcess)
-{
+bool Gdi::decompressBitmap(byte *bgbak_ptr, byte *smap_ptr, int numLinesToProcess) {
 	byte code = *smap_ptr++;
 	assert(numLinesToProcess);
 
@@ -1148,8 +1123,7 @@
 	return useOrDecompress;
 }
 
-void Gdi::draw8ColWithMasking(byte *dst, byte *src, int height, byte *mask)
-{
+void Gdi::draw8ColWithMasking(byte *dst, byte *src, int height, byte *mask) {
 	byte maskbits;
 
 	do {
@@ -1185,8 +1159,7 @@
 	} while (--height);
 }
 
-void Gdi::clear8ColWithMasking(byte *dst, int height, byte *mask)
-{
+void Gdi::clear8ColWithMasking(byte *dst, int height, byte *mask) {
 	byte maskbits;
 
 	do {
@@ -1221,9 +1194,7 @@
 	} while (--height);
 }
 
-
-void Gdi::draw8Col(byte *dst, byte *src, int height)
-{
+void Gdi::draw8Col(byte *dst, byte *src, int height) {
 	do {
 #if defined(SCUMM_NEED_ALIGNMENT)
 		memcpy(dst, src, 8);
@@ -1248,8 +1219,7 @@
 	} while (--height);
 }
 
-void Gdi::decompressMaskImg(byte *dst, byte *src, int height)
-{
+void Gdi::decompressMaskImg(byte *dst, byte *src, int height) {
 	byte b, c;
 
 	while (height) {
@@ -1274,8 +1244,7 @@
 	}
 }
 
-void Gdi::decompressMaskImgOr(byte *dst, byte *src, int height)
-{
+void Gdi::decompressMaskImgOr(byte *dst, byte *src, int height) {
 	byte b, c;
 
 	while (height) {
@@ -1301,10 +1270,14 @@
 }
 
 #define READ_BIT (cl--, bit = bits&1, bits>>=1,bit)
-#define FILL_BITS do { if (cl <= 8) { bits |= (*src++ << cl); cl += 8; }  } while (0)
+#define FILL_BITS do {												\
+										if (cl <= 8) {						\
+											bits |= (*src++ << cl);	\
+											cl += 8;								\
+										}													\
+									} while (0)
 
-void Gdi::unkDecodeA(byte *dst, byte *src, int height)
-{
+void Gdi::unkDecodeA(byte *dst, byte *src, int height) {
 	byte color = *src++;
 	uint bits = *src++;
 	byte cl = 8;
@@ -1352,8 +1325,7 @@
 	} while (--height);
 }
 
-void Gdi::unkDecodeA_trans(byte *dst, byte *src, int height)
-{
+void Gdi::unkDecodeA_trans(byte *dst, byte *src, int height) {
 	byte color = *src++;
 	uint bits = *src++;
 	byte cl = 8;
@@ -1405,8 +1377,7 @@
 	} while (--height);
 }
 
-void Gdi::unkDecodeB(byte *dst, byte *src, int height)
-{
+void Gdi::unkDecodeB(byte *dst, byte *src, int height) {
 	byte color = *src++;
 	uint bits = *src++;
 	byte cl = 8;
@@ -1436,8 +1407,7 @@
 	} while (--height);
 }
 
-void Gdi::unkDecodeB_trans(byte *dst, byte *src, int height)
-{
+void Gdi::unkDecodeB_trans(byte *dst, byte *src, int height) {
 	byte color = *src++;
 	uint bits = *src++;
 	byte cl = 8;
@@ -1469,8 +1439,7 @@
 	} while (--height);
 }
 
-void Gdi::unkDecodeC(byte *dst, byte *src, int height)
-{
+void Gdi::unkDecodeC(byte *dst, byte *src, int height) {
 	byte color = *src++;
 	uint bits = *src++;
 	byte cl = 8;
@@ -1502,8 +1471,7 @@
 	} while (--x);
 }
 
-void Gdi::unkDecodeC_trans(byte *dst, byte *src, int height)
-{
+void Gdi::unkDecodeC_trans(byte *dst, byte *src, int height) {
 	byte color = *src++;
 	uint bits = *src++;
 	byte cl = 8;
@@ -1539,23 +1507,24 @@
 #undef READ_BIT
 #undef FILL_BITS
 
-
 /* Ender - Zak256/Indy256 decoders */
-#define READ_256BIT \
- if ((mask <<= 1) == 256) {buffer = *src++;  mask = 1;}     \
- bits = ((buffer & mask) != 0);
+#define READ_256BIT																\
+											if ((mask <<= 1) == 256) {	\
+												buffer = *src++;					\
+												mask = 1;									\
+											}														\
+											bits = ((buffer & mask) != 0);
 
-#define NEXT_ROW                                            \
-				dst += _vm->_realWidth;                     \
-				if (--h == 0) {                             \
-					if (!--x)                       \
-						  return;                           \
-					dst -= _vertStripNextInc;               \
-					h = height;                             \
+#define NEXT_ROW										\
+				dst += _vm->_realWidth;			\
+				if (--h == 0) {							\
+					if (!--x)									\
+						return;									\
+					dst -= _vertStripNextInc;	\
+					h = height;								\
 				}
 
-void Gdi::unkDecode7(byte *dst, byte *src, int height)
-{
+void Gdi::unkDecode7(byte *dst, byte *src, int height) {
 	uint h = height;
 
 	if (_vm->_features & GF_OLD256) {
@@ -1579,8 +1548,7 @@
 	} while (--height);
 }
 
-void Gdi::unkDecode8(byte *dst, byte *src, int height)
-{
+void Gdi::unkDecode8(byte *dst, byte *src, int height) {
 	uint h = height;
 
 	int x = 8;
@@ -1595,8 +1563,7 @@
 	}
 }
 
-void Gdi::unkDecode9(byte *dst, byte *src, int height)
-{
+void Gdi::unkDecode9(byte *dst, byte *src, int height) {
 	unsigned char c, bits, color, run;
 	int i, j;
 	uint buffer = 0, mask = 128;
@@ -1647,8 +1614,7 @@
 	}
 }
 
-void Gdi::unkDecode10(byte *dst, byte *src, int height)
-{
+void Gdi::unkDecode10(byte *dst, byte *src, int height) {
 	int i;
 	unsigned char local_palette[256], numcolors = *src++;
 	uint h = height;
@@ -1675,8 +1641,7 @@
 }
 
 
-void Gdi::unkDecode11(byte *dst, byte *src, int height)
-{
+void Gdi::unkDecode11(byte *dst, byte *src, int height) {
 	int bits, i;
 	uint buffer = 0, mask = 128;
 	unsigned char inc = 1, color = *src++;
@@ -1719,13 +1684,11 @@
 #undef NEXT_ROW
 #undef READ_256BIT
 
-
 #pragma mark -
 #pragma mark --- Camera ---
 #pragma mark -
 
-void Scumm::setCameraAtEx(int at)
-{
+void Scumm::setCameraAtEx(int at) {
 	if (!(_features & GF_AFTER_V7)) {
 		camera._mode = CM_NORMAL;
 		camera._cur.x = at;
@@ -1734,8 +1697,7 @@
 	}
 }
 
-void Scumm::setCameraAt(int pos_x, int pos_y)
-{
+void Scumm::setCameraAt(int pos_x, int pos_y) {
 	if (_features & GF_AFTER_V7) {
 		ScummPoint old;
 
@@ -1782,8 +1744,7 @@
 	}
 }
 
-void Scumm::setCameraFollows(Actor *a)
-{
+void Scumm::setCameraFollows(Actor *a) {
 	if (_features & GF_AFTER_V7) {
 		byte oldfollow = camera._follows;
 		int ax, ay;
@@ -1830,8 +1791,7 @@
 	}
 }
 
-void Scumm::clampCameraPos(ScummPoint *pt)
-{
+void Scumm::clampCameraPos(ScummPoint *pt) {
 	if (pt->x < _vars[VAR_CAMERA_MIN_X])
 		pt->x = _vars[VAR_CAMERA_MIN_X];
 
@@ -1845,8 +1805,7 @@
 		pt->y = _vars[VAR_CAMERA_MAX_Y];
 }
 
-void Scumm::moveCamera()
-{
+void Scumm::moveCamera() {
 	if (_features & GF_AFTER_V7) {
 		ScummPoint old = camera._cur;
 		Actor *a = NULL;
@@ -2011,8 +1970,7 @@
 	}
 }
 
-void Scumm::cameraMoved()
-{
+void Scumm::cameraMoved() {
 	if (_features & GF_AFTER_V7) {
 
 		assert(camera._cur.x >= (_realWidth / 2) && camera._cur.y >= (_realHeight / 2));
@@ -2045,8 +2003,7 @@
 #endif
 }
 
-void Scumm::panCameraTo(int x, int y)
-{
+void Scumm::panCameraTo(int x, int y) {
 	if (_features & GF_AFTER_V7) {
 
 		camera._follows = 0;
@@ -2060,8 +2017,7 @@
 	}
 }
 
-void Scumm::actorFollowCamera(int act)
-{
+void Scumm::actorFollowCamera(int act) {
 	if (!(_features & GF_AFTER_V7)) {
 		int old;
 
@@ -2086,8 +2042,7 @@
 #pragma mark --- Transition effects ---
 #pragma mark -
 
-void Scumm::fadeIn(int effect)
-{
+void Scumm::fadeIn(int effect) {
 	switch (effect) {
 	case 1:
 	case 2:
@@ -2118,8 +2073,7 @@
 	_screenEffectFlag = true;
 }
 
-void Scumm::fadeOut(int effect)
-{
+void Scumm::fadeOut(int effect) {
 	VirtScreen *vs;
 
 	setDirtyRange(0, 0, 0);
@@ -2173,8 +2127,7 @@
  * All effects operate on 8x8 blocks of the screen. These blocks are updated
  * in a certain order; the exact order determines how the effect appears to the user.
  */
-void Scumm::transitionEffect(int a)
-{
+void Scumm::transitionEffect(int a) {
 	int delta[16];								// Offset applied during each iteration
 	int tab_2[16];
 	int i, j;
@@ -2340,7 +2293,6 @@
 }
 
 void Scumm::scrollEffect(int dir) {
-
 	VirtScreen *vs = &virtscr[0];
 
 	int x, y;
@@ -2435,8 +2387,7 @@
 	warning("stub unkScreenEffect(%d)", a);
 }
 
-void Scumm::setShake(int mode)
-{
+void Scumm::setShake(int mode) {
 	if (_shakeEnabled != (mode != 0))
 		_fullRedraw = true;
 
@@ -2449,8 +2400,7 @@
 #pragma mark --- Palette ---
 #pragma mark -
 
-void Scumm::setPaletteFromPtr(byte *ptr)
-{
+void Scumm::setPaletteFromPtr(byte *ptr) {
 	int i;
 	byte *dest, r, g, b;
 	int numcolor;
@@ -2491,24 +2441,20 @@
 	setDirtyColors(0, numcolor - 1);
 }
 
-void Scumm::setPaletteFromRes()
-{
+void Scumm::setPaletteFromRes() {
 	byte *ptr;
 	ptr = getResourceAddress(rtRoom, _roomResource) + _CLUT_offs;
 	setPaletteFromPtr(ptr);
 }
 
-
-void Scumm::setDirtyColors(int min, int max)
-{
+void Scumm::setDirtyColors(int min, int max) {
 	if (_palDirtyMin > min)
 		_palDirtyMin = min;
 	if (_palDirtyMax < max)
 		_palDirtyMax = max;
 }
 
-void Scumm::initCycl(byte *ptr)
-{
+void Scumm::initCycl(byte *ptr) {
 	int j;
 	ColorCycle *cycl;
 
@@ -2531,8 +2477,7 @@
 	}
 }
 
-void Scumm::stopCycle(int i)
-{
+void Scumm::stopCycle(int i) {
 	ColorCycle *cycl;
 
 	checkRange(16, 0, i, "Stop Cycle %d Out Of Range");
@@ -2545,8 +2490,7 @@
 		cycl->delay = 0;
 }
 
-void Scumm::cyclePalette()
-{
+void Scumm::cyclePalette() {
 	ColorCycle *cycl;
 	int valueToAdd;
 	int i, num;
@@ -2588,8 +2532,7 @@
 
 // Perform color cycling on the palManipulate data, too, otherwise
 // color cycling will be disturbed by the palette fade.
-void Scumm::moveMemInPalRes(int start, int end, byte direction)
-{
+void Scumm::moveMemInPalRes(int start, int end, byte direction) {
 	byte *startptr, *endptr;
 	byte *startptr2, *endptr2;
 	int num;
@@ -2626,8 +2569,7 @@
 	}
 }
 
-void Scumm::palManipulateInit(int start, int end, int string_id, int time)
-{
+void Scumm::palManipulateInit(int start, int end, int string_id, int time) {
 	byte *pal, *target, *between;
 	byte *string1, *string2, *string3;
 	int i;
@@ -2662,19 +2604,18 @@
 		*target++ = *string1++;
 		*target++ = *string2++;
 		*target++ = *string3++;
-		*(uint16*)between = ((uint16) *pal++) << 8;
+		*(uint16 *)between = ((uint16) *pal++) << 8;
 		between += 2;
-		*(uint16*)between = ((uint16) *pal++) << 8;
+		*(uint16 *)between = ((uint16) *pal++) << 8;
 		between += 2;
-		*(uint16*)between = ((uint16) *pal++) << 8;
+		*(uint16 *)between = ((uint16) *pal++) << 8;
 		between += 2;
 	}
 
 	_palManipCounter = time;
 }
 
-void Scumm::palManipulate()
-{
+void Scumm::palManipulate() {
 	byte *target, *pal, *between;
 	int i, j;
 
@@ -2700,8 +2641,7 @@
 	_palManipCounter--;
 }
 
-void Scumm::setupShadowPalette(int slot, int redScale, int greenScale, int blueScale, int startColor, int endColor)
-{
+void Scumm::setupShadowPalette(int slot, int redScale, int greenScale, int blueScale, int startColor, int endColor) {
 	byte *table;
 	int i;
 	byte *curpal;
@@ -2727,8 +2667,7 @@
 	}
 }
 
-void Scumm::setupShadowPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor)
-{
+void Scumm::setupShadowPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor) {
 	byte *basepal = getPalettePtr();
 	byte *pal = basepal;
 	byte *compareptr;
@@ -2803,8 +2742,7 @@
 
 /* Yazoo: This function create the specialPalette used for semi-transparency in SamnMax */
 void Scumm::createSpecialPalette(int16 from, int16 to, int16 redScale, int16 greenScale, int16 blueScale,
-			int16 startColor, int16 endColor)
-{
+			int16 startColor, int16 endColor) {
 	byte *palPtr;
 	byte *curPtr;
 	byte *searchPtr;
@@ -2848,8 +2786,7 @@
 	}
 }
 
-void Scumm::darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor)
-{
+void Scumm::darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor) {
 	if (_roomResource == 0) // FIXME - HACK to get COMI demo working
 		return;
 
@@ -2884,8 +2821,7 @@
 	}
 }
 
-int Scumm::remapPaletteColor(int r, int g, int b, uint threshold)
-{
+int Scumm::remapPaletteColor(int r, int g, int b, uint threshold) {
 	int i;
 	int ar, ag, ab;
 	uint sum, bestsum, bestitem = 0;
@@ -2934,8 +2870,7 @@
 	return bestitem;
 }
 
-void Scumm::swapPalColors(int a, int b)
-{
+void Scumm::swapPalColors(int a, int b) {
 	byte *ap, *bp;
 	byte t;
 
@@ -2959,8 +2894,7 @@
 	setDirtyColors(b, b);
 }
 
-void Scumm::copyPalColor(int dst, int src)
-{
+void Scumm::copyPalColor(int dst, int src) {
 	byte *dp, *sp;
 
 	if ((uint) dst >= 256 || (uint) src >= 256)
@@ -2976,16 +2910,14 @@
 	setDirtyColors(dst, dst);
 }
 
-void Scumm::setPalColor(int idx, int r, int g, int b)
-{
+void Scumm::setPalColor(int idx, int r, int g, int b) {
 	_currentPalette[idx * 3 + 0] = r;
 	_currentPalette[idx * 3 + 1] = g;
 	_currentPalette[idx * 3 + 2] = b;
 	setDirtyColors(idx, idx);
 }
 
-void Scumm::setPalette(int palindex)
-{
+void Scumm::setPalette(int palindex) {
 	byte *pals;
 
 	_curPalIndex = palindex;
@@ -2993,8 +2925,7 @@
 	setPaletteFromPtr(pals);
 }
 
-byte *Scumm::findPalInPals(byte *pal, int idx)
-{
+byte *Scumm::findPalInPals(byte *pal, int idx) {
 	byte *offs;
 	uint32 size;
 
@@ -3014,8 +2945,7 @@
 	return offs + READ_LE_UINT32(offs + idx * sizeof(uint32));
 }
 
-byte *Scumm::getPalettePtr()
-{
+byte *Scumm::getPalettePtr() {
 	byte *cptr;
 
 	cptr = getResourceAddress(rtRoom, _roomResource);
@@ -3033,8 +2963,7 @@
 #pragma mark --- Cursor ---
 #pragma mark -
 
-void Scumm::grabCursor(int x, int y, int w, int h)
-{
+void Scumm::grabCursor(int x, int y, int w, int h) {
 	VirtScreen *vs = findVirtScreen(y);
 
 	if (vs == NULL) {
@@ -3046,8 +2975,7 @@
 
 }
 
-void Scumm::grabCursor(byte *ptr, int width, int height)
-{
+void Scumm::grabCursor(byte *ptr, int width, int height) {
 	uint size;
 	byte *dst;
 
@@ -3069,8 +2997,7 @@
 	updateCursor();
 }
 
-void Scumm::useIm01Cursor(byte *im, int w, int h)
-{
+void Scumm::useIm01Cursor(byte *im, int w, int h) {
 	VirtScreen *vs = &virtscr[0];
 
 	w <<= 3;
@@ -3089,16 +3016,14 @@
 	blit(vs->screenPtr + vs->xstart, getResourceAddress(rtBuffer, 5) + vs->xstart, w, h);
 }
 
-void Scumm::setCursor(int cursor)
-{
+void Scumm::setCursor(int cursor) {
 	if (cursor >= 0 && cursor <= 3)
 		_currentCursor = cursor;
 	else
 		warning("setCursor(%d)", cursor);
 }
 
-void Scumm::setCursorHotspot2(int x, int y)
-{
+void Scumm::setCursorHotspot2(int x, int y) {
 	_cursor.hotspotX = x;
 	_cursor.hotspotY = y;
 	// FIXME this hacks around offset cursor in the humongous games
@@ -3108,14 +3033,12 @@
 	}
 }
 
-void Scumm::updateCursor()
-{
+void Scumm::updateCursor() {
 	_system->set_mouse_cursor(_grabbedCursor, _cursor.width, _cursor.height,
-	                                          _cursor.hotspotX, _cursor.hotspotY);
+														_cursor.hotspotX, _cursor.hotspotY);
 }
 
-void Scumm::animateCursor()
-{
+void Scumm::animateCursor() {
 	if (_cursor.animate) {
 		if (!(_cursor.animateIndex & 0x3)) {
 			decompressDefaultCursor((_cursor.animateIndex >> 2) & 3);
@@ -3124,8 +3047,7 @@
 	}
 }
 
-void Scumm::useBompCursor(byte *im, int width, int height)
-{
+void Scumm::useBompCursor(byte *im, int width, int height) {
 	uint size;
 
 	width <<= 3;
@@ -3144,8 +3066,7 @@
 	updateCursor();
 }
 
-void Scumm::decompressDefaultCursor(int idx)
-{
+void Scumm::decompressDefaultCursor(int idx) {
 	int i, j;
 	byte color;
 
@@ -3185,8 +3106,7 @@
 	updateCursor();
 }
 
-void Scumm::makeCursorColorTransparent(int a)
-{
+void Scumm::makeCursorColorTransparent(int a) {
 	int i, size;
 
 	size = _cursor.width * _cursor.height;
@@ -3356,8 +3276,7 @@
 	}
 }
 
-void Scumm::decompressBomp(byte *dst, byte *src, int w, int h)
-{
+void Scumm::decompressBomp(byte *dst, byte *src, int w, int h) {
 	int len, num;
 	byte code, color;
 
@@ -3389,7 +3308,7 @@
 	} while (--h);
 }
 
-void Scumm::drawBomp(BompDrawData * bd, int decode_mode, int mask) {
+void Scumm::drawBomp(BompDrawData *bd, int decode_mode, int mask) {
 	byte skip_y = 128;
 	byte skip_y_new = 0;
 	byte bits;
@@ -3422,8 +3341,8 @@
 		clip_bottom -= tmp_y - bd->outheight;
 	}
 
-	byte * src = bd->dataptr;
-	byte * dst = bd->out + bd->y * bd->outwidth + bd->x + clip_left;
+	byte *src = bd->dataptr;
+	byte *dst = bd->out + bd->y * bd->outwidth + bd->x + clip_left;
 
 	mask_pitch = _realWidth / 8;
 	mask_offset = _screenStartStrip + (bd->y * mask_pitch) + ((bd->x + clip_left) >> 3);

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gfx.h	31 Dec 2002 14:59:05 -0000	1.20
+++ gfx.h	6 Mar 2003 17:57:49 -0000	1.21
@@ -39,7 +39,6 @@
 	bool _movingToActor;
 };
 
-
 struct VirtScreen {		/* Virtual screen areas */
 	int number;
 	uint16 topline;
@@ -74,7 +73,6 @@
 	uint16 width, height;
 	uint16 scaleX, scaleY;
 	uint16 image;
-
 	uint16 mode;
 };
 

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -d -r2.12 -r2.13
--- imuse.cpp	28 Dec 2002 14:40:56 -0000	2.12
+++ imuse.cpp	6 Mar 2003 17:57:50 -0000	2.13
@@ -44,8 +44,6 @@
 #define MDPG_TAG "MDpg"
 #define MDHD_TAG "MDhd"
 
-
-
 // Put IMUSE specific classes here, instead of in a .h file
 // they will only be used from this file, so it will reduce
 // compile time.
@@ -53,7 +51,6 @@
 class IMuseDriver;
 struct Part;
[...1471 lines suppressed...]
 		mc->allNotesOff();
@@ -3701,8 +3527,6 @@
 	}
 }
 
-
-
 ////////////////////////////////////////////////////////////
 //
 // IMuse implementation
@@ -3740,8 +3564,7 @@
 // The IMuse::create method provides a front-end factory
 // for creating IMuseInternal without exposing that class
 // to the client.
-IMuse *IMuse::create (OSystem *syst, MidiDriver *midi, SoundMixer *mixer)
-{
+IMuse *IMuse::create (OSystem *syst, MidiDriver *midi, SoundMixer *mixer) {
 	IMuseInternal *engine = IMuseInternal::create (syst, midi, mixer);
 	if (midi)
 		midi->property (MidiDriver::PROP_SMALLHEADER, (g_scumm->_features & GF_SMALL_HEADER) ? 1 : 0);

Index: instrument.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/instrument.cpp,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -d -r2.10 -r2.11
--- instrument.cpp	16 Jan 2003 11:05:53 -0000	2.10
+++ instrument.cpp	6 Mar 2003 17:57:52 -0000	2.11
@@ -32,7 +32,7 @@
 	  0,   1,   0,   2,   4,   4,   5,   3,  16,  17,  18,  16,  16,  19,  20,  21, // 0x
 	  6,   6,   6,   7,   7,   7,   8, 112,  62,  62,  63,  63,  38,  38,  39,  39, // 1x
 	 88,  95,  52,  98,  97,  99,  14,  54, 102,  96,  53, 102,  81, 100,  14,  80, // 2x
- 	 48,  48,  49,  45,  41,  40,  42,  42,  43,  46,  45,  24,  25,  28,  27, 104, // 3x
+	 48,  48,  49,  45,  41,  40,  42,  42,  43,  46,  45,  24,  25,  28,  27, 104, // 3x
 	 32,  32,  34,  33,  36,  37,  35,  35,  79,  73,  72,  72,  74,  75,  64,  65, // 4x
 	 66,  67,  71,  71,  68,  69,  70,  22,  56,  59,  57,  57,  60,  60,  58,  61, // 5x
 	 61,  11,  11,  98,  14,   9,  14,  13,  12, 107, 107,  77,  78,  78,  76,  76, // 6x
@@ -43,6 +43,7 @@
 	char *name;
 	byte program;
 }
+
 roland_to_gm_map [] = {
 	// Monkey Island 2 instruments
 	// TODO: Complete
@@ -123,8 +124,6 @@
 //	{ "trickle4  ", ??? }
 };
 
-
-
 class Instrument_Program : public InstrumentInternal {
 private:
 	byte _program;
@@ -237,24 +236,20 @@
 	void copy_to (Instrument *dest) { dest->roland ((byte *) &_instrument); }
 };
 
-
-
 ////////////////////////////////////////
 //
 // Instrument class members
 //
 ////////////////////////////////////////
 
-void Instrument::clear()
-{
+void Instrument::clear() {
 	if (_instrument)
 		delete _instrument;
 	_instrument = NULL;
 	_type = itNone;
 }
 
-void Instrument::program (byte prog, bool mt32)
-{
+void Instrument::program (byte prog, bool mt32) {
 	clear();
 	if (prog > 127)
 		return;
@@ -262,8 +257,7 @@
 	_instrument = new Instrument_Program (prog, mt32);
 }
 
-void Instrument::adlib (byte *instrument)
-{
+void Instrument::adlib (byte *instrument) {
 	clear();
 	if (!instrument)
 		return;
@@ -271,8 +265,7 @@
 	_instrument = new Instrument_Adlib (instrument);
 }
 
-void Instrument::roland (byte *instrument)
-{
+void Instrument::roland (byte *instrument) {
 	clear();
 	if (!instrument)
 		return;
@@ -280,8 +273,7 @@
 	_instrument = new Instrument_Roland (instrument);
 }
 
-void Instrument::saveOrLoad (Serializer *s)
-{
+void Instrument::saveOrLoad (Serializer *s) {
 	if (s->isSaving()) {
 		s->saveByte (_type);
 		if (_instrument)
@@ -308,8 +300,6 @@
 	}
 }
 
-
-
 ////////////////////////////////////////
 //
 // Instrument_Program class members
@@ -318,21 +308,18 @@
 
 Instrument_Program::Instrument_Program (byte program, bool mt32) :
 _program (program),
-_mt32 (mt32)
-{
+_mt32 (mt32) {
 	if (program > 127)
 		_program = 255;
 }
 
-Instrument_Program::Instrument_Program (Serializer *s)
-{
+Instrument_Program::Instrument_Program (Serializer *s) {
 	_program = 255;
 	if (!s->isSaving())
 		saveOrLoad (s);
 }
 
-void Instrument_Program::saveOrLoad (Serializer *s)
-{
+void Instrument_Program::saveOrLoad (Serializer *s) {
 	if (s->isSaving()) {
 		s->saveByte (_program);
 		s->saveByte (_mt32 ? 1 : 0);
@@ -342,8 +329,7 @@
 	}
 }
 
-void Instrument_Program::send (MidiChannel *mc)
-{
+void Instrument_Program::send (MidiChannel *mc) {
 	if (_program > 127)
 		return;
 
@@ -353,57 +339,47 @@
 		mc->programChange (_mt32 ? mt32_to_gm [_program] : _program);
 }
 
-
-
 ////////////////////////////////////////
 //
 // Instrument_Adlib class members
 //
 ////////////////////////////////////////
 
-Instrument_Adlib::Instrument_Adlib (byte *data)
-{
+Instrument_Adlib::Instrument_Adlib (byte *data) {
 	memcpy (&_instrument, data, sizeof (_instrument));
 }
 
-Instrument_Adlib::Instrument_Adlib (Serializer *s)
-{
+Instrument_Adlib::Instrument_Adlib (Serializer *s) {
 	if (!s->isSaving())
 		saveOrLoad (s);
 	else
 		memset (&_instrument, 0, sizeof (_instrument));
 }
 
-void Instrument_Adlib::saveOrLoad (Serializer *s)
-{
+void Instrument_Adlib::saveOrLoad (Serializer *s) {
 	if (s->isSaving())
 		s->saveBytes (&_instrument, sizeof (_instrument));
 	else
 		s->loadBytes (&_instrument, sizeof (_instrument));
 }
 
-void Instrument_Adlib::send (MidiChannel *mc)
-{
+void Instrument_Adlib::send (MidiChannel *mc) {
 	mc->sysEx_customInstrument ('ADL ', (byte *) &_instrument);
 }
 
-
-
 ////////////////////////////////////////
 //
 // Instrument_Roland class members
 //
 ////////////////////////////////////////
 
-Instrument_Roland::Instrument_Roland (byte *data)
-{
+Instrument_Roland::Instrument_Roland (byte *data) {
 	memcpy (&_instrument, data, sizeof (_instrument));
 	memcpy (&_instrument_name, &_instrument.common.name, sizeof (_instrument.common.name));
 	_instrument_name[10] = '\0';
 }
 
-Instrument_Roland::Instrument_Roland (Serializer *s)
-{
+Instrument_Roland::Instrument_Roland (Serializer *s) {
 	_instrument_name[0] = '\0';
 	if (!s->isSaving())
 		saveOrLoad (s);
@@ -411,8 +387,7 @@
 		memset (&_instrument, 0, sizeof (_instrument));
 }
 
-void Instrument_Roland::saveOrLoad (Serializer *s)
-{
+void Instrument_Roland::saveOrLoad (Serializer *s) {
 	if (s->isSaving())
 		s->saveBytes (&_instrument, sizeof (_instrument));
 	else
@@ -421,8 +396,7 @@
 	_instrument_name[10] = '\0';
 }
 
-void Instrument_Roland::send (MidiChannel *mc)
-{
+void Instrument_Roland::send (MidiChannel *mc) {
 	if (NATIVE_MT32) { // if (mc->device()->mt32device()) {
 		_instrument.device_id = mc->getNumber();
 		mc->device()->sysEx ((byte *) &_instrument, sizeof (_instrument));

Index: instrument.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/instrument.h,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -d -r2.4 -r2.5
--- instrument.h	10 Jan 2003 14:40:19 -0000	2.4
+++ instrument.h	6 Mar 2003 17:57:52 -0000	2.5
@@ -27,10 +27,7 @@
 
 class Serializer;
 class MidiChannel;
-
 class Instrument;
-
-
 
 class InstrumentInternal {
 public:

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.42
retrieving revision 2.43
diff -u -d -r2.42 -r2.43
--- intern.h	3 Mar 2003 10:19:27 -0000	2.42
+++ intern.h	6 Mar 2003 17:57:53 -0000	2.43
@@ -26,8 +26,7 @@
 #include "scumm.h"
 class NutRenderer; // V8 Font Renderer
 
-class Scumm_v5 : public Scumm
-{
+class Scumm_v5 : public Scumm {
 protected:
 	typedef void (Scumm_v5::*OpcodeProcV5)();
 	struct OpcodeEntryV5 {
@@ -36,7 +35,7 @@
 	};
 	
 	const OpcodeEntryV5 *_opcodesV5;
-	
+
 public:
 	Scumm_v5(GameDetector *detector, OSystem *syst) : Scumm(detector, syst) {}
 
@@ -154,13 +153,12 @@
 	void o5_walkActorTo();
 	void o5_walkActorToActor();
 	void o5_walkActorToObject();
-    void o5_oldRoomEffect();
+	void o5_oldRoomEffect();
 	void o5_pickupObjectOld();
 };
 
 // FIXME - subclassing V2 from Scumm_v5 is a hack: V2 should have its own opcode table
-class Scumm_v2 : public Scumm_v5
-{
+class Scumm_v2 : public Scumm_v5 {
 public:
 	Scumm_v2(GameDetector *detector, OSystem *syst) : Scumm_v5(detector, syst) {}
 
@@ -170,8 +168,7 @@
 // FIXME - maybe we should move the opcodes from v5 to v3, and change the inheritance 
 // accordingly - that would be more logical I guess. However, if you do so, take care
 // of preserving the right readIndexFile / loadCharset !!!
-class Scumm_v3 : public Scumm_v5
-{
+class Scumm_v3 : public Scumm_v5 {
 public:
 	Scumm_v3(GameDetector *detector, OSystem *syst) : Scumm_v5(detector, syst) {}
 
@@ -179,16 +176,14 @@
 	virtual void loadCharset(int no);
 };
 
-class Scumm_v4 : public Scumm_v3
-{
+class Scumm_v4 : public Scumm_v3 {
 public:
 	Scumm_v4(GameDetector *detector, OSystem *syst) : Scumm_v3(detector, syst) {}
 
 	void loadCharset(int no);
 };
 
-class Scumm_v6 : public Scumm
-{
+class Scumm_v6 : public Scumm {
 protected:
 	typedef void (Scumm_v6::*OpcodeProcV6)();
 	struct OpcodeEntryV6 {
@@ -389,8 +384,7 @@
 	byte VAR_TIMEDATE_SECOND;
 };
 
-class Scumm_v7 : public Scumm_v6
-{
+class Scumm_v7 : public Scumm_v6 {
 public:
 	Scumm_v7(GameDetector *detector, OSystem *syst) : Scumm_v6(detector, syst) {}
 
@@ -398,8 +392,7 @@
 	virtual void setupScummVars();
 };
 
-class Scumm_v8 : public Scumm_v6
-{
+class Scumm_v8 : public Scumm_v6 {
 protected:
 	typedef void (Scumm_v8::*OpcodeProcV8)();
 	struct OpcodeEntryV8 {

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- object.cpp	5 Mar 2003 11:39:27 -0000	1.65
+++ object.cpp	6 Mar 2003 17:57:53 -0000	1.66
@@ -49,7 +49,6 @@
 	cls &= 0x7F;
 	checkRange(32, 1, cls, "Class %d out of range in putClass");
 
-
 	if (_features & GF_SMALL_HEADER) {
 		if (cls == 31)							// CLASS_PLAYERONLY
 			cls = 23;
@@ -75,40 +74,34 @@
 	}
 }
 
-int Scumm::getOwner(int obj)
-{
+int Scumm::getOwner(int obj) {
 	checkRange(_numGlobalObjects - 1, 0, obj, "Object %d out of range in getOwner");
 	return _objectOwnerTable[obj];
 }
 
-void Scumm::putOwner(int obj, int owner)
-{
+void Scumm::putOwner(int obj, int owner) {
 	checkRange(_numGlobalObjects - 1, 0, obj, "Object %d out of range in putOwner");
 	checkRange(0xFF, 0, owner, "Owner %d out of range in putOwner");
 	_objectOwnerTable[obj] = owner;
 }
 
-int Scumm::getState(int obj)
-{
+int Scumm::getState(int obj) {
 	checkRange(_numGlobalObjects - 1, 0, obj, "Object %d out of range in getState");
 	return _objectStateTable[obj];
 }
 
-void Scumm::putState(int obj, int state)
-{
+void Scumm::putState(int obj, int state) {
 	checkRange(_numGlobalObjects - 1, 0, obj, "Object %d out of range in putState");
 	checkRange(0xFF, 0, state, "State %d out of range in putState");
 	_objectStateTable[obj] = state;
 }
 
-int Scumm::getObjectRoom(int obj)
-{
+int Scumm::getObjectRoom(int obj) {
 	checkRange(_numGlobalObjects - 1, 0, obj, "Object %d out of range in getObjectRoom");
 	return _objectRoomTable[obj];
 }
 
-int Scumm::getObjectIndex(int object)
-{
+int Scumm::getObjectIndex(int object) {
 	int i;
 
 	if (object < 1)
@@ -129,8 +122,7 @@
 	}
 }
 
-int Scumm::whereIsObject(int object)
-{
+int Scumm::whereIsObject(int object) {
 	int i;
 
 	if (object >= _numGlobalObjects)
@@ -156,8 +148,7 @@
 	return WIO_NOT_FOUND;
 }
 
-int Scumm::getObjectOrActorXY(int object, int &x, int &y)
-{
+int Scumm::getObjectOrActorXY(int object, int &x, int &y) {
 	if (object < NUM_ACTORS) {
 		Actor *act = derefActorSafe(object, "getObjectOrActorXY");
 		if (!act) 
@@ -182,8 +173,7 @@
 /* Return the position of an object.
    Returns X, Y and direction in angles
  */
-void Scumm::getObjectXYPos(int object, int &x, int &y, int &dir)
-{
+void Scumm::getObjectXYPos(int object, int &x, int &y, int &dir) {
 	ObjectData *od = &_objs[getObjectIndex(object)];
 	int state;
 	byte *ptr;
@@ -223,8 +213,7 @@
 		dir = oldDirToNewDir(od->actordir & 3);
 }
 
-int Scumm::getObjActToObjActDist(int a, int b)
-{
+int Scumm::getObjActToObjActDist(int a, int b) {
 	int x, y, x2, y2;
 	Actor *acta = NULL;
 	Actor *actb = NULL;
@@ -258,8 +247,7 @@
 	return x;
 }
 
-int Scumm::findObject(int x, int y)
-{
+int Scumm::findObject(int x, int y) {
 	int i, b;
 	byte a;
 
@@ -281,8 +269,7 @@
 	return 0;
 }
 
-void Scumm::drawRoomObject(int i, int arg)
-{
+void Scumm::drawRoomObject(int i, int arg) {
 	ObjectData *od;
 	byte a;
 
@@ -300,8 +287,7 @@
 	} while (od->state == a);
 }
 
-void Scumm::drawRoomObjects(int arg)
-{
+void Scumm::drawRoomObjects(int arg) {
 	int i;
 
 	if (_features & GF_DRAWOBJ_OTHER_ORDER) {
@@ -334,8 +320,7 @@
 	MKID('IM0F')
 };
 
-void Scumm::drawObject(int obj, int arg)
-{
+void Scumm::drawObject(int obj, int arg) {
 	ObjectData *od;
 	int xpos, ypos, height, width;
 	byte *ptr;
@@ -413,8 +398,7 @@
 	}
 }
 
-void Scumm::clearRoomObjects()
-{
+void Scumm::clearRoomObjects() {
 	int i;
 
 	if (_features & GF_SMALL_HEADER) {
@@ -442,8 +426,7 @@
 	}
 }
 
-void Scumm::loadRoomObjects()
-{
+void Scumm::loadRoomObjects() {
 	int i, j;
 	ObjectData *od;
 	byte *ptr;
@@ -537,8 +520,7 @@
 	CHECK_HEAP
 }
 
-void Scumm::loadRoomObjectsSmall()
-{
+void Scumm::loadRoomObjectsSmall() {
 	int i, j;
 	ObjectData *od;
 	byte *ptr;
@@ -600,8 +582,7 @@
 	CHECK_HEAP
 }
 
-void Scumm::setupRoomObject(ObjectData *od, byte *room, byte *searchptr)
-{
+void Scumm::setupRoomObject(ObjectData *od, byte *room, byte *searchptr) {
 	CodeHeader *cdhd = NULL;
 	ImageHeader *imhd = NULL;
 
@@ -708,8 +689,7 @@
 	od->fl_object_index = 0;
 }
 
-void Scumm::fixObjectFlags()
-{
+void Scumm::fixObjectFlags() {
 	int i;
 	ObjectData *od = &_objs[1];
 	for (i = 1; i < _numLocalObjects; i++, od++) {
@@ -718,8 +698,7 @@
 	}
 }
 
-void Scumm::processDrawQue()
-{
+void Scumm::processDrawQue() {
 	int i, j;
 	for (i = 0; i < _drawObjectQueNr; i++) {
 		j = _drawObjectQue[i];
@@ -729,8 +708,7 @@
 	_drawObjectQueNr = 0;
 }
 
-void Scumm::clearOwnerOf(int obj)
-{
+void Scumm::clearOwnerOf(int obj) {
 	int i, j;
 	uint16 *a;
 
@@ -771,8 +749,7 @@
 	}
 }
 
-void Scumm::removeObjectFromRoom(int obj)
-{
+void Scumm::removeObjectFromRoom(int obj) {
 	int i, j, strip;
 
 	for (i = 1; i < _numLocalObjects; i++) {
@@ -796,20 +773,17 @@
 	}
 }
 
-void Scumm::addObjectToDrawQue(int object)
-{
+void Scumm::addObjectToDrawQue(int object) {
 	_drawObjectQue[_drawObjectQueNr++] = object;
 	if ((unsigned int)_drawObjectQueNr > sizeof(_drawObjectQue) / sizeof(_drawObjectQue[0]))
 		error("Draw Object Que overflow");
 }
 
-void Scumm::clearDrawObjectQueue()
-{
+void Scumm::clearDrawObjectQueue() {
 	_drawObjectQueNr = 0;
 }
 
-byte *Scumm::getObjOrActorName(int obj)
-{
+byte *Scumm::getObjOrActorName(int obj) {
 	byte *objptr;
 	int i;
 
@@ -842,8 +816,7 @@
 	return findResourceData(MKID('OBNA'), objptr);
 }
 
-uint32 Scumm::getOBCDOffs(int object)
-{
+uint32 Scumm::getOBCDOffs(int object) {
 	int i;
 
 	if (_objectOwnerTable[object] != OF_OWNER_ROOM)
@@ -858,8 +831,7 @@
 	return 0;
 }
 
-byte *Scumm::getOBCDFromObject(int obj)
-{
+byte *Scumm::getOBCDFromObject(int obj) {
 	int i;
 
 	if (_objectOwnerTable[obj] != OF_OWNER_ROOM) {
@@ -882,8 +854,7 @@
 	return 0;
 }
 
-void Scumm::addObjectToInventory(uint obj, uint room)
-{
+void Scumm::addObjectToInventory(uint obj, uint room) {
 	int i, slot;
 	uint32 size;
 	byte *ptr, *dst;
@@ -916,8 +887,7 @@
 	CHECK_HEAP
 }
 
-void Scumm::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id, uint room)
-{
+void Scumm::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id, uint room) {
 	CodeHeader *cdhd;
 	int i, numobj;
 	byte *roomptr, *obcdptr, *obimptr, *searchptr;
@@ -1023,8 +993,7 @@
 	}
 }
 
-int Scumm::getInventorySlot()
-{
+int Scumm::getInventorySlot() {
 	int i;
 	for (i = 1; i <= _maxInventoryItems; i++) {
 		if (_inventory[i] == 0)
@@ -1034,8 +1003,8 @@
 	return -1;
 }
 
-void Scumm::SamInventoryHack(int obj)
-{																// FIXME: Sam and Max hack
+void Scumm::SamInventoryHack(int obj) {
+	// FIXME: Sam and Max hack
 	int base = 6;
 
 	while (base < 80) {
@@ -1051,8 +1020,7 @@
 	}
 }
 
-void Scumm::setOwnerOf(int obj, int owner)
-{
+void Scumm::setOwnerOf(int obj, int owner) {
 	ScriptSlot *ss;
 	if (owner == 0) {
 		clearOwnerOf(obj);
@@ -1071,8 +1039,7 @@
 	runHook(0);
 }
 
-int Scumm::getObjX(int obj)
-{
+int Scumm::getObjX(int obj) {
 	if (obj < NUM_ACTORS) {
 		if (obj < 1)
 			return 0;									/* fix for indy4's map */
@@ -1086,8 +1053,7 @@
 	}
 }
 
-int Scumm::getObjY(int obj)
-{
+int Scumm::getObjY(int obj) {
 	if (obj < NUM_ACTORS) {
 		if (obj < 1)
 			return 0;									/* fix for indy4's map */
@@ -1101,8 +1067,7 @@
 	}
 }
 
-int Scumm::getObjOldDir(int obj)
-{
+int Scumm::getObjOldDir(int obj) {
 	if (obj < NUM_ACTORS) {
 		return newDirToOldDir(derefActorSafe(obj, "getObjOldDir")->facing);
 	} else {
@@ -1112,8 +1077,7 @@
 	}
 }
 
-int Scumm::getObjNewDir(int obj)
-{
+int Scumm::getObjNewDir(int obj) {
 	if (obj < NUM_ACTORS) {
 		return derefActorSafe(obj, "getObjNewDir")->facing;
 	} else {
@@ -1123,8 +1087,7 @@
 	}
 }
 
-int Scumm::findInventory(int owner, int idx)
-{
+int Scumm::findInventory(int owner, int idx) {
 	int count = 1, i, obj;
 	for (i = 0; i != _maxInventoryItems; i++) {
 		obj = _inventory[i];
@@ -1134,8 +1097,7 @@
 	return 0;
 }
 
-int Scumm::getInventoryCount(int owner)
-{
+int Scumm::getInventoryCount(int owner) {
 	int i, obj;
 	int count = 0;
 	for (i = 0; i != _maxInventoryItems; i++) {
@@ -1146,8 +1108,7 @@
 	return count;
 }
 
-void Scumm::setObjectState(int obj, int state, int x, int y)
-{
+void Scumm::setObjectState(int obj, int state, int x, int y) {
 	int i;
 
 	i = getObjectIndex(obj);
@@ -1165,8 +1126,7 @@
 	putState(obj, state);
 }
 
-static int getDist(int x, int y, int x2, int y2)
-{
+static int getDist(int x, int y, int x2, int y2) {
 	int a = abs(y - y2);
 	int b = abs(x - x2);
 	if (a > b)
@@ -1174,8 +1134,7 @@
 	return b;
 }
 
-int Scumm::getDistanceBetween(bool is_obj_1, int b, int c, bool is_obj_2, int e, int f)
-{
+int Scumm::getDistanceBetween(bool is_obj_1, int b, int c, bool is_obj_2, int e, int f) {
 	int i, j;
 	int x, y;
 	int x2, y2;
@@ -1205,8 +1164,7 @@
 	return getDist(x, y, x2, y2) * 0xFF / ((i + j) >> 1);
 }
 
-void Scumm::setCursorImg(uint img, uint room, uint imgindex)
-{
+void Scumm::setCursorImg(uint img, uint room, uint imgindex) {
 	int w, h;
 	byte *dataptr, *bomp;
 	uint32 size;
@@ -1269,8 +1227,7 @@
 
 }
 
-void Scumm::nukeFlObjects(int min, int max)
-{
+void Scumm::nukeFlObjects(int min, int max) {
 	ObjectData *od;
 	int i;
 
@@ -1285,8 +1242,7 @@
 }
 
 void Scumm::enqueueObject(int objectNumber, int objectX, int objectY, int objectWidth,
-                          int objectHeight, int scaleX, int scaleY, int image, int mode)
-{
+													int objectHeight, int scaleX, int scaleY, int image, int mode) {
 	BlastObject *eo;
 	ObjectData *od;
 
@@ -1319,8 +1275,7 @@
 	eo->mode = mode;
 }
 
-void Scumm::drawBlastObjects()
-{
+void Scumm::drawBlastObjects() {
 	BlastObject *eo;
 	int i;
 
@@ -1330,8 +1285,7 @@
 	}
 }
 
-void Scumm::drawBlastObject(BlastObject *eo)
-{
+void Scumm::drawBlastObject(BlastObject *eo) {
 	VirtScreen *vs;
 	byte *bomp, *ptr;
 	int idx, objnum;
@@ -1428,7 +1382,7 @@
 	updateDirtyRect(vs->number, bdd.x, bdd.x + bdd.srcwidth, bdd.y, bdd.y + bdd.srcheight, 0);
 }
 
-byte _bompScaleTable[] =	{
+byte _bompScaleTable[] = {
     0, 128,  64, 192,  32, 160,  96, 224,
    16, 144,  80, 208,  48, 176, 112, 240,
     8, 136,  72, 200,  40, 168, 104, 232,
@@ -1497,22 +1451,22 @@
 };
 
 byte _bompBitsTable[] = {
-  8, 7, 7, 6, 7, 6, 6, 5, 7, 6, 6, 5, 6, 5, 5, 4,
-  7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
-  7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
-  6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
-  7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
-  6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
-  6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
-  5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
-  7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
-  6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
-  6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
-  5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
-  6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
-  5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
-  5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
-  4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0,
+	8, 7, 7, 6, 7, 6, 6, 5, 7, 6, 6, 5, 6, 5, 5, 4,
+	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
+	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
+	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
+	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
+	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
+	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
+	5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
+	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
+	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
+	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
+	5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
+	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
+	5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
+	5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
+	4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0,
 };
 
 int32 Scumm::setupBompScale(byte * scalling, int32 size, byte scale) {
@@ -1582,8 +1536,7 @@
 	return ret_value;
 }
 
-void Scumm::removeBlastObjects()
-{
+void Scumm::removeBlastObjects() {
 	BlastObject *eo;
 	int i;
 
@@ -1595,8 +1548,7 @@
 	clearEnqueue();
 }
 
-void Scumm::removeBlastObject(BlastObject *eo)
-{
+void Scumm::removeBlastObject(BlastObject *eo) {
 	VirtScreen *vs = &virtscr[0];
 
 	int top, bottom, left, right;
@@ -1638,8 +1590,7 @@
 	updateDirtyRect(0, left, right, top, bottom, USAGE_BIT_RESTORED);
 }
 
-int Scumm::findLocalObjectSlot()
-{
+int Scumm::findLocalObjectSlot() {
 	int i;
 
 	for (i = 1; i < _numLocalObjects; i++) {
@@ -1650,8 +1601,7 @@
 	return -1;
 }
 
-int Scumm::findFlObjectSlot()
-{
+int Scumm::findFlObjectSlot() {
 	int i;
 	for (i = 1; i < _maxFLObject; i++) {
 		if (_baseFLObject[i] == NULL)
@@ -1661,8 +1611,7 @@
 	return -1;
 }
 
-void Scumm::loadFlObject(uint object, uint room)
-{
+void Scumm::loadFlObject(uint object, uint room) {
 	FindObjectInRoom foir;
 	int slot, objslot;
 	ObjectData *od;

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- resource.cpp	26 Jan 2003 06:17:25 -0000	1.54
+++ resource.cpp	6 Mar 2003 17:57:55 -0000	1.55
@@ -33,8 +33,7 @@
 uint16 newTag2Old(uint32 oldTag);
 
 /* Open a room */
-void Scumm::openRoom(int room)
-{
+void Scumm::openRoom(int room) {
 	int room_offs, roomlimit;
 	char buf[256];
 
@@ -131,8 +130,7 @@
 	_fileOffset = 0;		// start of file
 }
 
-void Scumm::closeRoom()
-{
+void Scumm::closeRoom() {
 	if (_lastLoadedRoom != -1) {
 		_lastLoadedRoom = -1;
 		_encbyte = 0;
@@ -142,8 +140,7 @@
 }
 
 /* Delete the currently loaded room offsets */
-void Scumm::deleteRoomOffsets()
-{
+void Scumm::deleteRoomOffsets() {
 	if (!(_features & GF_SMALL_HEADER) && !_dynamicRoomOffsets)
 		return;
 
@@ -154,8 +151,7 @@
 }
 
 /* Read room offsets */
-void Scumm::readRoomsOffsets()
-{
+void Scumm::readRoomsOffsets() {
 	int num, room;
 
 	debug(9, "readRoomOffsets()");
@@ -184,8 +180,7 @@
 	}
 }
 
-bool Scumm::openResourceFile(const char *filename)
-{
+bool Scumm::openResourceFile(const char *filename) {
 	char buf[256];
 
 	debug(9, "openResourceFile(%s)", filename);
@@ -200,8 +195,7 @@
 	return _fileHandle.isOpen();
 }
 
-void Scumm::askForDisk(const char *filename, int disknum)
-{
+void Scumm::askForDisk(const char *filename, int disknum) {
 	char buf[128];
 
 	if (_features & GF_AFTER_V8) {
@@ -221,8 +215,7 @@
 	}
 }
 
-void Scumm::readIndexFile()
-{
+void Scumm::readIndexFile() {
 	uint32 blocktype, itemsize;
 	int numblock = 0;
 	int num, i;
@@ -383,8 +376,7 @@
 	closeRoom();
 }
 
-void Scumm::readArrayFromIndexFile()
-{
+void Scumm::readArrayFromIndexFile() {
 	int num;
 	int a, b, c;
 
@@ -417,8 +409,7 @@
 	}
 }
 
-void Scumm::readResTypeList(int id, uint32 tag, const char *name)
-{
+void Scumm::readResTypeList(int id, uint32 tag, const char *name) {
 	int num;
 	int i;
 
@@ -468,9 +459,7 @@
 	}
 }
 
-
-void Scumm::allocResTypeData(int id, uint32 tag, int num, const char *name, int mode)
-{
+void Scumm::allocResTypeData(int id, uint32 tag, int num, const char *name, int mode) {
 	debug(9, "allocResTypeData(%s/%s,%x,%d,%d)", resTypeFromId(id), name, FROM_LE_32(tag), num, mode);
 	assert(id >= 0 && id < (int)(sizeof(res.mode) / sizeof(res.mode[0])));
 
@@ -491,8 +480,7 @@
 	}
 }
 
-void Scumm::loadCharset(int no)
-{
+void Scumm::loadCharset(int no) {
 	int i;
 	byte *ptr;
 
@@ -515,14 +503,12 @@
 	}
 }
 
-void Scumm::nukeCharset(int i)
-{
+void Scumm::nukeCharset(int i) {
 	checkRange(_maxCharsets - 1, 1, i, "Nuking illegal charset %d");
 	nukeResource(rtCharset, i);
 }
 
-void Scumm::ensureResourceLoaded(int type, int i)
-{
+void Scumm::ensureResourceLoaded(int type, int i) {
 	void *addr;
 
 	debug(9, "ensureResourceLoaded(%s,%d)", resTypeFromId(type), i);
@@ -545,8 +531,7 @@
 			_vars[VAR_ROOM_FLAG] = 1;
 }
 
-int Scumm::loadResource(int type, int idx)
-{
+int Scumm::loadResource(int type, int idx) {
 	int roomNr;
 	uint32 fileOffs;
 	uint32 size, tag;
@@ -626,8 +611,7 @@
 	error("Cannot read resource");
 }
 
-int Scumm::readSoundResource(int type, int idx)
-{
+int Scumm::readSoundResource(int type, int idx) {
 	uint32 pos, total_size, size, tag, basetag;
 	int pri, best_pri;
 	uint32 best_size = 0, best_offs = 0;
@@ -915,8 +899,7 @@
 	"\x04\x00\x00\xf7"
 	"\x00\xb7\x07\x64";     // Controller 7 = 100
 
-int Scumm::readSoundResourceSmallHeader(int type, int idx)
-{
+int Scumm::readSoundResourceSmallHeader(int type, int idx) {
 	uint32 pos, total_size, size, dw, tag;
 	uint32 best_size = 0, best_offs = 0;
 	byte *ptr, *track, *instr;
@@ -1104,15 +1087,13 @@
 }
 
 
-int Scumm::getResourceRoomNr(int type, int idx)
-{
+int Scumm::getResourceRoomNr(int type, int idx) {
 	if (type == rtRoom)
 		return idx;
 	return res.roomno[type][idx];
 }
 
-byte *Scumm::getResourceAddress(int type, int idx)
-{
+byte *Scumm::getResourceAddress(int type, int idx) {
 	byte *ptr;
 
 	CHECK_HEAP
@@ -1139,8 +1120,7 @@
 	return ptr + sizeof(MemBlkHeader);
 }
 
-byte *Scumm::getStringAddress(int i)
-{
+byte *Scumm::getStringAddress(int i) {
 	byte *b = getResourceAddress(rtString, i);
 	if (!b)
 		return NULL;
@@ -1150,10 +1130,7 @@
 	return b;
 }
 
-
-
-byte *Scumm::getStringAddressVar(int i)
-{
+byte *Scumm::getStringAddressVar(int i) {
 	byte *addr;
 
 	addr = getResourceAddress(rtString, _vars[i]);
@@ -1166,8 +1143,7 @@
 	return (addr);
 }
 
-void Scumm::setResourceCounter(int type, int idx, byte flag)
-{
+void Scumm::setResourceCounter(int type, int idx, byte flag) {
 	res.flags[type][idx] &= ~RF_USAGE;
 	res.flags[type][idx] |= flag;
 }
@@ -1175,8 +1151,7 @@
 /* 2 bytes safety area to make "precaching" of bytes in the gdi drawer easier */
 #define SAFETY_AREA 2
 
-byte *Scumm::createResource(int type, int idx, uint32 size)
-{
+byte *Scumm::createResource(int type, int idx, uint32 size) {
 	byte *ptr;
 
 	CHECK_HEAP
@@ -1202,8 +1177,7 @@
 	return ptr + sizeof(MemBlkHeader);	/* skip header */
 }
 
-bool Scumm::validateResource(const char *str, int type, int idx)
-{
+bool Scumm::validateResource(const char *str, int type, int idx) {
 	if (type < rtFirst || type > rtLast || (uint) idx >= (uint) res.num[type]) {
 		warning("%s Illegal Glob type %s (%d) num %d", str, resTypeFromId(type), type, idx);
 		return false;
@@ -1211,8 +1185,7 @@
 	return true;
 }
 
-void Scumm::nukeResource(int type, int idx)
-{
+void Scumm::nukeResource(int type, int idx) {
 	byte *ptr;
 
 	CHECK_HEAP
@@ -1230,8 +1203,7 @@
 	}
 }
 
-byte *Scumm::findResourceData(uint32 tag, byte *ptr)
-{
+byte *Scumm::findResourceData(uint32 tag, byte *ptr) {
 	if (_features & GF_SMALL_HEADER)
 		ptr = findResourceSmall(tag, ptr, 0);
 	else
@@ -1242,8 +1214,7 @@
 	return ptr + _resourceHeaderSize;
 }
 
-int Scumm::getResourceDataSize(byte *ptr)
-{
+int Scumm::getResourceDataSize(byte *ptr) {
 	if (ptr == NULL)
 		return 0;
 
@@ -1259,8 +1230,7 @@
 };
 
 /* just O(N) complexity when iterating with this function */
-byte *findResource(uint32 tag, byte *searchin)
-{
+byte *findResource(uint32 tag, byte *searchin) {
 	uint32 size;
 	static FindResourceState frs;
 	FindResourceState *f = &frs;	/* easier to make it thread safe like this */
@@ -1288,8 +1258,7 @@
 	return f->ptr;
 }
 
-byte *findResourceSmall(uint32 tag, byte *searchin)
-{
+byte *findResourceSmall(uint32 tag, byte *searchin) {
 	uint32 size;
 	static FindResourceState frs;
 	FindResourceState *f = &frs;	/* easier to make it thread safe like this */
@@ -1320,8 +1289,7 @@
 	return f->ptr;
 }
 
-byte *findResource(uint32 tag, byte *searchin, int idx)
-{
+byte *findResource(uint32 tag, byte *searchin, int idx) {
 	uint32 curpos, totalsize, size;
 
 	assert(searchin);
@@ -1349,8 +1317,7 @@
 	return NULL;
 }
 
-byte *findResourceSmall(uint32 tag, byte *searchin, int idx)
-{
+byte *findResourceSmall(uint32 tag, byte *searchin, int idx) {
 	uint32 curpos, totalsize, size;
 	uint16 smallTag;
 
@@ -1381,8 +1348,7 @@
 	return NULL;
 }
 
-void Scumm::lock(int type, int i)
-{
+void Scumm::lock(int type, int i) {
 	if (!validateResource("Locking", type, i))
 		return;
 	res.flags[type][i] |= RF_LOCK;
@@ -1390,8 +1356,7 @@
 //  debug(1, "locking %d,%d", type, i);
 }
 
-void Scumm::unlock(int type, int i)
-{
+void Scumm::unlock(int type, int i) {
 	if (!validateResource("Unlocking", type, i))
 		return;
 	res.flags[type][i] &= ~RF_LOCK;
@@ -1419,8 +1384,7 @@
 	}
 }
 
-void Scumm::increaseResourceCounter()
-{
+void Scumm::increaseResourceCounter() {
 	int i, j;
 	byte counter;
 
@@ -1434,8 +1398,7 @@
 	}
 }
 
-void Scumm::expireResources(uint32 size)
-{
+void Scumm::expireResources(uint32 size) {
 	int i, j;
 	byte flag;
 	byte best_counter;
@@ -1480,8 +1443,7 @@
 	debug(5, "Expired resources, mem %d -> %d", oldAllocatedSize, _allocatedSize);
 }
 
-void Scumm::freeResources()
-{
+void Scumm::freeResources() {
 	int i, j;
 	for (i = rtFirst; i <= rtLast; i++) {
 		for (j = res.num[i]; --j >= 0;) {
@@ -1495,8 +1457,7 @@
 	}
 }
 
-void Scumm::loadPtrToResource(int type, int resindex, byte *source)
-{
+void Scumm::loadPtrToResource(int type, int resindex, byte *source) {
 	byte *alloced;
 	int i, len;
 
@@ -1519,15 +1480,13 @@
 	}
 }
 
-bool Scumm::isResourceLoaded(int type, int idx)
-{
+bool Scumm::isResourceLoaded(int type, int idx) {
 	if (!validateResource("isLoaded", type, idx))
 		return false;
 	return res.address[type][idx] != NULL;
 }
 
-void Scumm::resourceStats()
-{
+void Scumm::resourceStats() {
 	int i, j;
 	uint32 lockedSize = 0, lockedNum = 0;
 	byte flag;
@@ -1544,17 +1503,14 @@
 	debug(1, "Total allocated size=%d, locked=%d(%d)\n", _allocatedSize, lockedSize, lockedNum);
 }
 
-void Scumm::heapClear(int mode)
-{
+void Scumm::heapClear(int mode) {
 }
 
-void Scumm::unkHeapProc2(int a, int b)
-{
+void Scumm::unkHeapProc2(int a, int b) {
 }
 
-void Scumm::readMAXS()
-{
-	if (_features & GF_AFTER_V8) {                      // CMI
+void Scumm::readMAXS() {
+	if (_features & GF_AFTER_V8) {                    // CMI
 		_fileHandle.seek(50 + 50, SEEK_CUR);            // 176 - 8
 		_numVariables = _fileHandle.readUint32LE();     // 1500
 		_numBitVariables = _fileHandle.readUint32LE();  // 2048
@@ -1651,8 +1607,7 @@
 	_dynamicRoomOffsets = 1;
 }
 
-void Scumm::allocateArrays()
-{
+void Scumm::allocateArrays() {
 	// Note: Buffers are now allocated in scummMain to allow for
 	//     early GUI init.
 
@@ -1688,17 +1643,14 @@
 }
 
 
-bool Scumm::isGlobInMemory(int type, int idx)
-{
+bool Scumm::isGlobInMemory(int type, int idx) {
 	if (!validateResource("isGlobInMemory", type, idx))
 		return false;
 
 	return res.address[type][idx] != NULL;
 }
 
-
-uint16 newTag2Old(uint32 oldTag)
-{
+uint16 newTag2Old(uint32 oldTag) {
 	switch (oldTag) {
 	case (MKID('RMHD')):
 		return (0x4448);	// HD
@@ -1738,9 +1690,7 @@
 	}
 }
 
-
-char *Scumm::resTypeFromId(int id)
-{
+char *Scumm::resTypeFromId(int id) {
 	static char buf[100];
 
 	switch (id) {

Index: resource_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- resource_v2.cpp	22 Dec 2002 21:58:15 -0000	1.8
+++ resource_v2.cpp	6 Mar 2003 17:57:56 -0000	1.9
@@ -25,8 +25,7 @@
 #include "resource.h"
 
 
-void Scumm_v2::readIndexFile()
-{
+void Scumm_v2::readIndexFile() {
 	int magic = 0;
 	debug(9, "readIndexFile()");
 

Index: resource_v3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- resource_v3.cpp	22 Dec 2002 21:58:15 -0000	1.5
+++ resource_v3.cpp	6 Mar 2003 17:57:57 -0000	1.6
@@ -26,8 +26,7 @@
 #include "resource.h"
 
 
-void Scumm_v3::readIndexFile()
-{
+void Scumm_v3::readIndexFile() {
 	uint16 blocktype;
 	uint32 itemsize;
 	int numblock = 0;
@@ -151,8 +150,7 @@
 	closeRoom();
 }
 
-void Scumm_v3::loadCharset(int no)
-{
+void Scumm_v3::loadCharset(int no) {
 	uint32 size;
 	memset(_charsetData, 0, sizeof(_charsetData));
 

Index: resource_v4.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v4.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- resource_v4.cpp	22 Dec 2002 21:58:15 -0000	1.4
+++ resource_v4.cpp	6 Mar 2003 17:57:57 -0000	1.5
@@ -24,8 +24,7 @@
 #include "scumm.h"
 #include "intern.h"
 
-void Scumm_v4::loadCharset(int no)
-{
+void Scumm_v4::loadCharset(int no) {
 	uint32 size;
 	memset(_charsetData, 0, sizeof(_charsetData));
 

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- saveload.cpp	5 Mar 2003 11:40:37 -0000	1.53
+++ saveload.cpp	6 Mar 2003 17:57:57 -0000	1.54
@@ -40,23 +40,20 @@
 };
 
 
-void Scumm::requestSave(int slot, const char *name)
-{
+void Scumm::requestSave(int slot, const char *name) {
 	_saveLoadSlot = slot;
 	_saveLoadCompatible = false;
 	_saveLoadFlag = 1;		// 1 for save
 	strcpy(_saveLoadName, name);
 }
 
-void Scumm::requestLoad(int slot)
-{
+void Scumm::requestLoad(int slot) {
 	_saveLoadSlot = slot;
 	_saveLoadCompatible = false;
 	_saveLoadFlag = 2;		// 2 for load
 }
 
-bool Scumm::saveState(int slot, bool compat, SaveFileManager *mgr)
-{
+bool Scumm::saveState(int slot, bool compat, SaveFileManager *mgr) {
 	char filename[256];
 	SaveFile *out;
 	SaveGameHeader hdr;
@@ -82,8 +79,7 @@
 	return true;
 }
 
-bool Scumm::loadState(int slot, bool compat, SaveFileManager *mgr)
-{
+bool Scumm::loadState(int slot, bool compat, SaveFileManager *mgr) {
 	char filename[256];
 	SaveFile *out;
 	int i, j;
@@ -184,23 +180,20 @@
 	return true;
 }
 
-void Scumm::makeSavegameName(char *out, int slot, bool compatible)
-{
+void Scumm::makeSavegameName(char *out, int slot, bool compatible) {
 	const char *dir = getSavePath();
 
 	sprintf(out, "%s%s.%c%.2d", dir, _game_name, compatible ? 'c' : 's', slot);
 }
 
-void Scumm::listSavegames(bool *marks, int num, SaveFileManager *mgr)
-{
+void Scumm::listSavegames(bool *marks, int num, SaveFileManager *mgr) {
 	char prefix[256];
 	makeSavegameName(prefix, 99, false);
 	prefix[strlen(prefix)-2] = 0;
 	mgr->list_savefiles(prefix, marks, num);
 }
 
-bool Scumm::getSavegameName(int slot, char *desc, SaveFileManager *mgr)
-{
+bool Scumm::getSavegameName(int slot, char *desc, SaveFileManager *mgr) {
 	char filename[256];
 	SaveFile *out;
 	SaveGameHeader hdr;
@@ -231,8 +224,7 @@
 	return true;
 }
 
-void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion)
-{
+void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion) {
 	const SaveLoadEntry objectEntries[] = {
 		MKLINE(ObjectData, OBIMoffset, sleUint32, VER_V8),
 		MKLINE(ObjectData, OBCDoffset, sleUint32, VER_V8),
@@ -678,8 +670,7 @@
 	}
 }
 
-void Scumm::saveLoadResource(Serializer *ser, int type, int idx)
-{
+void Scumm::saveLoadResource(Serializer *ser, int type, int idx) {
 	byte *ptr;
 	uint32 size;
 
@@ -714,13 +705,11 @@
 	}
 }
 
-void Serializer::saveBytes(void *b, int len)
-{
+void Serializer::saveBytes(void *b, int len) {
 	_saveLoadStream->fwrite(b, 1, len);
 }
 
-void Serializer::loadBytes(void *b, int len)
-{
+void Serializer::loadBytes(void *b, int len) {
 	_saveLoadStream->fread(b, 1, len);
 }
 
@@ -728,8 +717,7 @@
 
 // Perhaps not necessary anymore with latest checks
 
-bool Serializer::checkEOFLoadStream()
-{
+bool Serializer::checkEOFLoadStream() {
 	if (!_saveLoadStream->fseek(1, SEEK_CUR))
 		return true;
 	if (_saveLoadStream->feof())
@@ -741,46 +729,39 @@
 #endif
 
 
-void Serializer::saveUint32(uint32 d)
-{
+void Serializer::saveUint32(uint32 d) {
 	uint32 e = FROM_LE_32(d);
 	saveBytes(&e, 4);
 }
 
-void Serializer::saveWord(uint16 d)
-{
+void Serializer::saveWord(uint16 d) {
 	uint16 e = FROM_LE_16(d);
 	saveBytes(&e, 2);
 }
 
-void Serializer::saveByte(byte b)
-{
+void Serializer::saveByte(byte b) {
 	saveBytes(&b, 1);
 }
 
-uint32 Serializer::loadUint32()
-{
+uint32 Serializer::loadUint32() {
 	uint32 e;
 	loadBytes(&e, 4);
 	return FROM_LE_32(e);
 }
 
-uint16 Serializer::loadWord()
-{
+uint16 Serializer::loadWord() {
 	uint16 e;
 	loadBytes(&e, 2);
 	return FROM_LE_16(e);
 }
 
-byte Serializer::loadByte()
-{
+byte Serializer::loadByte() {
 	byte e;
 	loadBytes(&e, 1);
 	return e;
 }
 
-void Serializer::saveArrayOf(void *b, int len, int datasize, byte filetype)
-{
+void Serializer::saveArrayOf(void *b, int len, int datasize, byte filetype) {
 	byte *at = (byte *)b;
 	uint32 data;
 
@@ -824,8 +805,7 @@
 	}
 }
 
-void Serializer::loadArrayOf(void *b, int len, int datasize, byte filetype)
-{
+void Serializer::loadArrayOf(void *b, int len, int datasize, byte filetype) {
 	byte *at = (byte *)b;
 	uint32 data;
 
@@ -872,8 +852,7 @@
 	}
 }
 
-void Serializer::saveLoadArrayOf(void *b, int num, int datasize, const SaveLoadEntry *sle)
-{
+void Serializer::saveLoadArrayOf(void *b, int num, int datasize, const SaveLoadEntry *sle) {
 	byte *data = (byte *)b;
 
 	if (isSaving()) {
@@ -889,24 +868,21 @@
 	}
 }
 
-void Serializer::saveLoadArrayOf(void *b, int len, int datasize, byte filetype)
-{
+void Serializer::saveLoadArrayOf(void *b, int len, int datasize, byte filetype) {
 	if (isSaving())
 		saveArrayOf(b, len, datasize, filetype);
 	else
 		loadArrayOf(b, len, datasize, filetype);
 }
 
-void Serializer::saveLoadEntries(void *d, const SaveLoadEntry *sle)
-{
+void Serializer::saveLoadEntries(void *d, const SaveLoadEntry *sle) {
 	if (isSaving())
 		saveEntries(d, sle);
 	else
 		loadEntries(d, sle);
 }
 
-void Serializer::saveEntries(void *d, const SaveLoadEntry *sle)
-{
+void Serializer::saveEntries(void *d, const SaveLoadEntry *sle) {
 	byte type;
 	byte *at;
 	int size;
@@ -938,8 +914,7 @@
 	}
 }
 
-void Serializer::loadEntries(void *d, const SaveLoadEntry *sle)
-{
+void Serializer::loadEntries(void *d, const SaveLoadEntry *sle) {
 	byte type;
 	byte *at;
 	int size;

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- script.cpp	6 Feb 2003 21:32:18 -0000	1.44
+++ script.cpp	6 Mar 2003 17:57:58 -0000	1.45
@@ -35,8 +35,7 @@
 
 
 /* Start executing script 'script' with parameters 'a' and 'b' */
-void Scumm::runScript(int script, int a, int b, int *lvarptr)
-{
+void Scumm::runScript(int script, int a, int b, int *lvarptr) {
 	byte *scriptPtr;
 	uint32 scriptOffs;
 	byte scriptType;
@@ -80,8 +79,7 @@
 }
 
 /* Stop script 'script' */
-void Scumm::stopScriptNr(int script)
-{
+void Scumm::stopScriptNr(int script) {
 	ScriptSlot *ss;
 	NestedScript *nest;
 	int i, num;
@@ -119,8 +117,7 @@
 }
 
 /* Stop an object script 'script'*/
-void Scumm::stopObjectScript(int script)
-{
+void Scumm::stopObjectScript(int script) {
 	ScriptSlot *ss;
 	NestedScript *nest;
 	int i, num;
@@ -159,8 +156,7 @@
 }
 
 /* Return a free script slot */
-int Scumm::getScriptSlot()
-{
+int Scumm::getScriptSlot() {
 	ScriptSlot *ss;
 	int i;
 	ss = &vm.slot[1];
@@ -174,8 +170,7 @@
 }
 
 /* Run script 'script' nested - eg, within the parent script.*/
-void Scumm::runScriptNested(int script)
-{
+void Scumm::runScriptNested(int script) {
 	NestedScript *nest;
 	ScriptSlot *slot;
 
@@ -219,8 +214,7 @@
 	_currentScript = 0xFF;
 }
 
-void Scumm::updateScriptPtr()
-{
+void Scumm::updateScriptPtr() {
 	if (_currentScript == 0xFF)
 		return;
 
@@ -228,8 +222,7 @@
 }
 
 /* Get the code pointer to a script */
-void Scumm::getScriptBaseAddress()
-{
+void Scumm::getScriptBaseAddress() {
 	ScriptSlot *ss;
 	int idx;
 
@@ -271,16 +264,14 @@
 }
 
 
-void Scumm::getScriptEntryPoint()
-{
+void Scumm::getScriptEntryPoint() {
 	if (_currentScript == 0xFF)
 		return;
 	_scriptPointer = _scriptOrgPointer + vm.slot[_currentScript].offs;
 }
 
 /* Execute a script - Read opcode, and execute it from the table */
-void Scumm::executeScript()
-{
+void Scumm::executeScript() {
 	while (_currentScript != 0xFF) {
 		_opcode = fetchScriptByte();
 		vm.slot[_currentScript].didexec = 1;
@@ -294,8 +285,7 @@
 	CHECK_HEAP;
 }
 
-byte Scumm::fetchScriptByte()
-{
+byte Scumm::fetchScriptByte() {
 	if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
 		uint32 oldoffs = _scriptPointer - _scriptOrgPointer;
 		getScriptBaseAddress();
@@ -304,8 +294,7 @@
 	return *_scriptPointer++;
 }
 
-uint Scumm::fetchScriptWord()
-{
+uint Scumm::fetchScriptWord() {
 	int a;
 	if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
 		uint32 oldoffs = _scriptPointer - _scriptOrgPointer;
@@ -317,8 +306,7 @@
 	return a;
 }
 
-int Scumm::fetchScriptWordSigned()
-{
+int Scumm::fetchScriptWordSigned() {
 	return (int16)fetchScriptWord();
 }
 
@@ -326,8 +314,7 @@
 #define BYPASS_COPY_PROT
 #endif
 
-int Scumm::readVar(uint var)
-{
+int Scumm::readVar(uint var) {
 	int a;
 #ifdef BYPASS_COPY_PROT
 	static byte copyprotbypassed;
@@ -392,8 +379,7 @@
 	return -1;
 }
 
-void Scumm::writeVar(uint var, int value)
-{
+void Scumm::writeVar(uint var, int value) {
 	if (!(var & 0xF000)) {
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");
 
@@ -422,7 +408,7 @@
 			var >>= 4;
 			checkRange(_numVariables - 1, 0, var, "Variable %d out of range(wzb)");
 			if(value)
- 				_vars[ var ] |= ( 1 << b );
+				_vars[ var ] |= ( 1 << b );
 			else
 				_vars[ var ] &= ~( 1 << b );
 			return;
@@ -457,8 +443,7 @@
 	error("Illegal varbits (w)");
 }
 
-void Scumm::getResultPos()
-{
+void Scumm::getResultPos() {
 	int a;
 
 	_resultVarNumber = fetchScriptWord();
@@ -473,27 +458,24 @@
 	}
 }
 
-void Scumm::setResult(int value)
-{
+void Scumm::setResult(int value) {
 	writeVar(_resultVarNumber, value);
 }
 
-void Scumm::push(int a)
-{
+void Scumm::push(int a) {
 	assert(_scummStackPos >= 0 && (unsigned int)_scummStackPos <= ARRAYSIZE(_scummStack));
 	_scummStack[_scummStackPos++] = a;
 }
 
-int Scumm::pop()
-{
+int Scumm::pop() {
 	if ((_scummStackPos < 1) || ((unsigned int)_scummStackPos > ARRAYSIZE(_scummStack))) {
 		error("No items on stack to pop() for %s (0x%X) at [%d-%d]", getOpcodeDesc(_opcode), _opcode, _roomResource, vm.slot[_currentScript].number);
 	}
 
 	return _scummStack[--_scummStackPos];
 }
-void Scumm::drawBox(int x, int y, int x2, int y2, int color)
-{
+
+void Scumm::drawBox(int x, int y, int x2, int y2, int color) {
 	int top, bottom, count;
 	VirtScreen *vs;
 	byte *backbuff, *bgbuff;
@@ -546,8 +528,7 @@
 }
 
 
-void Scumm::stopObjectCode()
-{
+void Scumm::stopObjectCode() {
 	ScriptSlot *ss;
 
 	ss = &vm.slot[_currentScript];
@@ -572,8 +553,7 @@
 	_currentScript = 0xFF;
 }
 
-bool Scumm::isScriptInUse(int script)
-{
+bool Scumm::isScriptInUse(int script) {
 	ScriptSlot *ss;
 	int i;
 
@@ -586,8 +566,7 @@
 }
 
 
-void Scumm::runHook(int i)
-{
+void Scumm::runHook(int i) {
 	int tmp[16];
 	tmp[0] = i;
 	if (_vars[VAR_HOOK_SCRIPT]) {
@@ -595,8 +574,7 @@
 	}
 }
 
-void Scumm::freezeScripts(int flag)
-{
+void Scumm::freezeScripts(int flag) {
 	int i;
 
 	for (i = 1; i < NUM_SCRIPT_SLOT; i++) {
@@ -615,8 +593,7 @@
 	}
 }
 
-void Scumm::unfreezeScripts()
-{
+void Scumm::unfreezeScripts() {
 	int i;
 	for (i = 1; i < NUM_SCRIPT_SLOT; i++) {
 		if (vm.slot[i].status & 0x80) {
@@ -632,8 +609,7 @@
 	}
 }
 
-void Scumm::runAllScripts()
-{
+void Scumm::runAllScripts() {
 	int i;
 
 	for (i = 0; i < NUM_SCRIPT_SLOT; i++)
@@ -654,8 +630,7 @@
 	}
 }
 
-void Scumm::runExitScript()
-{
+void Scumm::runExitScript() {
 	if (_vars[VAR_EXIT_SCRIPT])
 		runScript(_vars[VAR_EXIT_SCRIPT], 0, 0, 0);
 	if (_EXCD_offs) {
@@ -691,8 +666,7 @@
 		runScript(_vars[VAR_EXIT_SCRIPT2], 0, 0, 0);
 }
 
-void Scumm::runEntryScript()
-{
+void Scumm::runEntryScript() {
 	if (_vars[VAR_ENTRY_SCRIPT])
 		runScript(_vars[VAR_ENTRY_SCRIPT], 0, 0, 0);
 	if (_ENCD_offs) {
@@ -711,8 +685,7 @@
 		runScript(_vars[VAR_ENTRY_SCRIPT2], 0, 0, 0);
 }
 
-void Scumm::killScriptsAndResources()
-{
+void Scumm::killScriptsAndResources() {
 	ScriptSlot *ss;
 	int i;
 
@@ -742,16 +715,14 @@
 	}
 }
 
-void Scumm::killAllScriptsExceptCurrent()
-{
+void Scumm::killAllScriptsExceptCurrent() {
 	for (int i = 1; i < NUM_SCRIPT_SLOT; i++) {
 		if (i != _currentScript)
 			vm.slot[i].status = ssDead;
 	}
 }
 
-void Scumm::doSentence(int c, int b, int a)
-{
+void Scumm::doSentence(int c, int b, int a) {
 	SentenceTab *st;
 
 	if (_features & GF_AFTER_V7) {
@@ -787,8 +758,7 @@
 	st->freezeCount = 0;
 }
 
-void Scumm::checkAndRunSentenceScript()
-{
+void Scumm::checkAndRunSentenceScript() {
 	int i;
 	ScriptSlot *ss;
 
@@ -817,8 +787,7 @@
 		runScript(_vars[VAR_SENTENCE_SCRIPT], 0, 0, _localParamList);
 }
 
-void Scumm::runInputScript(int a, int cmd, int mode)
-{
+void Scumm::runInputScript(int a, int cmd, int mode) {
 	int args[16];
 	memset(args, 0, sizeof(args));
 	args[0] = a;
@@ -828,8 +797,7 @@
 		runScript(_vars[VAR_VERB_SCRIPT], 0, 0, args);
 }
 
-void Scumm::decreaseScriptDelay(int amount)
-{
+void Scumm::decreaseScriptDelay(int amount) {
 	ScriptSlot *ss = &vm.slot[0];
 	int i;
 	for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++) {
@@ -843,8 +811,7 @@
 	}
 }
 
-void Scumm::runVerbCode(int object, int entry, int a, int b, int *vars)
-{
+void Scumm::runVerbCode(int object, int entry, int a, int b, int *vars) {
 	uint32 obcd;
 	int slot, where, offs;
 
@@ -881,8 +848,7 @@
 	runScriptNested(slot);
 }
 
-void Scumm::initializeLocals(int slot, int *vars)
-{
+void Scumm::initializeLocals(int slot, int *vars) {
 	int i;
 	if (!vars) {
 		for (i = 0; i < 16; i++)
@@ -893,8 +859,7 @@
 	}
 }
 
-int Scumm::getVerbEntrypoint(int obj, int entry)
-{
+int Scumm::getVerbEntrypoint(int obj, int entry) {
 	byte *objptr, *verbptr;
 	int verboffs;
 
@@ -944,8 +909,7 @@
 	}
 }
 
-bool Scumm::isScriptRunning(int script)
-{
+bool Scumm::isScriptRunning(int script) {
 	int i;
 	ScriptSlot *ss = vm.slot;
 	for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++)
@@ -954,19 +918,16 @@
 	return false;
 }
 
-bool Scumm::isRoomScriptRunning(int script)
-{
+bool Scumm::isRoomScriptRunning(int script) {
 	int i;
 	ScriptSlot *ss = vm.slot;
 	for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++)
 		if (ss->number == script && ss->where == WIO_ROOM && ss->status != ssDead)
 			return true;
 	return false;
-
 }
 
-int Scumm::defineArray(int array, int type, int dim2, int dim1)
-{
+int Scumm::defineArray(int array, int type, int dim2, int dim1) {
 	int id;
 	int size;
 	ArrayHeader *ah;
@@ -1015,8 +976,7 @@
 	return id;
 }
 
-void Scumm::nukeArray(int a)
-{
+void Scumm::nukeArray(int a) {
 	int data;
 
 	data = readVar(a);
@@ -1028,8 +988,7 @@
 	writeVar(a, 0);
 }
 
-int Scumm::getArrayId()
-{
+int Scumm::getArrayId() {
 	byte **addr = _baseArrays;
 	int i;
 
@@ -1041,8 +1000,7 @@
 	return -1;
 }
 
-void Scumm::copyScriptString(byte *dst)
-{
+void Scumm::copyScriptString(byte *dst) {
 	int len = resStrLen(_scriptPointer) + 1;
 	while (len--)
 		*dst++ = fetchScriptByte();
@@ -1054,8 +1012,7 @@
 // special characters embedded into the string. The reason for this function is that
 // sometimes this embedded data contains zero bytes, thus we can't just use strlen.
 //
-int Scumm::resStrLen(const byte *src) const
-{
+int Scumm::resStrLen(const byte *src) const {
 	int num = 0;
 	byte chr;
 	if (src == NULL)
@@ -1080,8 +1037,7 @@
 	return num;
 }
 
-void Scumm::cutscene(int *args)
-{
+void Scumm::cutscene(int *args) {
 	int scr = _currentScript;
 	vm.slot[scr].cutsceneOverride++;
 
@@ -1098,8 +1054,7 @@
 	vm.cutSceneScriptIndex = 0xFF;
 }
 
-void Scumm::endCutscene()
-{
+void Scumm::endCutscene() {
 	ScriptSlot *ss = &vm.slot[_currentScript];
 	int args[16];
 
@@ -1122,8 +1077,7 @@
 		runScript(_vars[VAR_CUTSCENE_END_SCRIPT], 0, 0, args);
 }
 
-void Scumm::exitCutscene()
-{
+void Scumm::exitCutscene() {
 	uint32 offs = vm.cutScenePtr[vm.cutSceneStackPointer];
 	if (offs) {
 		ScriptSlot *ss = &vm.slot[vm.cutSceneScript[vm.cutSceneStackPointer]];
@@ -1139,8 +1093,7 @@
 	}
 }
 
-void Scumm::beginOverride()
-{
+void Scumm::beginOverride() {
 	int idx;
 
 	idx = vm.cutSceneStackPointer;
@@ -1157,8 +1110,7 @@
 	_vars[VAR_OVERRIDE] = 0;
 }
 
-void Scumm::endOverride()
-{
+void Scumm::endOverride() {
 	int idx;
 
 	idx = vm.cutSceneStackPointer;

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- script_v5.cpp	12 Jan 2003 07:30:17 -0000	1.13
+++ script_v5.cpp	6 Mar 2003 17:57:59 -0000	1.14
@@ -30,8 +30,7 @@
 
 #define OPCODE(x)	{ &Scumm_v5::x, #x }
 
-void Scumm_v5::setupOpcodes()
-{
+void Scumm_v5::setupOpcodes() {
 	static const OpcodeEntryV5 opcodes[256] = {
 		/* 00 */
 		OPCODE(o5_stopObjectCode),
@@ -358,24 +357,20 @@
 	_opcodesV5 = opcodes;
[...1030 lines suppressed...]
@@ -2592,8 +2474,7 @@
 	_string[textSlot].t_charset = _string[textSlot].charset;
 }
 
-void Scumm_v5::o5_oldRoomEffect()
-{
+void Scumm_v5::o5_oldRoomEffect() {
 	int a;
 
 	_opcode = fetchScriptByte();
@@ -2608,8 +2489,7 @@
 	}
 }
 
-void Scumm_v5::o5_pickupObjectOld()
-{
+void Scumm_v5::o5_pickupObjectOld() {
 	int obj = getVarOrDirectWord(0x80);
 
 	if (obj < 1) {

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- script_v6.cpp	2 Mar 2003 22:27:32 -0000	1.69
+++ script_v6.cpp	6 Mar 2003 17:58:00 -0000	1.70
@@ -40,8 +40,7 @@
 
 #define OPCODE(x)	{ &Scumm_v6::x, #x }
 
-void Scumm_v6::setupOpcodes()
-{
+void Scumm_v6::setupOpcodes() {
 	static const OpcodeEntryV6 opcodes[256] = {
 		/* 00 */
 		OPCODE(o6_pushByte),
@@ -368,19 +367,16 @@
 	_opcodesV6 = opcodes;
[...1442 lines suppressed...]
@@ -3040,8 +2880,7 @@
 	push(readArray(value, 0, num));
 }
 
-void Scumm_v6::o6_getDateTime()
-{
+void Scumm_v6::o6_getDateTime() {
 	struct tm *t;
 	time_t now = time(NULL);
 	
@@ -3075,8 +2914,7 @@
 	warning("stub localizeArray(%d)", pop());
 }
 
-void Scumm_v6::decodeParseString(int m, int n)
-{
+void Scumm_v6::decodeParseString(int m, int n) {
 	byte b;
 
 	b = fetchScriptByte();

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.138
retrieving revision 2.139
diff -u -d -r2.138 -r2.139
--- script_v8.cpp	20 Feb 2003 02:10:39 -0000	2.138
+++ script_v8.cpp	6 Mar 2003 17:58:02 -0000	2.139
@@ -35,8 +35,7 @@
 
 #define OPCODE(x)	{ &Scumm_v8::x, #x }
 
-void Scumm_v8::setupOpcodes()
-{
+void Scumm_v8::setupOpcodes() {
 	static const OpcodeEntryV8 opcodes[256] = {
 		/* 00 */
 		OPCODE(o6_invalid),
@@ -363,20 +362,17 @@
 	_opcodesV8 = opcodes;
 }
 
-void Scumm_v8::executeOpcode(int i)
-{
+void Scumm_v8::executeOpcode(int i) {
 	OpcodeProcV8 op = _opcodesV8[i].proc;
 	(this->*op) ();
 }
 
-const char *Scumm_v8::getOpcodeDesc(int i)
-{
+const char *Scumm_v8::getOpcodeDesc(int i) {
 	return _opcodesV8[i].desc;
 }
 
 // In V8, the word size is 4 byte, not 2 bytes as in V6/V7 games
-uint Scumm_v8::fetchScriptWord()
-{
+uint Scumm_v8::fetchScriptWord() {
 	int a;
 	if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
 		uint32 oldoffs = _scriptPointer - _scriptOrgPointer;
@@ -388,13 +384,11 @@
 	return a;
 }
 
-int Scumm_v8::fetchScriptWordSigned()
-{
+int Scumm_v8::fetchScriptWordSigned() {
 	return (int32)fetchScriptWord();
 }
 
-int Scumm_v8::readVar(uint var)
-{
+int Scumm_v8::readVar(uint var) {
 	debug(9, "readvar(%d)", var);
 
 	if (!(var & 0xF0000000)) {
@@ -418,8 +412,7 @@
 	return -1;
 }
 
-void Scumm_v8::writeVar(uint var, int value)
-{
+void Scumm_v8::writeVar(uint var, int value) {
 	debug(9, "writeVar(%d, %d)", var, value);
 
 	if (!(var & 0xF0000000)) {
@@ -457,8 +450,7 @@
 	error("Illegal varbits (w)");
 }
 
-void Scumm_v8::decodeParseString(int m, int n)
-{
+void Scumm_v8::decodeParseString(int m, int n) {
 	byte b;
 	bool containsSpeech;
 
@@ -565,8 +557,7 @@
 	}
 }
 
-void Scumm::enqueueText(byte *text, int x, int y, byte color, byte charset, bool center)
-{
+void Scumm::enqueueText(byte *text, int x, int y, byte color, byte charset, bool center) {
 	BlastText &bt = _blastTextQueue[_blastTextQueuePos++];
 	assert(_blastTextQueuePos <= 32);
 	
@@ -578,8 +569,7 @@
 	bt.center = center;
 }
 
-void Scumm::drawBlastTexts()
-{
+void Scumm::drawBlastTexts() {
 	// FIXME
 
 	byte *buf;
@@ -622,14 +612,12 @@
 	_charset->_ignoreCharsetMask = false;
 }
 
-void Scumm_v8::o8_mod()
-{
+void Scumm_v8::o8_mod() {
 	int a = pop();
 	push(pop() % a);
 }
 
-void Scumm_v8::o8_wait()
-{
+void Scumm_v8::o8_wait() {
 	// TODO
 	int actnum, offs;
 	Actor *a;
@@ -691,8 +679,7 @@
 	o6_breakHere();
 }
 
-void Scumm_v8::o8_dim()
-{
+void Scumm_v8::o8_dim() {
 	byte subOp = fetchScriptByte();
 	int array = fetchScriptWord();
 	
@@ -711,8 +698,7 @@
 	}
 }
 
-void Scumm_v8::o8_dim2()
-{
+void Scumm_v8::o8_dim2() {
 	byte subOp = fetchScriptByte();
 	int array = fetchScriptWord(), a, b;
 	
@@ -735,8 +721,7 @@
 	}
 }
 
-void Scumm_v8::o8_arrayOps()
-{
+void Scumm_v8::o8_arrayOps() {
 	byte subOp = fetchScriptByte();
 	int array = fetchScriptWord();
 	int b, c, d, len;
@@ -778,19 +763,17 @@
 	}
 }
 
-void Scumm_v8::o8_blastText()
-{
+void Scumm_v8::o8_blastText() {
 	// FIXME
 	decodeParseString(5, 0);
 }
 
-void Scumm_v8::o8_cursorCommand()
-{
+void Scumm_v8::o8_cursorCommand() {
 	// TODO
 	byte subOp = fetchScriptByte();
 	int a, i;
 	int args[16];
-	
+
 	switch (subOp) {
 	case 0xDC:		// SO_CURSOR_ON Turn cursor on
 		_cursor.state = 1;
@@ -865,8 +848,7 @@
 	_vars[VAR_USERPUT] = _userPut;
 }
 
-void Scumm_v8::o8_createBoxMatrix()
-{
+void Scumm_v8::o8_createBoxMatrix() {
 	int i;
 	Actor *a;
 
@@ -879,8 +861,7 @@
 	}
 }
 
-void Scumm_v8::o8_resourceRoutines()
-{
+void Scumm_v8::o8_resourceRoutines() {
 	// TODO
 	byte subOp = fetchScriptByte();
 	int resid = pop();
@@ -949,19 +930,18 @@
 	}
 }
 
-void Scumm_v8::o8_roomOps()
-{
+void Scumm_v8::o8_roomOps() {
 	// TODO
 	byte subOp = fetchScriptByte();
 	int a, b, c, d, e;
 	
 	switch (subOp) {
 	case 0x52:		// SO_ROOM_PALETTE Set room palette
-                d = pop();
-                c = pop();
-                b = pop();
-                a = pop();
-                setPalColor(d, a, b, c);
+		d = pop();
+		c = pop();
+		b = pop();
+		a = pop();
+		setPalColor(d, a, b, c);
 		break;
 	case 0x55:		// SO_ROOM_INTENSITY Set room intensity
 		// Not used in CMI???
@@ -1030,8 +1010,7 @@
 	}
 }
 
-void Scumm_v8::o8_actorOps()
-{
+void Scumm_v8::o8_actorOps() {
 	byte subOp = fetchScriptByte();
 	Actor *a;
 	int i, j;
@@ -1199,8 +1178,7 @@
 	}
 }
 
-void Scumm_v8::o8_cameraOps()
-{
+void Scumm_v8::o8_cameraOps() {
 	// TODO
 	byte subOp = fetchScriptByte();
 	switch (subOp) {
@@ -1215,8 +1193,7 @@
 	}
 }
 
-void Scumm_v8::o8_verbOps()
-{
+void Scumm_v8::o8_verbOps() {
 	byte subOp = fetchScriptByte();
 	VerbSlot *vs = NULL;
 	int slot, a, b;
@@ -1230,7 +1207,7 @@
 		//printf("Setting current actor to %d\n", _curActor);
 		return;
 	}
-	
+
 	assert(0 <= _curVerbSlot && _curVerbSlot < _maxVerbs);
 	vs = &_verbs[_curVerbSlot];
 	assert(vs);
@@ -1334,16 +1311,14 @@
 	}
 }
 
-void Scumm_v8::o8_soundKludge()
-{
+void Scumm_v8::o8_soundKludge() {
 	int args[16];
 	int num = getStackList(args, sizeof(args) / sizeof(args[0]));
 
 	_sound->soundKludge(args, num);
 }
 
-void Scumm_v8::o8_system()
-{
+void Scumm_v8::o8_system() {
 	// TODO
 	byte subOp = fetchScriptByte();
 	switch (subOp) {
@@ -1359,8 +1334,7 @@
 }
 
 
-void Scumm_v8::o8_startVideo()
-{
+void Scumm_v8::o8_startVideo() {
 	int len = resStrLen(_scriptPointer);
 	
 	warning("o8_startVideo(%s/%s)", getGameDataPath(), (char*)_scriptPointer);
@@ -1379,8 +1353,7 @@
 	_scriptPointer += len + 1;
 }
 
-void Scumm_v8::o8_kernelSetFunctions()
-{
+void Scumm_v8::o8_kernelSetFunctions() {
 	// TODO
 	Actor *a;
 	int args[30];
@@ -1524,8 +1497,7 @@
 	}
 }
 
-void Scumm_v8::o8_kernelGetFunctions()
-{
+void Scumm_v8::o8_kernelGetFunctions() {
 	// TODO
 	int args[30];
 	int len = getStackList(args, sizeof(args) / sizeof(args[0]));
@@ -1662,8 +1634,7 @@
 
 }
 
-void Scumm_v8::o8_getActorChore()
-{
+void Scumm_v8::o8_getActorChore() {
 	int actnum = pop();
 	Actor *a = derefActorSafe(actnum, "o8_getActorChore");
 	assert(a);
@@ -1678,32 +1649,27 @@
 	push(a->frame);
 }
 
-void Scumm_v8::o8_getObjectImageX()
-{
+void Scumm_v8::o8_getObjectImageX() {
 	int i = getObjectIndex(pop());
 	push(_objs[i].x_pos);
 }
 
-void Scumm_v8::o8_getObjectImageY()
-{
+void Scumm_v8::o8_getObjectImageY() {
 	int i = getObjectIndex(pop());
 	push(_objs[i].y_pos);
 }
 
-void Scumm_v8::o8_getObjectImageWidth()
-{
+void Scumm_v8::o8_getObjectImageWidth() {
 	int i = getObjectIndex(pop());
 	push(_objs[i].width);
 }
 
-void Scumm_v8::o8_getObjectImageHeight()
-{
+void Scumm_v8::o8_getObjectImageHeight() {
 	int i = getObjectIndex(pop());
 	push(_objs[i].height);
 }
 
-void Scumm_v8::o8_getStringWidth()
-{
+void Scumm_v8::o8_getStringWidth() {
 	int charset = pop();
 	int len = resStrLen(_scriptPointer);
 	int oldID = _charset->getCurID(); 
@@ -1718,20 +1684,19 @@
 	_scriptPointer += len + 1;
 }
 
-void Scumm_v8::o8_drawObject()
-{
+void Scumm_v8::o8_drawObject() {
 	int state = pop(), y = pop(), x = pop(), obj = pop(), objnum = getObjectIndex(obj);
 	ObjectData *od;
 
 	if (!objnum)
 		return;
 
-        od = &_objs[objnum];
-        if (x != 0x7FFFFFFF) {
-                od->x_pos = x;
-                od->y_pos = y;
-		printf("setting position: 0x%X b 0x%X\n", x, y);
-        }
+	od = &_objs[objnum];
+	if (x != 0x7FFFFFFF) {
+		od->x_pos = x;
+		od->y_pos = y;
+		debug(1, "setting position: 0x%X b 0x%X\n", x, y);
+	}
 
 	addObjectToDrawQue(objnum);
 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- scumm.h	1 Mar 2003 22:04:46 -0000	1.153
+++ scumm.h	6 Mar 2003 17:58:04 -0000	1.154
@@ -61,11 +61,11 @@
 
 struct ScummPoint {
 	int x, y;
-	bool operator ==(const ScummPoint &p) const
+	bool operator == (const ScummPoint &p) const
 	{
 		return p.x == x && p.y == y;
 	}
-	bool operator !=(const ScummPoint &p) const
+	bool operator != (const ScummPoint &p) const
 	{
 		return p.x != x || p.y != y;
 	}
@@ -319,7 +319,7 @@
 	// Scumm main loop
 	void mainRun();
 	int scummLoop(int delta);
-	
+
 	// Event handling
 	void waitForTimer(int msec_delay);
 	void processKbd();
@@ -442,15 +442,13 @@
 
 	bool saveState(int slot, bool compat, SaveFileManager *mgr);
 	bool loadState(int slot, bool compat, SaveFileManager *mgr);
-	bool saveState(int slot, bool compat)
-	{
+	bool saveState(int slot, bool compat) {
 		SaveFileManager *mgr = _system->get_savefile_manager();
 		bool result = saveState(slot, compat, mgr);
 		delete mgr;
 		return result;
 	}
-	bool loadState(int slot, bool compat)
-	{
+	bool loadState(int slot, bool compat) {
 		SaveFileManager *mgr = _system->get_savefile_manager();
 		bool result = loadState(slot, compat, mgr);
 		delete mgr;
@@ -600,7 +598,7 @@
 	int _lastLoadedRoom, _roomResource;
 	byte *findResourceData(uint32 tag, byte *ptr);
 	int getResourceDataSize(byte *ptr);
-	
+
 	int getArrayId();
 	void nukeArray(int a);
 	int defineArray(int a, int b, int c, int d);
@@ -934,7 +932,7 @@
 	Box *getBoxBaseAddr(int box);
 	byte getBoxFlags(int box);
 	int getBoxScale(int box);
-	
+
 	int getScale(int box, int x, int y);
 	void setScaleItem(int slot, int a, int b, int c, int d);
 
@@ -1074,7 +1072,7 @@
 	byte VAR_SOUNDRESULT;
 	byte VAR_TALKSTOP_KEY;
 	byte VAR_59;
-	
+
 	byte VAR_SOUNDPARAM;
 	byte VAR_SOUNDPARAM2;
 	byte VAR_SOUNDPARAM3;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.54
retrieving revision 2.55
diff -u -d -r2.54 -r2.55
--- scummvm.cpp	4 Mar 2003 03:18:12 -0000	2.54
+++ scummvm.cpp	6 Mar 2003 17:58:04 -0000	2.55
@@ -59,7 +59,7 @@
 //      {"zak64",         "Zak McKracken and the Alien Mindbenders (C64)", GID_ZAK64, 1, 0, 0,},
 
 	/* Scumm Version 2 */
-	{"maniac",      "Maniac Mansion", GID_MANIAC, 2, 0, 0,
+	{"maniac", "Maniac Mansion", GID_MANIAC, 2, 0, 0,
 	GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "MANIACEX.EXE"},
 //      {"zak",         "Zak McKracken and the Alien Mindbenders",      GID_ZAK,     2, 0, 0,
 //      GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "ZAKEXE.EXE"},
@@ -142,13 +142,11 @@
 	{NULL, NULL, 0, 0, 0, 0, 0, NULL}
 };
 
-const VersionSettings *Engine_SCUMM_targetList()
-{
+const VersionSettings *Engine_SCUMM_targetList() {
 	return scumm_settings;
 }
 
-Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst)
-{
+Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
 	Engine *engine;
 
 	if (detector->_amiga)
@@ -173,8 +171,7 @@
 }
 
 Scumm::Scumm (GameDetector *detector, OSystem *syst) 
-	: Engine(detector, syst), _pauseDialog(0), _optionsDialog(0), _saveLoadDialog(0)
-{
+	: Engine(detector, syst), _pauseDialog(0), _optionsDialog(0), _saveLoadDialog(0) {
 	OSystem::Property prop;
 
 	// Use g_scumm from error() ONLY
@@ -236,10 +233,9 @@
 
 	// Override global fullscreen setting with any game-specific define
 	if (g_config->getBool("fullscreen", false)) {
- 		if (!syst->property(OSystem::PROP_GET_FULLSCREEN, 0))
-        		syst->property(OSystem::PROP_TOGGLE_FULLSCREEN, 0);
- 	}
-
+		if (!syst->property(OSystem::PROP_GET_FULLSCREEN, 0))
+			syst->property(OSystem::PROP_TOGGLE_FULLSCREEN, 0);
+	}
 
 #ifndef __GP32__ //ph0x FIXME, "quick dirty hack"
 	/* Bind the mixer to the system => mixer will be invoked
@@ -301,8 +297,7 @@
 	delete _audioNames;
 }
 
-void Scumm::scummInit()
-{
+void Scumm::scummInit() {
 	int i;
 	Actor *a;
 
@@ -323,7 +318,7 @@
 		_charset = new CharsetRendererClassic(this);
 
 	memset(_charsetData, 0, sizeof(_charsetData));
-	
+
 	if (!(_features & GF_SMALL_NAMES) && !(_features & GF_AFTER_V8))
 		loadCharset(1);
 
@@ -338,7 +333,7 @@
 		a->initActorClass(this);
 		a->initActor(1);
 	}
-	
+
 	_vars[VAR_CHARINC] = 4;
 
 	_numNestedScripts = 0;
@@ -445,8 +440,7 @@
 }
 
 
-void Scumm::initScummVars()
-{
+void Scumm::initScummVars() {
 	if (!(_features & GF_AFTER_V7)) {
 		_vars[VAR_CURRENTDRIVE] = 0;
 		_vars[VAR_FIXEDDISK] = true;
@@ -467,10 +461,9 @@
 		_vars[VAR_CURRENTDISK] = 1;
 		_vars[VAR_LANGUAGE] = _language;
 	}
-}	
+}
 
-void Scumm::checkRange(int max, int min, int no, const char *str)
-{
+void Scumm::checkRange(int max, int min, int no, const char *str) {
 	if (no < min || no > max) {
 		char buf[1024];
 		sprintf(buf, str, no);
@@ -479,8 +472,7 @@
 	}
 }
 
-int Scumm::scummLoop(int delta)
-{
+int Scumm::scummLoop(int delta) {
 	static int counter = 0;
 
 #ifndef _WIN32_WCE
@@ -572,8 +564,8 @@
 			// Ender: Disabled for small_header games, as can overwrite game
 			//  variables (eg, Zak256 cashcard values). Temp disabled for V8
 			// because of odd timing issue with scripts and the variable reset
- 			if (success && _saveLoadCompatible && !(_features & GF_SMALL_HEADER) && !(_features & GF_AFTER_V8))
- 				_vars[VAR_GAME_LOADED] = 201;
+			if (success && _saveLoadCompatible && !(_features & GF_SMALL_HEADER) && !(_features & GF_AFTER_V8))
+				_vars[VAR_GAME_LOADED] = 201;
 		} else {
 			success = loadState(_saveLoadSlot, _saveLoadCompatible);
 			if (!success)
@@ -581,7 +573,7 @@
 
 			// Ender: Disabled for small_header games, as can overwrite game
 			//  variables (eg, Zak256 cashcard values).
- 			if (success && _saveLoadCompatible && !(_features & GF_SMALL_HEADER))
+			if (success && _saveLoadCompatible && !(_features & GF_SMALL_HEADER))
 				_vars[VAR_GAME_LOADED] = 203;
 		}
 
@@ -696,8 +688,7 @@
 
 }
 
-void Scumm::startScene(int room, Actor * a, int objectNr)
-{
+void Scumm::startScene(int room, Actor * a, int objectNr) {
 	int i, where;
 	Actor *at;
 
@@ -799,7 +790,6 @@
 	if (_roomResource == 0)
 		return;
 
-
 	memset(gfxUsageBits, 0, sizeof(gfxUsageBits));
 
 	if (a) {
@@ -838,8 +828,7 @@
 	CHECK_HEAP;
 }
 
-void Scumm::initRoomSubBlocks()
-{
+void Scumm::initRoomSubBlocks() {
 	int i, offs;
 	byte *ptr;
 	byte *roomptr, *searchptr, *roomResPtr;
@@ -876,7 +865,6 @@
 		_scrHeight = READ_LE_UINT16(&(rmhd->old.height));
 	}
 
-
 	if (_features & GF_SMALL_HEADER)
 		_IM00_offs = findResourceData(MKID('IM00'), roomptr) - roomptr;
 	else if (_features & GF_AFTER_V8) {
@@ -891,8 +879,7 @@
 		_IM00_offs = ptr - roomptr;
 	} else
 		_IM00_offs =
-			findResource(MKID('IM00'),
-									 findResource(MKID('RMIM'), roomptr)) - roomptr;
+			findResource(MKID('IM00'), findResource(MKID('RMIM'), roomptr)) - roomptr;
 
 	// Look for an exit script
 	ptr = findResourceData(MKID('EXCD'), roomResPtr);
@@ -977,7 +964,6 @@
 		}
 	}
 
-
 	//
 	// Setup local script
 	//
@@ -1076,8 +1062,7 @@
 	memset(_extraBoxFlags, 0, sizeof(_extraBoxFlags));
 }
 
-void Scumm::setScaleItem(int slot, int a, int b, int c, int d)
-{
+void Scumm::setScaleItem(int slot, int a, int b, int c, int d) {
 	byte *ptr;
 	int cur, amounttoadd, i, tmp;
 
@@ -1100,8 +1085,7 @@
 	}
 }
 
-void Scumm::setScaleSlot(int slot, int x1, int y1, int scale1, int x2, int y2, int scale2)
-{
+void Scumm::setScaleSlot(int slot, int x1, int y1, int scale1, int x2, int y2, int scale2) {
 	assert(1 <= slot && slot <= 20);
 	_scaleSlots[slot-1].x2 = x2;
 	_scaleSlots[slot-1].y2 = y2;
@@ -1111,8 +1095,7 @@
 	_scaleSlots[slot-1].scale1 = scale1;
 }
 
-void Scumm::dumpResource(char *tag, int idx, byte *ptr)
-{
+void Scumm::dumpResource(char *tag, int idx, byte *ptr) {
 	char buf[256];
 	File out;
 
@@ -1138,33 +1121,28 @@
 	out.close();
 }
 
-void Scumm::clearClickedStatus()
-{
+void Scumm::clearClickedStatus() {
 	checkKeyHit();
 	_mouseButStat = 0;
 	_leftBtnPressed &= ~msClicked;
 	_rightBtnPressed &= ~msClicked;
 }
 
-int Scumm::checkKeyHit()
-{
+int Scumm::checkKeyHit() {
 	int a = _keyPressed;
 	_keyPressed = 0;
 	return a;
 }
 
-void Scumm::pauseGame(bool user)
-{
+void Scumm::pauseGame(bool user) {
 	pauseDialog();
 }
 
-void Scumm::setOptions()
-{
+void Scumm::setOptions() {
 	//_newgui->optionsDialog();
 }
 
-int Scumm::runDialog(Dialog *dialog)
-{
+int Scumm::runDialog(Dialog *dialog) {
 	// Pause sound put
 	bool old_soundsPaused = _sound->_soundsPaused;
 	_sound->pauseSounds(true);
@@ -1182,29 +1160,25 @@
 	return result;
 }
 
-void Scumm::pauseDialog()
-{
+void Scumm::pauseDialog() {
 	if (!_pauseDialog)
 		_pauseDialog = new PauseDialog(_newgui, this);
 	runDialog(_pauseDialog);
 }
 
-void Scumm::saveloadDialog()
-{
+void Scumm::saveloadDialog() {
 	if (!_saveLoadDialog)
 		_saveLoadDialog = new SaveLoadDialog(_newgui, this);
 	runDialog(_saveLoadDialog);
 }
 
-void Scumm::optionsDialog()
-{
+void Scumm::optionsDialog() {
 	if (!_optionsDialog)
 		_optionsDialog = new OptionsDialog(_newgui, this);
 	runDialog(_optionsDialog);
 }
 
-char Scumm::displayError(bool showCancel, const char *message, ...)
-{
+char Scumm::displayError(bool showCancel, const char *message, ...) {
 	char buf[1024], result;
 	va_list va;
 
@@ -1219,14 +1193,12 @@
 	return result;
 }
 
-void Scumm::shutDown(int i)
-{
+void Scumm::shutDown(int i) {
 	/* TODO: implement this */
 	warning("shutDown: not implemented");
 }
 
-void Scumm::processKbd()
-{
+void Scumm::processKbd() {
 	int saveloadkey;
 	getKeyInput();
 
@@ -1237,8 +1209,6 @@
 
 	_virtual_mouse_x = mouse.x + virtscr[0].xstart;
 
-
-
 	if(_features & GF_AFTER_V7)
 		_virtual_mouse_y = mouse.y + camera._cur.y - (_realHeight / 2);
 	else
@@ -1275,7 +1245,7 @@
 
 	if (_lastKeyHit == _vars[VAR_RESTART_KEY]) {
 		warning("Restart not implemented");
-//    pauseGame(true);
+//		pauseGame(true);
 		return;
 	}
 
@@ -1338,8 +1308,7 @@
 	_mouseButStat = _lastKeyHit;
 }
 
-int Scumm::getKeyInput()
-{
+int Scumm::getKeyInput() {
 	_mouseButStat = 0;
 
 	_lastKeyHit = checkKeyHit();
@@ -1394,8 +1363,7 @@
 	return _lastKeyHit;
 }
 
-void Scumm::convertKeysToClicks()
-{
+void Scumm::convertKeysToClicks() {
 	if (_lastKeyHit && _cursor.state > 0) {
 		if (_lastKeyHit == 9) {
 			_mouseButStat = MBS_RIGHT_CLICK;
@@ -1407,13 +1375,11 @@
 	}
 }
 
-Actor *Scumm::derefActor(int id)
-{
+Actor *Scumm::derefActor(int id) {
 	return &_actors[id];
 }
 
-Actor *Scumm::derefActorSafe(int id, const char *errmsg)
-{
+Actor *Scumm::derefActorSafe(int id, const char *errmsg) {
 	if (id < 1 || id >= NUM_ACTORS) {
 		if (_debugLevel > 1)
 		warning
@@ -1424,8 +1390,7 @@
 	return derefActor(id);
 }
 
-void Scumm::setStringVars(int slot)
-{
+void Scumm::setStringVars(int slot) {
 	StringTab *st = &_string[slot];
 	st->xpos = st->t_xpos;
 	st->ypos = st->t_ypos;
@@ -1437,13 +1402,11 @@
 	st->charset = st->t_charset;
 }
 
-void Scumm::startManiac()
-{
+void Scumm::startManiac() {
 	warning("stub startManiac()");
 }
 
-void Scumm::destroy()
-{
+void Scumm::destroy() {
 	freeResources();
 
 	free(_objectStateTable);
@@ -1462,8 +1425,7 @@
 //
 // Convert an old style direction to a new style one (angle),
 //
-int newDirToOldDir(int dir)
-{
+int newDirToOldDir(int dir) {
 	if (dir >= 71 && dir <= 109)
 		return 1;
 	if (dir >= 109 && dir <= 251)
@@ -1476,8 +1438,7 @@
 //
 // Convert an new style (angle) direction to an old style one.
 //
-int oldDirToNewDir(int dir)
-{
+int oldDirToNewDir(int dir) {
 	const int new_dir_table[4] = { 270, 90, 180, 0 };
 	return new_dir_table[dir];
 }
@@ -1485,8 +1446,7 @@
 //
 // Convert an angle to a simple direction.
 //
-int toSimpleDir(int dirType, int dir)
-{
+int toSimpleDir(int dirType, int dir) {
 	const int16 many_direction_tab[16] = {
 		71, 109, 251, 289,  -1,  -1,  -1,  -1,
 		22,  72, 107, 157, 202, 252, 287, 337
@@ -1498,27 +1458,23 @@
 			return i;
 	}
 	return 0;
-
 }
 
 //
 // Convert a simple direction to an angle
 //
-int fromSimpleDir(int dirType, int dir)
-{
+int fromSimpleDir(int dirType, int dir) {
 	if (dirType)
 		return dir * 45;
 	else
 		return dir * 90;
 }
 
-
 //
 // Normalize the given angle - that means, ensure it is positive, and
 // change it to the closest multiple of 45 degree by abusing toSimpleDir.
 //
-int normalizeAngle(int angle)
-{
+int normalizeAngle(int angle) {
 	int temp;
 
 	temp = (angle + 360) % 360;
@@ -1526,8 +1482,7 @@
 	return toSimpleDir(1, temp) * 45;
 }
 
-void NORETURN CDECL error(const char *s, ...)
-{
+void NORETURN CDECL error(const char *s, ...) {
 	char buf[1024];
 #if defined( USE_WINDBG ) || defined ( _WIN32_WCE )
 	char buf2[1024];
@@ -1573,7 +1528,7 @@
 #endif
 #endif
 	}
-	
+
 	// Finally exit. quit() will terminate the program if g_system iss present
 	if (g_system)
 		g_system->quit();
@@ -1603,9 +1558,9 @@
 					_saveLoadSlot = event.kbd.keycode - '0';
 
 					//  don't overwrite autosave (slot 0)
-	                                if (_saveLoadSlot == 0)
+					if (_saveLoadSlot == 0)
 						_saveLoadSlot = 10;
-					
+
 					sprintf(_saveLoadName, "Quicksave %d", _saveLoadSlot);
 					_saveLoadFlag = (event.kbd.flags == OSystem::KBD_ALT) ? 1 : 2;
 					_saveLoadCompatible = false;
@@ -1663,7 +1618,6 @@
 	}
 }
 
-
 void Scumm::updatePalette() {
 	if (_palDirtyMax == -1)
 		return;
@@ -1715,8 +1669,7 @@
 	_palDirtyMin = 256;
 }
 
-void Scumm::mainRun()
-{
+void Scumm::mainRun() {
 	int delta = 0;
 	int last_time = _system->get_msecs(); 
 	int new_time;
@@ -1734,15 +1687,14 @@
 	}
 }
 
-void Scumm::launch()
-{
+void Scumm::launch() {
 	gdi._vm = this;
 
 	_maxHeapThreshold = 450000;
 	_minHeapThreshold = 400000;
 
 	_verbRedraw = false;
-	
+
 	allocResTypeData(rtBuffer, MKID('NONE'), 10, "buffer", 0);
 	initVirtScreen(0, 0, 0, _realWidth, _realHeight, false, false);
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- sound.cpp	4 Mar 2003 06:10:07 -0000	1.87
+++ sound.cpp	6 Mar 2003 17:58:07 -0000	1.88
@@ -123,15 +123,15 @@
 	_soundQuePos = 0;
 }
 
-byte * Sound::readCreativeVocFile(byte * ptr, uint32 & size, uint32 & rate, uint32 & loops) {
-	assert(strncmp((char*)ptr, "Creative Voice File\x1A", 20) == 0);
+byte *Sound::readCreativeVocFile(byte *ptr, uint32 &size, uint32 &rate, uint32 &loops) {
+	assert(strncmp((char *)ptr, "Creative Voice File\x1A", 20) == 0);
 	int32 offset = READ_LE_UINT16(ptr + 20);
 	int16 version = READ_LE_UINT16(ptr + 22);
 	int16 code = READ_LE_UINT16(ptr + 24);
 	assert(version == 0x010A || version == 0x0114);
 	assert(code == ~version + 0x1234);
 	bool quit = 0;
-	byte * ret_sound = 0; size = 0, loops = 0;
+	byte *ret_sound = 0; size = 0, loops = 0;
 	while(!quit) {
 		int len = READ_LE_UINT32(ptr + offset);
 		offset += 4;
@@ -147,9 +147,9 @@
 				debug(9, "VOC Data Bloc : %d, %d, %d", rate, packing, len);
 				if(packing == 0) {
 					if(size) {
-						ret_sound = (byte*)realloc(ret_sound, size + len);
+						ret_sound = (byte *)realloc(ret_sound, size + len);
 					} else {
-						ret_sound = (byte*)malloc(len);
+						ret_sound = (byte *)malloc(len);
 					}
 					memcpy(ret_sound + size, ptr + offset, len);
 					size += len;
@@ -194,7 +194,7 @@
 			_scumm->_vars[_scumm->VAR_MI1_TIMER] = 0;
 			playCDTrack(ptr[16], ptr[17] == 0xff ? -1 : ptr[17],
 							(ptr[18] * 60 + ptr[19]) * 75 + ptr[20], 0);
-	
+
 			_scumm->current_cd_sound = soundID;
 			return;
 		}
@@ -202,16 +202,16 @@
 		// This is rather hackish right now, but works OK. SFX are not sounding
 		// 100% correct, though, not sure right now what is causing this.
 		else if (READ_UINT32_UNALIGNED(ptr) == MKID('Mac1')) {
-	
+
 			// Read info from the header
 			size = READ_BE_UINT32_UNALIGNED(ptr+0x60);
 			rate = READ_BE_UINT32_UNALIGNED(ptr+0x64) >> 16;
-	
+
 			// Skip over the header (fixed size)
 			ptr += 0x72;
-			
+
 			// Allocate a sound buffer, copy the data into it, and play
-			sound = (char*)malloc(size);
+			sound = (char *)malloc(size);
 			memcpy(sound, ptr, size);
 			_scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
 			return;
@@ -223,13 +223,13 @@
 			ptr += 8 + READ_BE_UINT32_UNALIGNED(ptr+12);
 			if (READ_UINT32_UNALIGNED(ptr) != MKID('SDAT'))
 				return;	// abort
-	
+
 			size = READ_BE_UINT32_UNALIGNED(ptr+4) - 8;
 			// FIXME - what value here ?!? 11025 is just a guess based on strings in w32 bin, prev guess 8000
 			rate = 11025;
-			
+
 			// Allocate a sound buffer, copy the data into it, and play
-			sound = (char*)malloc(size);
+			sound = (char *)malloc(size);
 			memcpy(sound, ptr + 8, size);
 			_scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
 			return;
@@ -245,7 +245,7 @@
 		// Support for sampled sound effects in Monkey1 and Monkey2
 		else if (READ_UINT32_UNALIGNED(ptr) == MKID('SBL ')) {
 			debug(2, "Using SBL sound effect");
-	
+
 			// TODO - Figuring out how the SBL chunk works. Here's
 			// an example:
 			//
@@ -287,15 +287,15 @@
 				rate = 8000;
 
 			size = READ_BE_UINT32_UNALIGNED(ptr + 4) - 27;
-	
+
 			// Allocate a sound buffer, copy the data into it, and play
-			sound = (char*)malloc(size);
+			sound = (char *)malloc(size);
 			memcpy(sound, ptr + 33, size);
 			_scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
 			return;
 		} else if (_scumm->_features & GF_OLD256) {
 			size = READ_LE_UINT32(ptr);
-			
+
 	#if 0
 			// FIXME - this is just some debug output for Zak256
 			if (size != 30) {
@@ -361,9 +361,10 @@
 			ptr += 0x16;
 			if (size == 30) {
 				int track = *ptr;
-	
+
 				if (track == _scumm->current_cd_sound)
-					if (pollCD() == 1) return;
+					if (pollCD() == 1)
+						return;
 
 				playCDTrack(track, 1, 0, 0);
 				_scumm->current_cd_sound = track;
@@ -371,7 +372,7 @@
 			}
 	
 			size -= 0x36;
-			sound = (char*)malloc(size);
+			sound = (char *)malloc(size);
 			for (int x = 0; x < size; x++) {
 				int bit = *ptr++;
 				if (_scumm->_gameId == GID_INDY3_256) {
@@ -381,7 +382,7 @@
 					sound[x] = bit ^ 0x80;
 				} else {
 					if (bit < 0x80)
-						sound[x] = 0x7F-bit;
+						sound[x] = 0x7F - bit;
 					else
 						sound[x] = bit;
 				}
@@ -456,17 +457,15 @@
 	}
 }
 
-static int compar(const void *a, const void *b)
-{
-	return ((MP3OffsetTable *) a)->org_offset -
-		((MP3OffsetTable *) b)->org_offset;
+static int compar(const void *a, const void *b) {
+	return ((MP3OffsetTable *)a)->org_offset - ((MP3OffsetTable *)b)->org_offset;
 }
 
 int Sound::startTalkSound(uint32 offset, uint32 b, int mode) {
 	int num = 0, i;
 	byte file_byte, file_byte_2;
 	int size;
-	byte* sound;
+	byte *sound;
 
 	if (_sfxFile->isOpen() == false) {
 		warning("startTalkSound: SFX file is not open");
@@ -479,13 +478,12 @@
 	if (_scumm->_features & GF_HUMONGOUS) {
 		// SKIP TLKB (8) TALK (8) HSHD (24) and SDAT (8)
 		_sfxFile->seek(offset + 48, SEEK_SET);
-		sound = (byte*)malloc(b - 64);
+		sound = (byte *)malloc(b - 64);
 		_sfxFile->read(sound, b - 64);
 		_scumm->_mixer->playRaw(NULL, sound, b - 64, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
 		return -1;
 	}
 
-
 	// Some games frequently assume that starting one sound effect will
 	// automatically stop any other that may be playing at that time. So
 	// that is what we do here, but we make an exception for speech.
@@ -511,8 +509,8 @@
 		MP3OffsetTable *result = NULL, key;
 
 		key.org_offset = offset;
-		result = (MP3OffsetTable *) bsearch(&key, offset_table, num_sound_effects,
-		                                    sizeof(MP3OffsetTable), compar);
+		result = (MP3OffsetTable *)bsearch(&key, offset_table, num_sound_effects,
+																				sizeof(MP3OffsetTable), compar);
 
 		if (result == NULL) {
 			warning("startTalkSound: did not find sound at offset %d !", offset);
@@ -678,8 +676,7 @@
 			_soundQue2[i] = 0;
 }
 
-void Sound::stopAllSounds()
-{
+void Sound::stopAllSounds() {
 	IMuse *se = _scumm->_imuse;
 
 	if (_scumm->current_cd_sound != 0) {
@@ -766,7 +763,7 @@
 		return;
 
 	_soundsPaused = pause;
-	_scumm->_mixer->pause(pause);	
+	_scumm->_mixer->pause(pause);
 
 	_scumm->_sound->pauseBundleMusic(pause);
 
@@ -780,7 +777,6 @@
 		else
 			startCDTimer();
 	}
-		
 }
 
 int Sound::startSfxSound(File *file, int file_size) {
@@ -858,9 +854,9 @@
 	return playSfxSound(data, size, 1000000 / (256 - rate), true);
 }
 
-File * Sound::openSfxFile() {
+File *Sound::openSfxFile() {
 	char buf[256];
-	File * file = new File();
+	File *file = new File();
 
 	/* Try opening the file <_exe_name>.sou first, eg tentacle.sou.
 	 * That way, you can keep .sou files for multiple games in the
@@ -940,18 +936,17 @@
 	}
 }
 
-
 bool Sound::isSfxFinished() {
 	return !_scumm->_mixer->hasActiveChannel();
 }
 
-uint32 Sound::decode12BitsSample(byte * src, byte ** dst, uint32 size, bool stereo = false) {
+uint32 Sound::decode12BitsSample(byte *src, byte **dst, uint32 size, bool stereo = false) {
 	uint32 s_size = (size / 3) * 4;
 	uint32 loop_size = s_size / 4;
 	if (stereo == true) {
 		s_size *= 2;
 	}
-	byte *ptr = *dst = (byte*)malloc(s_size);
+	byte *ptr = *dst = (byte *)malloc(s_size);
 
 	uint32 tmp;
 	while(loop_size--) {
@@ -976,24 +971,22 @@
 	return s_size;
 }
 
-static void music_handler (void * engine) {
+static void music_handler (void *engine) {
 	g_scumm->_sound->bundleMusicHandler(g_scumm);
 }
 
-void Sound::playBundleMusic(char * song) {
-
+void Sound::playBundleMusic(char *song) {
 	if (_scumm->_silentDigitalImuse == true) {
 		return;
 	}
 
 	if (_nameBundleMusic == NULL) {
-		// FIXME: we have MUSDISK1.BUN and MUSDISK2.BUN in COMI.
 		_outputMixerSize = 66150; // ((22050 * 2 * 2) / 4) * 3
 		if (_scumm->_gameId == GID_CMI) {
 			char bunfile[20];
 			sprintf(bunfile, "musdisk%d.bun", _scumm->_vars[_scumm->VAR_CURRENTDISK]);
 			if (_musicDisk != _scumm->_vars[_scumm->VAR_CURRENTDISK]) 
-				_scumm->_bundle->_musicFile.close();	
+				_scumm->_bundle->_musicFile.close();
 
 			if (_scumm->_bundle->openMusicFile(bunfile, _scumm->getGameDataPath()) == false) {
 				if (_scumm->_bundle->openMusicFile("music.bun", _scumm->getGameDataPath()) == false) {
@@ -1008,8 +1001,8 @@
 			if (_scumm->_bundle->openMusicFile("digmusic.bun", _scumm->getGameDataPath()) == false)
 				return;
 		}
-		_musicBundleBufFinal = (byte*)malloc(_outputMixerSize);
-		_musicBundleBufOutput = (byte*)malloc(((_outputMixerSize / 0x2000) + 1) * _outputMixerSize);
+		_musicBundleBufFinal = (byte *)malloc(_outputMixerSize);
+		_musicBundleBufOutput = (byte *)malloc(((_outputMixerSize / 0x2000) + 1) * _outputMixerSize);
 		_currentSampleBundleMusic = 0;
 		_offsetSampleBundleMusic = 0;
 		_offsetBufBundleMusic = 0;
@@ -1038,12 +1031,12 @@
 	_musicBundleToBeRemoved = true;
 }
 
-void Sound::bundleMusicHandler(Scumm * scumm) {
-	byte * ptr;
+void Sound::bundleMusicHandler(Scumm *scumm) {
+	byte *ptr;
 	int32 l, num = _numberSamplesBundleMusic, length, k;
 	int32 rate = 22050;
 	int32 tag, size = -1, header_size = 0;
-	
+
 	if (_pauseBundleMusic)
 		return;
 
@@ -1121,7 +1114,7 @@
 			}
 			header_size = (ptr - _musicBundleBufOutput);
 		}
-	
+
 		l++;
 		_currentSampleBundleMusic = l;
 
@@ -1143,12 +1136,12 @@
 
 	ptr = _musicBundleBufFinal;
 
-	byte * buffer = NULL;
+	byte *buffer = NULL;
 	uint32 final_size;
 	if (_bundleMusicSampleBits == 12) {
 		final_size = decode12BitsSample(ptr, &buffer, _outputMixerSize);
 	} else if (_bundleMusicSampleBits == 16) {
-		buffer = (byte*)malloc(_outputMixerSize);
+		buffer = (byte *)malloc(_outputMixerSize);
 		final_size = _outputMixerSize;
 		memcpy(buffer, ptr, _outputMixerSize);
 	} else {
@@ -1167,7 +1160,7 @@
 }
 
 int Sound::playBundleSound(char *sound) {
-	byte * ptr;
+	byte *ptr;
 	bool result;
 
 	if (_scumm->_noDigitalSamples)
@@ -1217,7 +1210,7 @@
 	}
 	assert(output_size <= 1000000);
 
-	tag = READ_BE_UINT32(ptr); ptr+=4;
+	tag = READ_BE_UINT32(ptr); ptr += 4;
 	if (tag != MKID_BE('iMUS')) {
 		warning("Decompression of bundle sound failed");
 		free(ptr);
@@ -1247,7 +1240,7 @@
 			break;
 
 			default:
-			error("Unknown sound header %c%c%c%c", tag>>24, tag>>16, tag>>8, tag);
+			error("Unknown sound header %c%c%c%c", tag >> 24, tag >> 16, tag >> 8, tag);
 		}
 	}
 
@@ -1256,8 +1249,8 @@
 		free(ptr);
 		return -1;
 	}
-	
-	byte * final = (byte *)malloc(size);
+
+	byte *final = (byte *)malloc(size);
 	memcpy(final, ptr, size);
 
 	if (_scumm->_actorToPrintStrFor != 0xFF && _scumm->_actorToPrintStrFor != 0) {
@@ -1382,8 +1375,7 @@
 // We use a real timer in an attempt to get better sync with CD tracks. This is
 // necessary for games like Loom CD.
 
-static void cd_timer_handler(void *ptr)
-{
+static void cd_timer_handler(void *ptr) {
 	Scumm *scumm = (Scumm *) ptr;
 
 	// Maybe I could simply update _vars[VAR_MI1_TIMER] directly here, but
@@ -1398,13 +1390,11 @@
 	scumm->_sound->_cd_timer_value += 6;
 }
 
-int Sound::readCDTimer()
-{
+int Sound::readCDTimer() {
 	return _cd_timer_value;
 }
 
-void Sound::startCDTimer()
-{
+void Sound::startCDTimer() {
 	int timer_interval;
 
 	// The timer interval has been tuned for Loom CD and the Monkey 1
@@ -1422,13 +1412,11 @@
 	_scumm->_timer->installProcedure(&cd_timer_handler, 1000 * timer_interval);
 }
 
-void Sound::stopCDTimer()
-{
+void Sound::stopCDTimer() {
 	_scumm->_timer->releaseProcedure(&cd_timer_handler);
 }
 
-void Sound::playCDTrack(int track, int num_loops, int start, int delay)
-{
+void Sound::playCDTrack(int track, int num_loops, int start, int delay) {
 	if (playMP3CDTrack(track, num_loops, start, delay) == -1)
 		_scumm->_system->play_cdrom(track, num_loops, start, delay);
 
@@ -1439,23 +1427,20 @@
 	startCDTimer();
 }
 
-void Sound::stopCD()
-{
+void Sound::stopCD() {
 	stopCDTimer();
 	if (stopMP3CD() == -1)
 		_scumm->_system->stop_cdrom();
 }
 
-int Sound::pollCD()
-{
+int Sound::pollCD() {
 	if (pollMP3CD())
 		return 1;
 
 	return _scumm->_system->poll_cdrom();
 }
 
-void Sound::updateCD()
-{
+void Sound::updateCD() {
 	if (updateMP3CD() == -1)
 		_scumm->_system->update_cdrom();
 }
@@ -1650,7 +1635,7 @@
 	_error_flag = false;
 	return;
 
- error:
+error:
 	mad_frame_finish(&frame);
 	mad_stream_finish(&stream);
 	_error_flag = true;

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sound.h	26 Jan 2003 14:26:03 -0000	1.26
+++ sound.h	6 Mar 2003 17:58:09 -0000	1.27
@@ -42,16 +42,16 @@
 	bool _soundsPaused2;
 	bool _soundVolumePreset;
 
-	char * _nameBundleMusic;
-	char * _newNameBundleMusic;
+	char *_nameBundleMusic;
+	char *_newNameBundleMusic;
 	byte _musicDisk;
 	byte _voiceDisk;
 	int32 _currentSampleBundleMusic;
 	int32 _numberSamplesBundleMusic;
 	int32 _offsetSampleBundleMusic;
 	int32 _offsetBufBundleMusic;
-	byte * _musicBundleBufFinal;
-	byte * _musicBundleBufOutput;
+	byte *_musicBundleBufFinal;
+	byte *_musicBundleBufOutput;
 	bool _pauseBundleMusic;
 	int32 _bundleMusicTrack;
 	bool _musicBundleToBeChanged;
@@ -125,7 +125,7 @@
 	};
 #endif
 
-	Scumm * _scumm;
+	Scumm *_scumm;
 
 public:
 
@@ -159,16 +159,16 @@
 	void setupSound();
 	void pauseSounds(bool pause);
 	int startSfxSound(File *file, int file_size);
-	File * openSfxFile();
+	File *openSfxFile();
 	void stopSfxSound();
 	bool isSfxFinished();
-	uint32 decode12BitsSample(byte * src, byte ** dst, uint32 size, bool stereo);
-	void playBundleMusic(char * song);
+	uint32 decode12BitsSample(byte *src, byte **dst, uint32 size, bool stereo);
+	void playBundleMusic(char *song);
 	void pauseBundleMusic(bool state);
-	void bundleMusicHandler(Scumm * scumm);
+	void bundleMusicHandler(Scumm *scumm);
 	void stopBundleMusic();
 	int playBundleSound(char *sound);
-	byte * readCreativeVocFile(byte * ptr, uint32 & size, uint32 & rate, uint32 & loops);
+	byte *readCreativeVocFile(byte *ptr, uint32 &size, uint32 &rate, uint32 &loops);
 	int playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned);
 	int playSfxSound_MP3(void *sound, uint32 size);
 	int playSfxSound_Vorbis(void *sound, uint32 size);

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- string.cpp	14 Feb 2003 16:01:55 -0000	1.85
+++ string.cpp	6 Mar 2003 17:58:10 -0000	1.86
@@ -28,8 +28,7 @@
 #include "verbs.h"
 #include "scumm/sound.h"
 
-void Scumm::unkMessage1()
-{
+void Scumm::unkMessage1() {
 	byte buffer[100];
 	_msgPtrToAdd = buffer;
 	_messagePtr = addMessageToStack(_messagePtr);
@@ -54,8 +53,7 @@
 	} 
 }
 
-void Scumm::unkMessage2()
-{
+void Scumm::unkMessage2() {
 	byte buf[100], *tmp;
 
 	_msgPtrToAdd = buf;
@@ -73,9 +71,7 @@
 	_messagePtr = tmp;
 }
 
-
-void Scumm::CHARSET_1()
-{
+void Scumm::CHARSET_1() {
 	uint32 talk_sound_a = 0;
 	uint32 talk_sound_b = 0;
 	int s, i, t, c;
@@ -144,7 +140,6 @@
 	else
 		_charset->setCurID(_string[0].charset);
 
-
 	_charset->_center = _string[0].center;
 	_charset->_right = _string[0].right;
 	_charset->_color = _charsetColor;
@@ -345,8 +340,7 @@
 	gdi._mask_bottom = _charset->_strBottom;
 }
 
-void Scumm::description()
-{
+void Scumm::description() {
 	int c;
 	byte *buf;
 
@@ -390,8 +384,7 @@
 	gdi._mask_bottom = _charset->_strBottom;
 }
 
-void Scumm::drawDescString(byte *msg)
-{
+void Scumm::drawDescString(byte *msg) {
 	byte c, *buf, buffer[256];
 
 	buf = _msgPtrToAdd = buffer;
@@ -435,8 +428,7 @@
 	gdi._mask_bottom = _charset->_strBottom;
 }
 
-void Scumm::drawString(int a)
-{
+void Scumm::drawString(int a) {
 	byte buf[256];
 	byte *space;
 	int i;
@@ -561,8 +553,7 @@
 	} 
 }
 
-byte *Scumm::addMessageToStack(byte *msg)
-{
+byte *Scumm::addMessageToStack(byte *msg) {
 	int num, numorg;
 	unsigned char *ptr, chr;
 
@@ -677,8 +668,7 @@
 	return msg;
 }
 
-void Scumm::addIntToStack(int var)
-{
+void Scumm::addIntToStack(int var) {
 	int num, max;
 	byte flag;
 
@@ -762,8 +752,7 @@
 	}
 }
 
-void Scumm::addStringToStack(int var)
-{
+void Scumm::addStringToStack(int var) {
 	byte *ptr;
 
 	if (_features & GF_AFTER_V6 || _gameId == GID_INDY3_256)
@@ -793,8 +782,7 @@
 		addMessageToStack((byte *)"");
 }
 
-void Scumm::initCharset(int charsetno)
-{
+void Scumm::initCharset(int charsetno) {
 	int i;
 
 	if (_features & GF_OLD256)
@@ -812,8 +800,7 @@
 		_charsetColorMap[i] = _charsetData[_charset->getCurID()][i];
 }
 
-int indexCompare(const void *p1, const void *p2)
-{
+int indexCompare(const void *p1, const void *p2) {
 	struct langIndexNode *i1 = (struct langIndexNode *) p1;
 	struct langIndexNode *i2 = (struct langIndexNode *) p2;
 
@@ -838,7 +825,7 @@
 	}
 
 	size = file.size();
-	_languageBuffer = (char*)malloc(size);
+	_languageBuffer = (char *)malloc(size);
 	file.read(_languageBuffer, size);
 	file.close();
 
@@ -916,7 +903,7 @@
 				target.tag[l] = toupper(text[l + 1]);
 			target.tag[l] = 0;
 
-			found = (struct langIndexNode *) bsearch(&target, _languageIndex, _languageStrCount, sizeof(struct langIndexNode), indexCompare);
+			found = (struct langIndexNode *)bsearch(&target, _languageIndex, _languageStrCount, sizeof(struct langIndexNode), indexCompare);
 
 			if (found != NULL) {
 				File file;
@@ -967,7 +954,7 @@
 			// skip translation if flag 'h' exist
 			if (buf[pos] == 'h') {
 				pos += 3;
-				byte *pointer = (byte *)strchr((char*)text + 1, '/');
+				byte *pointer = (byte *)strchr((char *)text + 1, '/');
 				if (pointer != NULL)
 					memcpy(trans_buff, pointer + 1, resStrLen(pointer + 1) + 1);
 				else
@@ -1028,7 +1015,7 @@
 	}
 
 	if (text[0] == '/') {
-		byte *pointer = (byte *)strchr((char*)text + 1, '/');
+		byte *pointer = (byte *)strchr((char *)text + 1, '/');
 		if (pointer != NULL)
 			memcpy(trans_buff, pointer + 1, resStrLen(pointer + 1) + 1);
 		else

Index: usage_bits.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/usage_bits.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- usage_bits.cpp	19 Jan 2003 20:31:05 -0000	1.5
+++ usage_bits.cpp	6 Mar 2003 17:58:11 -0000	1.6
@@ -21,8 +21,7 @@
 #include "scumm.h"
 #include "usage_bits.h"
 
-void Scumm::upgradeGfxUsageBits()
-{
+void Scumm::upgradeGfxUsageBits() {
 	int i;
 
 	for (i = 409; i >= 0; i--) {
@@ -37,29 +36,25 @@
 	}
 }
 
-void Scumm::setGfxUsageBit(int strip, int bit)
-{
+void Scumm::setGfxUsageBit(int strip, int bit) {
 	assert(1 <= bit && bit <= 96);
 	bit--;
 	gfxUsageBits[3 * strip + bit / 32] |= (1 << (bit % 32));
 }
 
-void Scumm::clearGfxUsageBit(int strip, int bit)
-{
+void Scumm::clearGfxUsageBit(int strip, int bit) {
 	assert(1 <= bit && bit <= 96);
 	bit--;
 	gfxUsageBits[3 * strip + bit / 32] &= ~(1 << (bit % 32));
 }
 
-bool Scumm::testGfxUsageBit(int strip, int bit)
-{
+bool Scumm::testGfxUsageBit(int strip, int bit) {
 	assert(1 <= bit && bit <= 96);
 	bit--;
 	return (gfxUsageBits[3 * strip + bit / 32] & (1 << (bit % 32))) != 0;
 }
 
-bool Scumm::testGfxAnyUsageBits(int strip)
-{
+bool Scumm::testGfxAnyUsageBits(int strip) {
 	// Exclude the DIRTY and RESTORED bits from the test
 	uint32 bitmask[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 0x3FFFFFFF };
 	int i;
@@ -71,8 +66,7 @@
 	return false;
 }
 
-bool Scumm::testGfxOtherUsageBits(int strip, int bit)
-{
+bool Scumm::testGfxOtherUsageBits(int strip, int bit) {
 	// Don't exclude the DIRTY and RESTORED bits from the test
 	uint32 bitmask[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
 	int i;

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- vars.cpp	18 Feb 2003 01:51:05 -0000	1.38
+++ vars.cpp	6 Mar 2003 17:58:12 -0000	1.39
@@ -25,8 +25,7 @@
 #include "scumm.h"
 #include "intern.h"
 
-void Scumm::setupScummVars()
-{
+void Scumm::setupScummVars() {
 	VAR_KEYPRESS = 0;
 	VAR_EGO = 1;
 	VAR_CAMERA_POS_X = 2;
@@ -112,8 +111,7 @@
 	VAR_V6_SOUNDMODE = 9;
 }
 
-void Scumm_v6::setupScummVars()
-{
+void Scumm_v6::setupScummVars() {
 	// Many vars are the same as in V5 games, so just call the inherited method first
 	Scumm::setupScummVars();
 
@@ -124,8 +122,7 @@
 	VAR_TIMEDATE_MINUTE = 126;
 }
 
-void Scumm_v7::setupScummVars()
-{
+void Scumm_v7::setupScummVars() {
 	VAR_MOUSE_X = 1;
 	VAR_MOUSE_Y = 2;
 	VAR_VIRT_MOUSE_X = 3;
@@ -215,8 +212,7 @@
 	VAR_STRING2DRAW = 130;
 }
 
-void Scumm_v8::setupScummVars()
-{
+void Scumm_v8::setupScummVars() {
 	// VAR_ROOM_HEIGHT = 1;
 	// VAR_ROOM_WIDTH = 2;
 

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- verbs.cpp	16 Jan 2003 08:04:34 -0000	1.22
+++ verbs.cpp	6 Mar 2003 17:58:13 -0000	1.23
@@ -27,8 +27,7 @@
 #include "scumm.h"
 #include "verbs.h"
 
-void Scumm::redrawVerbs()
-{
+void Scumm::redrawVerbs() {
 	int i;
 	for (i = 0; i < _maxVerbs; i++)
 		drawVerb(i, 0);
@@ -36,8 +35,7 @@
 	_verbRedraw = false;
 }
 
-void Scumm::checkExecVerbs()
-{
+void Scumm::checkExecVerbs() {
 	int i, over;
 	VerbSlot *vs;
 
@@ -78,8 +76,7 @@
 	}
 }
 
-void Scumm::verbMouseOver(int verb)
-{
+void Scumm::verbMouseOver(int verb) {
 	if (_verbMouseOver == verb)
 		return;
 
@@ -94,8 +91,7 @@
 	}
 }
 
-int Scumm::checkMouseOver(int x, int y)
-{
+int Scumm::checkMouseOver(int x, int y) {
 	VerbSlot *vs;
 	int i = _maxVerbs - 1;
 
@@ -116,8 +112,7 @@
 	return 0;
 }
 
-void Scumm::drawVerb(int verb, int mode)
-{
+void Scumm::drawVerb(int verb, int mode) {
 	VerbSlot *vs;
 	bool tmp;
 
@@ -192,8 +187,7 @@
 	}
 }
 
-void Scumm::restoreVerbBG(int verb)
-{
+void Scumm::restoreVerbBG(int verb) {
 	VerbSlot *vs;
 
 	vs = &_verbs[verb];
@@ -204,8 +198,7 @@
 	}
 }
 
-void Scumm::drawVerbBitmap(int verb, int x, int y)
-{
+void Scumm::drawVerbBitmap(int verb, int x, int y) {
 	VirtScreen *vs;
 	VerbSlot *vst;
 	byte twobufs, *imptr;
@@ -280,8 +273,7 @@
 	vs->alloctwobuffers = twobufs;
 }
 
-int Scumm::getVerbSlot(int id, int mode)
-{
+int Scumm::getVerbSlot(int id, int mode) {
 	int i;
 	for (i = 1; i < _maxVerbs; i++) {
 		if (_verbs[i].verbid == id && _verbs[i].saveid == mode) {
@@ -291,8 +283,7 @@
 	return 0;
 }
 
-void Scumm::killVerb(int slot)
-{
+void Scumm::killVerb(int slot) {
 	VerbSlot *vs;
 
 	if (slot == 0)
@@ -311,8 +302,7 @@
 	vs->saveid = 0;
 }
 
-void Scumm::setVerbObject(uint room, uint object, uint verb)
-{
+void Scumm::setVerbObject(uint room, uint object, uint verb) {
 	byte *obimptr;
 	byte *obcdptr;
 	uint32 size, size2;





More information about the Scummvm-git-logs mailing list