[Scummvm-cvs-logs] CVS: scummvm/saga saga.h,1.83,1.84 sndres.cpp,1.40,1.41

[Torbjörn Andersson]

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

Modified Files:
	saga.h sndres.cpp 
Log Message:
Removed system includes.


Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- saga.h	18 Mar 2005 17:11:36 -0000	1.83
+++ saga.h	6 Apr 2005 12:19:07 -0000	1.84
@@ -33,10 +33,6 @@
 #include "common/stream.h"
 #include "common/rect.h"
 
-// TODO: These shouldn't be here!
-#include <limits.h>
-#include <stddef.h>
-
 #include "saga/text.h"
 #include "saga/gfx.h"
 #include "saga/list.h"

Index: sndres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sndres.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- sndres.cpp	11 Jan 2005 21:10:36 -0000	1.40
+++ sndres.cpp	6 Apr 2005 12:19:15 -0000	1.41
@@ -270,7 +270,7 @@
 		ms_f = (double)length / 22050 * 2000.0;
 		ms_i = (int)ms_f;
 	} else if (res_type == GAME_SOUND_PCM) {
-		ms_f = (double)length / (_snd_info.sample_size / CHAR_BIT) / (_snd_info.freq) * 1000.0;
+		ms_f = (double)length / (_snd_info.sample_size / 8) / (_snd_info.freq) * 1000.0;
 		ms_i = (int)ms_f;
 	} else if (res_type == GAME_SOUND_VOC) {		
 		// Rough hack, fix this to be accurate