Large pointless reindentation of all the code. Also fixed a few mistakes

in the object flags code cleanup.

Flags used:

indent *.cpp -br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip
-ts2 -ncs -nbs -npcs -nbap -Tbyte -Tuint32 -Tuint8 -Tuint16 -TArrayHeader
-TMemBlkHeader -TVerbSlot -TObjectData -Tvoid -TImageHeader -TRoomHeader
-TCodeHeader -TResHdr -TBompHeader -TMidiChannelAdl -TGui -TScumm
-TSoundEngine -TPart -TPlayer

svn-id: r3908

1 files changed, 88 insertions, 77 deletions

diff --git a/verbs.cpp b/verbs.cpp
index 8482be3443..04e14af15a 100644
--- a/verbs.cpp
+++ b/verbs.cpp
@@ -23,25 +23,27 @@
 #include "stdafx.h"
 #include "scumm.h"
 
-void Scumm::redrawVerbs() {
+void Scumm::redrawVerbs()
+{
 	int i;
-	for (i=0; i<_maxVerbs; i++)
+	for (i = 0; i < _maxVerbs; i++)
 		drawVerb(i, 0);
 	verbMouseOver(0);
 }
 
-void Scumm::checkExecVerbs() {
-	int i,over;
+void Scumm::checkExecVerbs()
+{
+	int i, over;
 	VerbSlot *vs;
 
-	if (_userPut<=0 || _mouseButStat==0)
+	if (_userPut <= 0 || _mouseButStat == 0)
 		return;
 
 	if (_mouseButStat < MBS_MAX_KEY) {
 		/* Check keypresses */
 		vs = &_verbs[1];
-		for (i=1; i<_maxVerbs; i++,vs++) {
-			if (vs->verbid && vs->saveid==0 && vs->curmode==1) {
+		for (i = 1; i < _maxVerbs; i++, vs++) {
+			if (vs->verbid && vs->saveid == 0 && vs->curmode == 1) {
 				if (_mouseButStat == vs->key) {
 					runInputScript(1, vs->verbid, 1);
 					return;
@@ -49,60 +51,64 @@ void Scumm::checkExecVerbs() {
 			}
 		}
 		runInputScript(4, _mouseButStat, 1);
-	} else if (_mouseButStat&MBS_MOUSE_MASK) {
-		byte code = _mouseButStat&MBS_LEFT_CLICK ? 1 : 2;
-		if (mouse.y >= virtscr[0].topline && mouse.y < virtscr[0].topline + virtscr[0].height) {
+	} else if (_mouseButStat & MBS_MOUSE_MASK) {
+		byte code = _mouseButStat & MBS_LEFT_CLICK ? 1 : 2;
+		if (mouse.y >= virtscr[0].topline
+				&& mouse.y < virtscr[0].topline + virtscr[0].height) {
 			over = checkMouseOver(mouse.x, mouse.y);
 			if (over != 0) {
-				runInputScript(1,_verbs[over].verbid,code);
+				runInputScript(1, _verbs[over].verbid, code);
 				return;
 			}
 			runInputScript(2, 0, code);
 		} else {
-			over=checkMouseOver(mouse.x, mouse.y);
-			runInputScript(1, over!=0 ? _verbs[over].verbid : 0, code);
+			over = checkMouseOver(mouse.x, mouse.y);
+			runInputScript(1, over != 0 ? _verbs[over].verbid : 0, code);
 		}
 	}
 }
 
-void Scumm::verbMouseOver(int verb) {
-	if (_verbMouseOver==verb)
+void Scumm::verbMouseOver(int verb)
+{
+	if (_verbMouseOver == verb)
 		return;
-	
-	if (_verbs[_verbMouseOver].type!=1) {
+
+	if (_verbs[_verbMouseOver].type != 1) {
 		drawVerb(_verbMouseOver, 0);
 		_verbMouseOver = verb;
 	}
 
-	if (_verbs[verb].type!=1 && _verbs[verb].hicolor) {
-		drawVerb(verb, 1);		
+	if (_verbs[verb].type != 1 && _verbs[verb].hicolor) {
+		drawVerb(verb, 1);
 		_verbMouseOver = verb;
 	}
 }
 
-int Scumm::checkMouseOver(int x, int y) {
+int Scumm::checkMouseOver(int x, int y)
+{
 	VerbSlot *vs;
-	int i = _maxVerbs-1;
+	int i = _maxVerbs - 1;
 
 	vs = &_verbs[i];
 	do {
-		if (vs->curmode!=1 || !vs->verbid || vs->saveid ||
-			y < vs->y || y >= vs->bottom)
-				continue;
+		if (vs->curmode != 1 || !vs->verbid || vs->saveid ||
+				y < vs->y || y >= vs->bottom)
+			continue;
 		if (vs->center) {
 			if (x < -(vs->right - vs->x - vs->x) || x >= vs->right)
 				continue;
-		} else {	
+		} else {
 			if (x < vs->x || x >= vs->right)
 				continue;
 		}
-		
+
 		return i;
-	} while (--vs,--i);
+	} while (--vs, --i);
 	return 0;
 }
 
-void Scumm::drawVerb(int vrb, int mode) {
+void Scumm::drawVerb(int vrb, int mode)
+{
 	VerbSlot *vs;
 	byte color;
 	byte tmp;
@@ -111,9 +117,9 @@ void Scumm::drawVerb(int vrb, int mode) {
 		return;
 
 	vs = &_verbs[vrb];
-	
+
 	if (!vs->saveid && vs->curmode && vs->verbid) {
-		if (vs->type==1) {
+		if (vs->type == 1) {
 			drawVerbBitmap(vrb, vs->x, vs->y);
 			return;
 		}
@@ -129,30 +135,31 @@ void Scumm::drawVerb(int vrb, int mode) {
 		else
 			color = vs->color;
 		string[4].color = color;
-		if (vs->curmode==2)
+		if (vs->curmode == 2)
 			string[4].color = vs->dimcolor;
 
 		_messagePtr = getResourceAddress(rtVerb, vrb);
 		assert(_messagePtr);
-		
+
 		tmp = charset._center;
 		charset._center = 0;
 		drawString(4);
 		charset._center = tmp;
-		
+
 		vs->right = charset._strRight;
 		vs->bottom = charset._strBottom;
 		vs->oldleft = charset._strLeft;
 		vs->oldright = charset._strRight;
 		vs->oldtop = charset._strTop;
 		vs->oldbottom = charset._strBottom;
-		charset._strLeft = charset._strRight;				
+		charset._strLeft = charset._strRight;
 	} else {
 		restoreVerbBG(vrb);
 	}
 }
 
-void Scumm::restoreVerbBG(int verb) {
+void Scumm::restoreVerbBG(int verb)
+{
 	VerbSlot *vs;
 
 	vs = &_verbs[verb];
@@ -164,75 +171,77 @@ void Scumm::restoreVerbBG(int verb) {
 	}
 }
 
-void Scumm::drawVerbBitmap(int vrb, int x, int y) {
+void Scumm::drawVerbBitmap(int vrb, int x, int y)
+{
 	VirtScreen *vs;
 	VerbSlot *vst;
 	byte twobufs, *imptr;
 	int ydiff, xstrip;
 	int imgw, imgh;
-	int i,tmp;
+	int i, tmp;
 	byte *obim;
 	ImageHeader *imhd;
 	uint32 size;
 
-	if ((vs=findVirtScreen(y)) == NULL)
+	if ((vs = findVirtScreen(y)) == NULL)
 		return;
 
 	_lastXstart = virtscr[0].xstart;
-	
+
 	gdi.disableZBuffer();
 
 	twobufs = vs->alloctwobuffers;
 	vs->alloctwobuffers = 0;
 
-	xstrip = x>>3;
+	xstrip = x >> 3;
 	ydiff = y - vs->topline;
 
 	obim = getResourceAddress(rtVerb, vrb);
-        if (_features & GF_SMALL_HEADER) {
-                int obj;
-                obj = READ_LE_UINT16(obim+6);
-				size = READ_LE_UINT32(obim);
-
-				imgw = (*(obim+size+11)) ;
-				imgh = (*(obim+size+17))>>3 ;
-				imptr = (obim+8);
-        } else {
-                imhd = (ImageHeader*)findResourceData(MKID('IMHD'), obim);
+	if (_features & GF_SMALL_HEADER) {
+		int obj;
+		obj = READ_LE_UINT16(obim + 6);
+		size = READ_LE_UINT32(obim);
+
+		imgw = (*(obim + size + 11));
+		imgh = (*(obim + size + 17)) >> 3;
+		imptr = (obim + 8);
+	} else {
+		imhd = (ImageHeader *)findResourceData(MKID('IMHD'), obim);
 		if (_features & GF_AFTER_V7) {
 			imgw = READ_LE_UINT16(&imhd->v7.width) >> 3;
 			imgh = READ_LE_UINT16(&imhd->v7.height) >> 3;
 		} else {
-                	imgw = READ_LE_UINT16(&imhd->old.width) >> 3;
-	                imgh = READ_LE_UINT16(&imhd->old.height) >> 3;
+			imgw = READ_LE_UINT16(&imhd->old.width) >> 3;
+			imgh = READ_LE_UINT16(&imhd->old.height) >> 3;
 		}
-	
-                imptr = findResource(MKID('IM01'), obim);
-                if (!imptr)
-                        error("No image for verb %d", vrb);
-        }
-	for (i=0; i<imgw; i++) {
+
+		imptr = findResource(MKID('IM01'), obim);
+		if (!imptr)
+			error("No image for verb %d", vrb);
+	}
+	for (i = 0; i < imgw; i++) {
 		tmp = xstrip + i;
-		if ((uint)tmp < 40)
-			gdi.drawBitmap(imptr, vs, tmp, ydiff, imgh<<3, i, 1, true);
+		if ((uint) tmp < 40)
+			gdi.drawBitmap(imptr, vs, tmp, ydiff, imgh << 3, i, 1, true);
 	}
 
 	vst = &_verbs[vrb];
-	vst->right = vst->x + imgw*8;
-	vst->bottom = vst->y + imgh*8;
+	vst->right = vst->x + imgw * 8;
+	vst->bottom = vst->y + imgh * 8;
 	vst->oldleft = vst->x;
 	vst->oldright = vst->right;
 	vst->oldtop = vst->y;
 	vst->oldbottom = vst->bottom;
-	
+
 	gdi.enableZBuffer();
 
 	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++) {
+	for (i = 1; i < _maxVerbs; i++) {
 		if (_verbs[i].verbid == id && _verbs[i].saveid == mode) {
 			return i;
 		}
@@ -240,10 +249,11 @@ int Scumm::getVerbSlot(int id, int mode) {
 	return 0;
 }
 
-void Scumm::killVerb(int slot) {
+void Scumm::killVerb(int slot)
+{
 	VerbSlot *vs;
 
-	if (slot==0)
+	if (slot == 0)
 		return;
 
 	vs = &_verbs[slot];
@@ -252,16 +262,17 @@ void Scumm::killVerb(int slot) {
 
 	nukeResource(rtVerb, slot);
 
-	if (vs->saveid==0){
+	if (vs->saveid == 0) {
 		drawVerb(slot, 0);
 		verbMouseOver(0);
 	}
 	vs->saveid = 0;
 }
 
-void Scumm::setVerbObject(uint room, uint object, uint verb) {
-	byte  *obimptr;
-	byte  *obcdptr;
+void Scumm::setVerbObject(uint room, uint object, uint verb)
+{
+	byte *obimptr;
+	byte *obcdptr;
 	uint32 size, size2;
 	FindObjectInRoom foir;
 	int i;
@@ -269,23 +280,23 @@ void Scumm::setVerbObject(uint room, uint object, uint verb) {
 	if (whereIsObject(object) == WIO_FLOBJECT)
 		error("Can't grab verb image from flobject");
 
-	if(_features & GF_SMALL_HEADER) {
-		for(i = _numObjectsInRoom; i>0; i--) {
-			if(_objs[i].obj_nr == object) {
+	if (_features & GF_SMALL_HEADER) {
+		for (i = _numObjectsInRoom; i > 0; i--) {
+			if (_objs[i].obj_nr == object) {
 				findObjectInRoom(&foir, foImageHeader, object, room);
 				size = READ_LE_UINT32(foir.obim);
 				obcdptr = getResourceAddress(rtRoom, room) + getOBCDOffs(object);
 				size2 = READ_LE_UINT32(obcdptr);
-				createResource(rtVerb, verb, size+size2);
+				createResource(rtVerb, verb, size + size2);
 				obimptr = getResourceAddress(rtRoom, room) - foir.roomptr + foir.obim;
 				obcdptr = getResourceAddress(rtRoom, room) + getOBCDOffs(object);
 				memcpy(getResourceAddress(rtVerb, verb), obimptr, size);
-				memcpy(getResourceAddress(rtVerb, verb)+size, obcdptr, size2);
+				memcpy(getResourceAddress(rtVerb, verb) + size, obcdptr, size2);
 			}
 		}
 	} else {
 		findObjectInRoom(&foir, foImageHeader, object, room);
-        	size = READ_BE_UINT32_UNALIGNED(foir.obim+4);
+		size = READ_BE_UINT32_UNALIGNED(foir.obim + 4);
 		createResource(rtVerb, verb, size);
 		obimptr = getResourceAddress(rtRoom, room) - foir.roomptr + foir.obim;
 		memcpy(getResourceAddress(rtVerb, verb), obimptr, size);