[Scummvm-cvs-logs] CVS: scummvm/bs2 anims.cpp,1.13,1.14 speech.cpp,1.16,1.17

[Oliver Kiehl]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv23840

Modified Files:
	anims.cpp speech.cpp 
Log Message:
some more endian fixes


Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/anims.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- anims.cpp	9 Sep 2003 06:54:11 -0000	1.13
+++ anims.cpp	13 Sep 2003 13:05:52 -0000	1.14
@@ -557,7 +557,7 @@
 		local_text	= sequence_text_list[line].textNumber&0xffff;
 
 		text = FetchTextLine( res_man.Res_open(text_res), local_text );	// open text resource & get the line
-		memcpy(&wavId, text, 2);	// this works on PSX & PC
+		wavId = (int32)READ_LE_UINT16(text);
 
 		res_man.Res_close(text_res);	// now ok to close the text file
 

Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/speech.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- speech.cpp	9 Sep 2003 06:49:15 -0000	1.16
+++ speech.cpp	13 Sep 2003 13:05:52 -0000	1.17
@@ -1446,8 +1446,7 @@
 		local_text	= params[S_TEXT]&0xffff;
 
 		text = FetchTextLine( res_man.Res_open(text_res), local_text );	// open text file & get the line
-		//officialTextNumber = *(uint16*)text;	// 1st word of text line is the official line number (this doesn't work on PSX)
-		memcpy(&officialTextNumber, text, 2);	// this works on PSX & PC
+		officialTextNumber = READ_LE_UINT16(text);
 
 		res_man.Res_close(text_res);	// now ok to close the text file