[Scummvm-cvs-logs] CVS: scummvm insane.cpp,1.46,1.47

Pawe? Ko?odziejski aquadran at users.sourceforge.net
Mon Jul 15 14:57:03 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv25549

Modified Files:
	insane.cpp 
Log Message:
subtitles: some fixes

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/insane.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- insane.cpp	15 Jul 2002 21:25:07 -0000	1.46
+++ insane.cpp	15 Jul 2002 21:56:30 -0000	1.47
@@ -170,12 +170,11 @@
 		offset += 8;
 		if (READ_BE_UINT32(font + offset) == 'FOBJ') {
 				t_offset = offset + 8;
-				offset += READ_BE_UINT32(font + offset + 4) + 8;
 		}
 		else
 			return 0;
 	}
-	return *(uint16*)(font + t_offset + 8);
+	return READ_LE_UINT16(font + t_offset + 8);
 }
 
 uint32 SmushPlayer::getCharWidth(uint8 c_font, byte txt)
@@ -203,7 +202,7 @@
 		else
 			return 0;
 	}
-	return *(uint16*)(font + t_offset + 6);
+	return READ_LE_UINT16(font + t_offset + 6);
 }
 
 void SmushPlayer::drawStringTRES(uint32 x, uint32 y, byte * txt)
@@ -254,7 +253,6 @@
 				else
 				{
 					y = 0;
-					printf ("out of screen y\n");
 				}
 				continue;
 			}
@@ -282,7 +280,6 @@
 				}
 				else {
 					y = 0;
-					printf ("out of screen y\n");
 				}
 			}
 		}





More information about the Scummvm-git-logs mailing list