[Scummvm-cvs-logs] SF.net SVN: scummvm: [32037] scummvm/trunk/engines/kyra/screen.cpp

[lordhoto at users.sourceforge.net]

Revision: 32037
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32037&view=rev
Author:   lordhoto
Date:     2008-05-11 14:09:16 -0700 (Sun, 11 May 2008)

Log Message:
-----------
Formatting.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2008-05-11 20:31:51 UTC (rev 32036)
+++ scummvm/trunk/engines/kyra/screen.cpp	2008-05-11 21:09:16 UTC (rev 32037)
@@ -307,14 +307,16 @@
 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 @@
 
 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 @@
 	}
 	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 @@
 	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 @@
 	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 @@
 		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::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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.