[Scummvm-cvs-logs] CVS: scummvm/scumm player_v2.cpp,2.46,2.46.2.1 resource.cpp,1.188.2.2,1.188.2.3 player_v1.cpp,1.20,1.20.2.1 player_mod.h,2.13,2.13.2.1

[Max Horn]

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

Modified Files:
      Tag: branch-0-6-0
	player_v2.cpp resource.cpp player_v1.cpp player_mod.h 
Log Message:
Some minor mods from the trunk

Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.46
retrieving revision 2.46.2.1
diff -u -d -r2.46 -r2.46.2.1
--- player_v2.cpp	8 Jan 2004 20:37:25 -0000	2.46
+++ player_v2.cpp	13 Aug 2004 09:04:20 -0000	2.46.2.1
@@ -543,24 +543,7 @@
 
 void Player_V2::clear_channel(int i) {
 	ChannelInfo *channel = &_channels[i];
-	channel->d.time_left  = 0;
-	channel->d.next_cmd   = 0;
-	channel->d.base_freq  = 0;
-	channel->d.freq_delta = 0;
-	channel->d.freq = 0;
-	channel->d.volume = 0;
-	channel->d.volume_delta = 0;
-	channel->d.inter_note_pause = 0;
-	channel->d.transpose = 0;
-	channel->d.hull_curve = 0;
-	channel->d.hull_offset = 0;
-	channel->d.hull_counter = 0;
-	channel->d.freqmod_table = 0;
-	channel->d.freqmod_offset = 0;
-	channel->d.freqmod_incr = 0;
-	channel->d.freqmod_multiplier = 0;
-	channel->d.freqmod_modulo = 0;
-	channel->d.music_timer = 0;
+	memset(channel, 0, sizeof(ChannelInfo));
 }
 
 int Player_V2::getMusicTimer() const {

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.188.2.2
retrieving revision 1.188.2.3
diff -u -d -r1.188.2.2 -r1.188.2.3
--- resource.cpp	2 May 2004 16:36:03 -0000	1.188.2.2
+++ resource.cpp	13 Aug 2004 09:04:20 -0000	1.188.2.3
@@ -425,9 +425,7 @@
 			break;
 
 		case MKID('AARY'):
-			debug(3, "Going to call readArrayFromIndexFile (pos = 0x%08x)", _fileHandle.pos());
 			readArrayFromIndexFile();
-			debug(3, "After readArrayFromIndexFile (pos = 0x%08x)", _fileHandle.pos());
 			break;
 
 		default:

Index: player_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v1.cpp,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -d -r1.20 -r1.20.2.1
--- player_v1.cpp	8 Jan 2004 20:37:25 -0000	1.20
+++ player_v1.cpp	13 Aug 2004 09:04:20 -0000	1.20.2.1
@@ -42,6 +42,7 @@
 	_mplex_step = (_sample_rate << FIXP_SHIFT) / 1193000;
 	_next_chunk = _repeat_chunk = 0;
 	_forced_level = 0;
+	_random_lsr = 0;
 }
 
 Player_V1::~Player_V1() {

Index: player_mod.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_mod.h,v
retrieving revision 2.13
retrieving revision 2.13.2.1
diff -u -d -r2.13 -r2.13.2.1
--- player_mod.h	6 Jan 2004 12:45:30 -0000	2.13
+++ player_mod.h	13 Aug 2004 09:04:20 -0000	2.13.2.1
@@ -52,7 +52,7 @@
 
 private:
 	enum {
-		MOD_MAXCHANS = 16
+		MOD_MAXCHANS = 24
 	};
 
 	struct soundChan {