From 4a302b25adb34e6357506a25cbfba6e182ac9209 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 10 Sep 2007 13:17:20 +0000
Subject: Lots of source code formatting corrections

svn-id: r28887
---
 engines/scumm/charset.cpp    |  3 +--
 engines/scumm/file_nes.cpp   |  3 +--
 engines/scumm/player_v2a.cpp | 23 +++++++----------------
 3 files changed, 9 insertions(+), 20 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index b90bba6526..df4cfb34a8 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -1226,8 +1226,7 @@ int CharsetRendererV3::getCharWidth(byte chr) {
 	return spacing;
 }
 
-void CharsetRendererV3::setColor(byte color)
-{
+void CharsetRendererV3::setColor(byte color) {
 	bool useShadow = false;
 	_color = color;
 
diff --git a/engines/scumm/file_nes.cpp b/engines/scumm/file_nes.cpp
index aeba6120a2..88b4253a1d 100644
--- a/engines/scumm/file_nes.cpp
+++ b/engines/scumm/file_nes.cpp
@@ -948,8 +948,7 @@ uint16 ScummNESFile::extractResource(Common::WriteStream *output, const Resource
 		for (i = 1; i < 8; i++)
 			reslen += write_byte(output, 0);
 
-		for (j = 0; j < 4; j++)
-		{
+		for (j = 0; j < 4; j++) {
 			reslen += write_byte(output,' ');
 			for (i = 1; (val = fileReadByte()); i++)
 				reslen += write_byte(output, val);
diff --git a/engines/scumm/player_v2a.cpp b/engines/scumm/player_v2a.cpp
index 575281a26a..ceabbc7d95 100644
--- a/engines/scumm/player_v2a.cpp
+++ b/engines/scumm/player_v2a.cpp
@@ -35,14 +35,12 @@ namespace Scumm {
 static uint32 CRCtable[256];
 
 
-static void	InitCRC (void)
-{
+static void	InitCRC (void) {
 	const uint32 poly = 0xEDB88320;
 	int i, j;
 	uint32 n;
 
-	for (i = 0; i < 256; i++)
-	{
+	for (i = 0; i < 256; i++) {
 		n = i;
 		for (j = 0; j < 8; j++)
 			n = (n & 1) ? ((n >> 1) ^ poly) : (n >> 1);
@@ -50,8 +48,7 @@ static void	InitCRC (void)
 	}
 }
 
-static uint32 GetCRC (byte *data, int len)
-{
+static uint32 GetCRC (byte *data, int len) {
 	uint32 CRC = 0xFFFFFFFF;
 	int i;
 	for (i = 0; i < len; i++)
@@ -1113,8 +1110,7 @@ public:
 	}
 	virtual bool update() {
 		assert(_id);
-		if (_curfreq >= _freq2)
-		{
+		if (_curfreq >= _freq2) {
 			_mod->setChannelFreq(_id, BASE_FREQUENCY / _curfreq);
 			_curfreq -= _bendrate;
 			if (--_bendctr)
@@ -1122,9 +1118,7 @@ public:
 			_bendrate--;
 			if (_bendrate < 2)
 				_bendrate = 2;
-		}
-		else
-		{
+		} else {
 			if (!--_holdctr)
 				return false;
 		}
@@ -1160,15 +1154,12 @@ public:
 	}
 	virtual bool update() {
 		assert(_id);
-		if (!_loop)
-		{
+		if (!_loop) {
 			_vol--;
 			if (_vol)
 				_mod->setChannelVol(_id, _vol);
 			else	return false;
-		}
-		else if (!--_loop)
-		{
+		} else if (!--_loop) {
 			_mod->stopChannel(_id);
 			char *tmp_data = (char *)malloc(_size2);
 			memcpy(tmp_data, _data + _offset2, _size2);
-- 
cgit v1.2.3