Whitespace changes

svn-id: r10390

4 files changed, 152 insertions, 155 deletions

diff --git a/scumm/smush/chunk.cpp b/scumm/smush/chunk.cpp
index d737d41f49..d55629ef56 100644
--- a/scumm/smush/chunk.cpp
+++ b/scumm/smush/chunk.cpp
@@ -87,21 +87,21 @@ uint32 BaseChunk::getSize() const {
 
 bool BaseChunk::seek(int32 delta, seek_type dir) {
 	switch(dir) {
-		case seek_cur:
-			_curPos += delta;
-			break;
-		case seek_start:
-			if (delta < 0)
-				error("invalid seek request");
-
-			_curPos = (uint32)delta;
-			break;
-		case seek_end:
-			if (delta > 0 || _size < (uint32)-delta)
-				error("invalid seek request");
-
-			_curPos = (uint32)(_size + delta);
-			break;
+	case seek_cur:
+		_curPos += delta;
+		break;
+	case seek_start:
+		if (delta < 0)
+			error("invalid seek request");
+
+		_curPos = (uint32)delta;
+		break;
+	case seek_end:
+		if (delta > 0 || _size < (uint32)-delta)
+			error("invalid seek request");
+
+		_curPos = (uint32)(_size + delta);
+		break;
 	}
 	if (_curPos > _size) {
 		error("invalid seek request : %d > %d (delta == %d)", _curPos, _size, delta);
diff --git a/scumm/smush/imuse_channel.cpp b/scumm/smush/imuse_channel.cpp
index e4c0000a06..45a475f30a 100644
--- a/scumm/smush/imuse_channel.cpp
+++ b/scumm/smush/imuse_channel.cpp
@@ -141,20 +141,20 @@ bool ImuseChannel::handleMap(Chunk &map) {
 	while (!map.eof()) {
 		Chunk *sub = map.subBlock();
 		switch(sub->getType()) {
-			case TYPE_FRMT:
-				handleFormat(*sub);
-				break;
-			case TYPE_TEXT:
-				handleText(*sub);
-				break;
-			case TYPE_REGN:
-				handleRegion(*sub);
-				break;
-			case TYPE_STOP:
-				handleStop(*sub);
-				break;
-			default:
-				error("Unknown iMUS subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
+		case TYPE_FRMT:
+			handleFormat(*sub);
+			break;
+		case TYPE_TEXT:
+			handleText(*sub);
+			break;
+		case TYPE_REGN:
+			handleRegion(*sub);
+			break;
+		case TYPE_STOP:
+			handleStop(*sub);
+			break;
+		default:
+			error("Unknown iMUS subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
 		}
 		delete sub;
 	}
@@ -213,36 +213,36 @@ bool ImuseChannel::handleSubTags(int32 &offset) {
 		uint32 size = READ_BE_UINT32(_tbuffer + offset + 4);
 		uint32 available_size = _tbufferSize - offset;
 		switch(type) {
-			case TYPE_MAP_: 
-				_inData = false;
-				if (available_size >= (size + 8)) {
-					MemoryChunk c((byte *)_tbuffer + offset);
-					handleMap(c);
+		case TYPE_MAP_: 
+			_inData = false;
+			if (available_size >= (size + 8)) {
+				MemoryChunk c((byte *)_tbuffer + offset);
+				handleMap(c);
+			}
+			break;
+		case TYPE_DATA:
+			_inData = true;
+			_dataSize = size;
+			offset += 8;
+			{
+				int reqsize = 1;
+				if (_channels == 2)
+					reqsize *= 2;
+				if (_bitsize == 16)
+					reqsize *= 2;
+				else if (_bitsize == 12) {
+					if (reqsize > 1)
+						reqsize = reqsize * 3 / 2;
+					else reqsize = 3;
 				}
-				break;
-			case TYPE_DATA:
-				_inData = true;
-				_dataSize = size;
-				offset += 8;
-				{
-					int reqsize = 1;
-					if (_channels == 2)
-						reqsize *= 2;
-					if (_bitsize == 16)
-						reqsize *= 2;
-					else if (_bitsize == 12) {
-						if (reqsize > 1)
-							reqsize = reqsize * 3 / 2;
-						else reqsize = 3;
-					}
-					if ((size % reqsize) != 0) {
-						debug(2, "Invalid iMUS sound data size : (%d %% %d) != 0, correcting...", size, reqsize);
-						size += 3 - (size % reqsize);
-					}
+				if ((size % reqsize) != 0) {
+					debug(2, "Invalid iMUS sound data size : (%d %% %d) != 0, correcting...", size, reqsize);
+					size += 3 - (size % reqsize);
 				}
-				return false;
-			default:
-				error("unknown Chunk in iMUS track : %s ", Chunk::ChunkString(type));
+			}
+			return false;
+		default:
+			error("unknown Chunk in iMUS track : %s ", Chunk::ChunkString(type));
 		}
 		offset += size + 8;
 		return true;
diff --git a/scumm/smush/saud_channel.cpp b/scumm/smush/saud_channel.cpp
index d6a495950f..1c5030974d 100644
--- a/scumm/smush/saud_channel.cpp
+++ b/scumm/smush/saud_channel.cpp
@@ -49,40 +49,37 @@ bool SaudChannel::handleSubTags(int32 &offset) {
 		uint32 available_size = _tbufferSize - offset;
 
 		switch(type) {
-			case TYPE_STRK:
-				_inData = false;
-				if (available_size >= (size + 8)) {
-					MemoryChunk c((byte *)_tbuffer + offset);
-					handleStrk(c);
-				}
-				else
-					return false;
-				break;
-			case TYPE_SMRK:
-				_inData = false;
-				if (available_size >= (size + 8)) {
-					MemoryChunk c((byte *)_tbuffer + offset);
-					handleSmrk(c);
-				}
-				else
-					return false;
-				break;
-			case TYPE_SHDR:
-				_inData = false;
-				if (available_size >= (size + 8)) {
-					MemoryChunk c((byte *)_tbuffer + offset);
-					handleShdr(c);
-				}
-				else
-					return false;
-				break;
-			case TYPE_SDAT: 
-				_inData = true;
-				_dataSize = size;
-				offset += 8;
+		case TYPE_STRK:
+			_inData = false;
+			if (available_size >= (size + 8)) {
+				MemoryChunk c((byte *)_tbuffer + offset);
+				handleStrk(c);
+			} else
 				return false;
-			default:
-				error("unknown Chunk in SAUD track : %s ", Chunk::ChunkString(type));
+			break;
+		case TYPE_SMRK:
+			_inData = false;
+			if (available_size >= (size + 8)) {
+				MemoryChunk c((byte *)_tbuffer + offset);
+				handleSmrk(c);
+			} else
+				return false;
+			break;
+		case TYPE_SHDR:
+			_inData = false;
+			if (available_size >= (size + 8)) {
+				MemoryChunk c((byte *)_tbuffer + offset);
+				handleShdr(c);
+			} else
+				return false;
+			break;
+		case TYPE_SDAT: 
+			_inData = true;
+			_dataSize = size;
+			offset += 8;
+			return false;
+		default:
+			error("unknown Chunk in SAUD track : %s ", Chunk::ChunkString(type));
 		}
 		offset += size + 8;
 		return true;
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index e317e7a903..549cafb539 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -542,7 +542,7 @@ void SmushPlayer::handleTextResource(Chunk &b) {
 	}
 
 	while (str[0] == '^') {
-		switch(str[1]) {
+		switch (str[1]) {
 		case 'f':
 			{
 				int id = str[3] - '0';
@@ -574,31 +574,31 @@ void SmushPlayer::handleTextResource(Chunk &b) {
 	// bit 2 - ???          4
 	// bit 3 - wrap around  8
 	switch (flags & 9) {
-		case 0: 
-			sf->drawStringAbsolute(str, _dst, _width, pos_x, pos_y);
-			break;
-		case 1:
-			sf->drawStringCentered(str, _dst, _width, _height, pos_x, MAX(pos_y, top));
-			break;
-		case 8:
-			// FIXME: Is 'right' the maximum line width here, just
-			// as it is in the next case? It's used several times
-			// in The Dig's intro, where 'left' and 'right' are
-			// always 0 and 321 respectively, and apparently we
-			// handle that correctly.
-			sf->drawStringWrap(str, _dst, _width, _height, pos_x, MAX(pos_y, top), left, right);
-			break;
-		case 9:
-			// In this case, the 'right' parameter is actually the
-			// maximum line width. This explains why it's sometimes
-			// smaller than 'left'.
-			//
-			// Note that in The Dig's "Spacetime Six" movie it's
-			// 621. I have no idea what that means.
-			sf->drawStringWrapCentered(str, _dst, _width, _height, pos_x, MAX(pos_y, top), left, MIN(left + right, _width));
-			break;
-		default:
-			warning("SmushPlayer::handleTextResource. Not handled flags: %d", flags);
+	case 0: 
+		sf->drawStringAbsolute(str, _dst, _width, pos_x, pos_y);
+		break;
+	case 1:
+		sf->drawStringCentered(str, _dst, _width, _height, pos_x, MAX(pos_y, top));
+		break;
+	case 8:
+		// FIXME: Is 'right' the maximum line width here, just
+		// as it is in the next case? It's used several times
+		// in The Dig's intro, where 'left' and 'right' are
+		// always 0 and 321 respectively, and apparently we
+		// handle that correctly.
+		sf->drawStringWrap(str, _dst, _width, _height, pos_x, MAX(pos_y, top), left, right);
+		break;
+	case 9:
+		// In this case, the 'right' parameter is actually the
+		// maximum line width. This explains why it's sometimes
+		// smaller than 'left'.
+		//
+		// Note that in The Dig's "Spacetime Six" movie it's
+		// 621. I have no idea what that means.
+		sf->drawStringWrapCentered(str, _dst, _width, _height, pos_x, MAX(pos_y, top), left, MIN(left + right, _width));
+		break;
+	default:
+		warning("SmushPlayer::handleTextResource. Not handled flags: %d", flags);
 	}
 
 	if (string != NULL) {
@@ -753,39 +753,39 @@ void SmushPlayer::handleFrame(Chunk &b) {
 	while (!b.eof()) {
 		Chunk *sub = b.subBlock();
 		if (sub->getSize() & 1) b.seek(1);
-		switch(sub->getType()) {
-			case TYPE_NPAL:
-				handleNewPalette(*sub);
-				break;
-			case TYPE_FOBJ:
-				handleFrameObject(*sub);
-				break;
-			case TYPE_PSAD:
-				handleSoundFrame(*sub);
-				break;
-			case TYPE_TRES:
-				handleTextResource(*sub);
-				break;
-			case TYPE_XPAL:
-				handleDeltaPalette(*sub);
-				break;
-			case TYPE_IACT:
-				handleImuseAction(*sub);
-				break;
-			case TYPE_STOR:
-				handleStore(*sub);
-				break;
-			case TYPE_FTCH:
-				handleFetch(*sub);
-				break;
-			case TYPE_SKIP:
-				handleSkip(*sub);
-				break;
-			case TYPE_TEXT:
-				handleTextResource(*sub);
-				break;
-			default:
-				error("Unknown frame subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
+		switch (sub->getType()) {
+		case TYPE_NPAL:
+			handleNewPalette(*sub);
+			break;
+		case TYPE_FOBJ:
+			handleFrameObject(*sub);
+			break;
+		case TYPE_PSAD:
+			handleSoundFrame(*sub);
+			break;
+		case TYPE_TRES:
+			handleTextResource(*sub);
+			break;
+		case TYPE_XPAL:
+			handleDeltaPalette(*sub);
+			break;
+		case TYPE_IACT:
+			handleImuseAction(*sub);
+			break;
+		case TYPE_STOR:
+			handleStore(*sub);
+			break;
+		case TYPE_FTCH:
+			handleFetch(*sub);
+			break;
+		case TYPE_SKIP:
+			handleSkip(*sub);
+			break;
+		case TYPE_TEXT:
+			handleTextResource(*sub);
+			break;
+		default:
+			error("Unknown frame subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
 		}
 		delete sub;
 	}
@@ -854,12 +854,12 @@ void SmushPlayer::parseNextFrame() {
 	}
 	Chunk *sub = _base->subBlock();
 
-	switch(sub->getType()) {
-		case TYPE_FRME:
-			handleFrame(*sub);
-			break;
-		default:
-			error("Unknown Chunk found : %d, %d", sub->getType(), sub->getSize());
+	switch (sub->getType()) {
+	case TYPE_FRME:
+		handleFrame(*sub);
+		break;
+	default:
+		error("Unknown Chunk found : %d, %d", sub->getType(), sub->getSize());
 	}
 	delete sub;
 }