[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.55,1.56 rnc_deco.cpp,1.18,1.19 rnc_deco.h,1.5,1.6 text.cpp,1.60,1.61

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23014/sky

Modified Files:
	disk.cpp rnc_deco.cpp rnc_deco.h text.cpp 
Log Message:
some cleanup


Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- disk.cpp	6 Jan 2004 12:45:32 -0000	1.55
+++ disk.cpp	13 Mar 2004 22:58:49 -0000	1.56
@@ -115,10 +115,6 @@
 		}
 	}
 
-	#ifdef file_order_chk
-		warning("File order checking not implemented yet");
-	#endif
-
 	_compFile = fileNr;
 	debug(2, "load file %d,%d (%d)", (fileNr >> 11), (fileNr & 2047), fileNr); 
 
@@ -153,10 +149,6 @@
 
 	_dataDiskHandle->seek(_fileOffset, SEEK_SET);
 
-	#ifdef file_order_chk
-		warning("File order checking not implemented yet");
-	#endif
-
 	//now read in the data
 	bytesRead = _dataDiskHandle->read(_fileDest, 1 * _fileSize);
 
@@ -286,8 +278,7 @@
 		dnrTbl16Ptr += 4;
 	}
 
-	// if file not found return 0
-	return 0;
+	return 0; //not found
 }
 
 void Disk::fnCacheChip(uint32 list) {

Index: rnc_deco.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- rnc_deco.cpp	6 Jan 2004 12:45:32 -0000	1.18
+++ rnc_deco.cpp	13 Mar 2004 22:58:50 -0000	1.19
@@ -75,8 +75,7 @@
 		crc ^= tmp; 
 		tmp = (uint8)((crc >> 8) & 0x00FF); 
 		crc &= 0x00FF;  
-		crc = crc << 1; 
-		crc = *(uint16 *)&crcTable8[crc];
+		crc = *(uint16 *)&crcTable8[crc << 1];
 		crc ^= tmp;
 	}
 

Index: rnc_deco.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rnc_deco.h	6 Jan 2004 12:45:32 -0000	1.5
+++ rnc_deco.h	13 Mar 2004 22:58:50 -0000	1.6
@@ -32,7 +32,6 @@
 	uint16 _rawTable[64];
 	uint16 _posTable[64];
 	uint16 _lenTable[64];
-
 	uint16 _crcTable[256];
 	
 	uint16 _bitBuffl;

Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- text.cpp	6 Jan 2004 12:45:32 -0000	1.60
+++ text.cpp	13 Mar 2004 22:58:50 -0000	1.61
@@ -463,23 +463,18 @@
 	do {
 		if (_dtCentre) {
 
-			uint32 width = _dtLineWidth;
-			width -= READ_LE_UINT32(centerTblPtr); 
+			uint32 width = (_dtLineWidth - READ_LE_UINT32(centerTblPtr)) >> 1; 
 			centerTblPtr += 4;
-			width >>=1;
 			curDest += width;
 		}
 
 		textChar = (uint8)*curPos++;
 		while (textChar >= 0x20) {
-			textChar -= 0x20;
-			makeGameCharacter(textChar, _characterSet, curDest, color);
+			makeGameCharacter(textChar - 0x20, _characterSet, curDest, color);
 			textChar = *curPos++;
 		}
 
-		curDest = prevDest;	//start of last line
-		curDest += _dtLineSize;	//start of next
-		prevDest = curDest;
+		prevDest = curDest = prevDest + _dtLineSize;	//start of last line + start of next
 
 	} while (textChar >= 10);
 
@@ -517,19 +512,17 @@
 				if (dataBit) 
 					*curPos = color;
 				else
-					//black edge
-					*curPos = 240; 
+					*curPos = 240; //black edge 
 
 			curPos++;
 		}
 
 		//advance a line
-		curPos = prevPos;
-		curPos += _dtLineWidth;
+		curPos = prevPos + _dtLineWidth;
 	}
 
 	//update position
-	dest = startPos + charWidth + _dtCharSpacing*2 - 1; 
+	dest = startPos + charWidth + _dtCharSpacing * 2 - 1; 
 
 }