From 1d018f6046a590e55c6e1fc884124a9346819586 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 11 May 2008 21:09:16 +0000
Subject: Formatting.

svn-id: r32037
---
 engines/kyra/screen.cpp | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'engines/kyra')

diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 6a6141b5c0..568befac1e 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -307,14 +307,16 @@ const uint8 *Screen::getCPagePtr(int pageNum) const {
 uint8 *Screen::getPageRect(int pageNum, int x, int y, int w, int h) {
 	debugC(9, kDebugLevelScreen, "Screen::getPageRect(%d, %d, %d, %d, %d)", pageNum, x, y, w, h);
 	assert(pageNum < SCREEN_PAGE_NUM);
-	if (pageNum == 0 || pageNum == 1) addDirtyRect(x, y, w, h);
+	if (pageNum == 0 || pageNum == 1)
+		addDirtyRect(x, y, w, h);
 	return _pagePtrs[pageNum] + y * SCREEN_W + x;
 }
 
 void Screen::clearPage(int pageNum) {
 	debugC(9, kDebugLevelScreen, "Screen::clearPage(%d)", pageNum);
 	assert(pageNum < SCREEN_PAGE_NUM);
-	if (pageNum == 0 || pageNum == 1) _forceFullUpdate = true;
+	if (pageNum == 0 || pageNum == 1)
+		_forceFullUpdate = true;
 	memset(getPagePtr(pageNum), 0, SCREEN_PAGE_SIZE);
 	clearOverlayPage(pageNum);
 }
@@ -329,7 +331,8 @@ int Screen::setCurPage(int pageNum) {
 
 void Screen::clearCurPage() {
 	debugC(9, kDebugLevelScreen, "Screen::clearCurPage()");
-	if (_curPage == 0 || _curPage == 1) _forceFullUpdate = true;
+	if (_curPage == 0 || _curPage == 1)
+		_forceFullUpdate = true;
 	memset(getPagePtr(_curPage), 0, SCREEN_PAGE_SIZE);
 	clearOverlayPage(_curPage);
 }
@@ -478,7 +481,7 @@ void Screen::copyToPage0(int y, int h, uint8 page, uint8 *seqBuf) {
 	}
 	addDirtyRect(0, y, SCREEN_W, h);
 	// This would remove the text in the end sequence of
-	// the FM-Towns version.
+	// the (Kyrandia 1) FM-Towns version.
 	// Since this method is just used for the Seqplayer
 	// this shouldn't be a problem anywhere else, so it's
 	// safe to disable the call here.
@@ -576,7 +579,8 @@ void Screen::copyPage(uint8 srcPage, uint8 dstPage) {
 	memcpy(dst, src, SCREEN_W * SCREEN_H);
 	copyOverlayRegion(0, 0, 0, 0, SCREEN_W, SCREEN_H, srcPage, dstPage);
 
-	if (dstPage == 0 || dstPage == 1) _forceFullUpdate = true;
+	if (dstPage == 0 || dstPage == 1)
+		_forceFullUpdate = true;
 }
 
 void Screen::copyBlockToPage(int pageNum, int x, int y, int w, int h, const uint8 *src) {
@@ -873,7 +877,7 @@ bool Screen::loadFont(FontId fontId, const char *filename) {
 	uint8 *fontData = fnt->fontData = _vm->resource()->fileData(filename, &sz);
 
 	if (!fontData || !sz)
-		error("couldn't load font file '%s'", filename);
+		error("Couldn't load font file '%s'", filename);
 
 	uint16 fontSig = READ_LE_UINT16(fontData + 2);
 
@@ -934,15 +938,14 @@ int Screen::getTextWidth(const char *str) const {
 		if (c == 0) {
 			break;
 		} else if (c == '\r') {
-			if (curLineLen > maxLineLen) {
+			if (curLineLen > maxLineLen)
 				maxLineLen = curLineLen;
-			} else {
+			else
 				curLineLen = 0;
-			}
 		} else {
-			if (c <= 0x7F || !_useSJIS)
+			if (c <= 0x7F || !_useSJIS) {
 				curLineLen += getCharWidth(c);
-			else {
+			} else {
 				c = READ_LE_UINT16(str - 1);
 				++str;
 				curLineLen += getCharWidth(c);
@@ -1894,11 +1897,10 @@ void Screen::wrapped_decodeFrameDelta(uint8 *dst, const uint8 *src) {
 void Screen::decodeFrameDeltaPage(uint8 *dst, const uint8 *src, int pitch, bool noXor) {
 	debugC(9, kDebugLevelScreen, "Screen::decodeFrameDeltaPage(%p, %p, %d, %d)", (const void *)dst, (const void *)src, pitch, noXor);
 
-	if (noXor) {
+	if (noXor)
 		wrapped_decodeFrameDeltaPage<true>(dst, src, pitch);
-	} else {
+	else
 		wrapped_decodeFrameDeltaPage<false>(dst, src, pitch);
-	}
 }
 
 void Screen::convertAmigaGfx(uint8 *data, int w, int h, bool offscreen) {
-- 
cgit v1.2.3