[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.66,1.67

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv20771/sky

Modified Files:
	logic.cpp 
Log Message:
fixed sillty mistakes - must've been on crack when I coded this..

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- logic.cpp	31 May 2003 20:53:55 -0000	1.66
+++ logic.cpp	31 May 2003 23:42:23 -0000	1.67
@@ -2091,10 +2091,10 @@
 
 		xPos += width - (FIXED_TEXT_WIDTH / 2);	//middle of talker
 
-		if (xPos > TOP_LEFT_X)
+		if (xPos < TOP_LEFT_X)
 			xPos = TOP_LEFT_X;
 
-		width += FIXED_TEXT_WIDTH;
+		width = xPos + FIXED_TEXT_WIDTH;
 		if ((TOP_LEFT_X + FULL_SCREEN_WIDTH) <= width) {
 			xPos = TOP_LEFT_X + FULL_SCREEN_WIDTH;
 			xPos -= FIXED_TEXT_WIDTH;
@@ -2103,7 +2103,7 @@
 		_compact->xcood = xPos;
 		uint16 yPos = target->ycood + ((struct dataFileHeader *)targetGfx)->s_offset_y - 6 - ((struct dataFileHeader *)textGfx)->s_height;
 		
-		if (yPos > TOP_LEFT_Y)
+		if (yPos < TOP_LEFT_Y)
 			yPos = TOP_LEFT_Y;
 
 		_compact->ycood = yPos;