[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.3,1.4 events.cpp,1.4,1.5 ite_introproc.cpp,1.4,1.5 saga.cpp,1.9,1.10 saga.h,1.5,1.6 sndres.cpp,1.4,1.5 sndres.h,1.4,1.5

[Eugene Sandulenko]

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

Modified Files:
	actor.cpp events.cpp ite_introproc.cpp saga.cpp saga.h 
	sndres.cpp sndres.h 
Log Message:
Rename Snd object to SndRes


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- actor.cpp	28 Apr 2004 23:10:59 -0000	1.3
+++ actor.cpp	28 Apr 2004 23:19:45 -0000	1.4
@@ -679,7 +679,7 @@
 		if (!a_dialogue->d_playing) {
 			/* Dialogue voice hasn't played yet - play it now */
 
-			_vm->_snd->playVoice(a_dialogue->d_voice_rn);
+			_vm->_sndRes->playVoice(a_dialogue->d_voice_rn);
 			a_dialogue->d_playing = 1;
 		}
 
@@ -733,7 +733,7 @@
 {
 	int voice_len;
 
-	voice_len = _vm->_snd->getVoiceLength(d_voice_rn);
+	voice_len = _vm->_sndRes->getVoiceLength(d_voice_rn);
 
 	if (voice_len < 0) {
 		voice_len = strlen(d_string) * ACTOR_DIALOGUE_LETTERTIME;

Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- events.cpp	28 Apr 2004 23:10:59 -0000	1.4
+++ events.cpp	28 Apr 2004 23:19:45 -0000	1.5
@@ -310,7 +310,7 @@
 
 	case R_VOICE_EVENT:
 
-		_vm->_snd->playVoice(event->param);
+		_vm->_sndRes->playVoice(event->param);
 		break;
 
 	case R_MUSIC_EVENT:

Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ite_introproc.cpp	28 Apr 2004 23:10:59 -0000	1.4
+++ ite_introproc.cpp	28 Apr 2004 23:19:45 -0000	1.5
@@ -350,7 +350,7 @@
 			q_event = EVENT_Chain(q_event, &event);
 
 			voice_len =
-			    _vm->_snd->getVoiceLength(IntroDiag[i].i_voice_rn);
+			    _vm->_sndRes->getVoiceLength(IntroDiag[i].i_voice_rn);
 			if (voice_len < 0) {
 				voice_len = strlen(IntroDiag[i].i_str) *
 				    VOICE_LETTERLEN;
@@ -470,7 +470,7 @@
 			q_event = EVENT_Chain(q_event, &event);
 
 			voice_len =
-			    _vm->_snd->getVoiceLength(IntroDiag[i].i_voice_rn);
+			    _vm->_sndRes->getVoiceLength(IntroDiag[i].i_voice_rn);
 			if (voice_len < 0) {
 				voice_len = strlen(IntroDiag[i].i_str) *
 				    VOICE_LETTERLEN;
@@ -588,7 +588,7 @@
 			q_event = EVENT_Chain(q_event, &event);
 
 			voice_len =
-			    _vm->_snd->getVoiceLength(IntroDiag[i].i_voice_rn);
+			    _vm->_sndRes->getVoiceLength(IntroDiag[i].i_voice_rn);
 			if (voice_len < 0) {
 				voice_len = strlen(IntroDiag[i].i_str) *
 				    VOICE_LETTERLEN;
@@ -705,7 +705,7 @@
 			q_event = EVENT_Chain(q_event, &event);
 
 			voice_len =
-			    _vm->_snd->getVoiceLength(IntroDiag[i].i_voice_rn);
+			    _vm->_sndRes->getVoiceLength(IntroDiag[i].i_voice_rn);
 			if (voice_len < 0) {
 				voice_len = strlen(IntroDiag[i].i_str) *
 				    VOICE_LETTERLEN;

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- saga.cpp	28 Apr 2004 23:10:59 -0000	1.9
+++ saga.cpp	28 Apr 2004 23:19:45 -0000	1.10
@@ -211,7 +211,7 @@
 
 	/* Initialize engine modules
 	 * \*------------------------------------------------------------- */
-	_snd = new Snd();
+	_sndRes = new SndRes();
 	EVENT_Init();
 	FONT_Init();
 	SPRITE_Init();

Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- saga.h	28 Apr 2004 23:10:59 -0000	1.5
+++ saga.h	28 Apr 2004 23:19:45 -0000	1.6
@@ -34,7 +34,7 @@
 
 namespace Saga {
 
-class Snd;
+class SndRes;
 
 #define R_PBOUNDS(n,max) (((n)>=(0))&&((n)<(max)))
 
@@ -54,7 +54,7 @@
  public:
 	SagaEngine(GameDetector * detector, OSystem * syst);
 	virtual ~SagaEngine();
-	Snd *_snd;
+	SndRes *_sndRes;
 };
 
 // FIXME: Global var. We use it until everything will be turned into objects

Index: sndres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sndres.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sndres.cpp	28 Apr 2004 23:10:59 -0000	1.4
+++ sndres.cpp	28 Apr 2004 23:19:45 -0000	1.5
@@ -47,7 +47,7 @@
 
 namespace Saga {
 
-Snd::Snd(void) {
+SndRes::SndRes(void) {
 	int result;
 
 	/* Load sound module resource file contexts */
@@ -68,7 +68,7 @@
 	_init = 1;
 }
 
-int Snd::playVoice(ulong voice_rn) {
+int SndRes::playVoice(ulong voice_rn) {
 	R_SOUNDBUFFER snd_buffer;
 	int result;
 
@@ -82,7 +82,7 @@
 	return R_SUCCESS;
 }
 
-int Snd::load(R_RSCFILE_CONTEXT *snd_ctxt, ulong snd_rn, R_SOUNDBUFFER *snd_buf_i) {
+int SndRes::load(R_RSCFILE_CONTEXT *snd_ctxt, ulong snd_rn, R_SOUNDBUFFER *snd_buf_i) {
 	uchar *snd_res;
 	size_t snd_res_len;
 
@@ -132,7 +132,7 @@
 	return R_SUCCESS;
 }
 
-int Snd::loadVocSound(const uchar *snd_res, size_t snd_res_len, R_SOUNDBUFFER *snd_buf_i) {
+int SndRes::loadVocSound(const uchar *snd_res, size_t snd_res_len, R_SOUNDBUFFER *snd_buf_i) {
 	R_VOC_HEADER_BLOCK voc_hb;
 	R_VOC_GENBLOCK voc_gb;
 	R_VOC_BLOCK1 voc_b1;
@@ -225,7 +225,7 @@
 	return R_SUCCESS;
 }
 
-int Snd::getVoiceLength(ulong voice_rn) {
+int SndRes::getVoiceLength(ulong voice_rn) {
 	ulong length;
 
 	double ms_f;
@@ -257,7 +257,7 @@
 	return ms_i;
 }
 
-int Snd::ITEVOC_Resample(long src_freq, long dst_freq, uchar *src_buf, 
+int SndRes::ITEVOC_Resample(long src_freq, long dst_freq, uchar *src_buf, 
 						size_t src_buf_len, uchar **dst_buf, size_t *dst_buf_len) {
 	uchar *resamp_buf;
 	size_t resamp_len;

Index: sndres.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sndres.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sndres.h	28 Apr 2004 23:10:59 -0000	1.4
+++ sndres.h	28 Apr 2004 23:19:45 -0000	1.5
@@ -62,10 +62,10 @@
 	int pack_method;	/* BYTE */
 };
 
-class Snd {
+class SndRes {
  public:
 
-	Snd(void);
+	SndRes(void);
 
 	int loadSound(ulong sound_rn);
 	int playVoice(ulong voice_rn);