[Scummvm-cvs-logs] SF.net SVN: scummvm: [22468] scummvm/trunk/engines/scumm

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sun May 14 03:42:00 CEST 2006


Revision: 22468
Author:   eriktorbjorn
Date:     2006-05-14 03:40:06 -0700 (Sun, 14 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22468&view=rev

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script_c64.cpp
    scummvm/trunk/engines/scumm/script_v2.cpp
Modified: scummvm/trunk/engines/scumm/script_c64.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_c64.cpp	2006-05-14 09:58:30 UTC (rev 22467)
+++ scummvm/trunk/engines/scumm/script_c64.cpp	2006-05-14 10:40:06 UTC (rev 22468)
@@ -416,7 +416,7 @@
 	int textSlot = 0;
 	_string[textSlot].xpos = 0;
 	_string[textSlot].ypos = 0;
-	_string[textSlot].right = 320;
+	_string[textSlot].right = _screenWidth - 1;
 	_string[textSlot].center = false;
 	_string[textSlot].overhead = false;
 
@@ -555,7 +555,7 @@
 	sentenceline.top = virtscr[kVerbVirtScreen].topline;
 	sentenceline.bottom = virtscr[kVerbVirtScreen].topline + 8;
 	sentenceline.left = 0;
-	sentenceline.right = 319;
+	sentenceline.right = virtscr[kVerbVirtScreen].w - 1;
 	restoreBG(sentenceline);
 
 	drawString(2, (byte*)string);

Modified: scummvm/trunk/engines/scumm/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v2.cpp	2006-05-14 09:58:30 UTC (rev 22467)
+++ scummvm/trunk/engines/scumm/script_v2.cpp	2006-05-14 10:40:06 UTC (rev 22468)
@@ -415,10 +415,7 @@
 	int textSlot = 0;
 	_string[textSlot].xpos = 0;
 	_string[textSlot].ypos = 0;
-	if (_game.platform == Common::kPlatformNES)
-		_string[textSlot].right = 256;
-	else
-		_string[textSlot].right = 320;
+	_string[textSlot].right = _screenWidth - 1;
 	_string[textSlot].center = false;
 	_string[textSlot].overhead = false;
 
@@ -1069,7 +1066,7 @@
 	int i = 0, len = 0;
 
 	// Maximum length of printable characters
-	int maxChars = (_game.platform == Common::kPlatformNES) ? 60: 40;
+	int maxChars = (_game.platform == Common::kPlatformNES) ? 60 : 40;
 	while (*ptr) {
 		if (*ptr != '@')
 			len++;
@@ -1090,12 +1087,12 @@
 		sentenceline.top = virtscr[kVerbVirtScreen].topline;
 		sentenceline.bottom = virtscr[kVerbVirtScreen].topline + 16;
 		sentenceline.left = 16;
-		sentenceline.right = 255;
+		sentenceline.right = virtscr[kVerbVirtScreen].w - 1;
 	} else {
 		sentenceline.top = virtscr[kVerbVirtScreen].topline;
 		sentenceline.bottom = virtscr[kVerbVirtScreen].topline + 8;
 		sentenceline.left = 0;
-		sentenceline.right = 319;
+		sentenceline.right = virtscr[kVerbVirtScreen].w - 1;
 	}
 	restoreBG(sentenceline);
 
@@ -1585,12 +1582,11 @@
 	Common::Rect rect;
 	rect.top = virtscr[kVerbVirtScreen].topline;
 	rect.bottom = virtscr[kVerbVirtScreen].topline + 8 * 88;
+	rect.right = virtscr[kVerbVirtScreen].w - 1;
 	if (_game.platform == Common::kPlatformNES) {
 		rect.left = 16;
-		rect.right = 255;
 	} else {
 		rect.left = 0;
-		rect.right = 319;
 	}
 	restoreBG(rect);
 


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





More information about the Scummvm-git-logs mailing list