[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.123,1.124 journal.cpp,1.30,1.31 logic.cpp,1.189,1.190 sound.cpp,1.37,1.38 sound.h,1.20,1.21 xref.txt,1.62,1.63

[Joost Peters]

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

Modified Files:
	cutaway.cpp journal.cpp logic.cpp sound.cpp sound.h xref.txt 
Log Message:
Handle comic book case, enable music toggle and some minor cleanup.


Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- cutaway.cpp	28 Jan 2004 13:13:58 -0000	1.123
+++ cutaway.cpp	27 Feb 2004 23:54:13 -0000	1.124
@@ -66,7 +66,7 @@
 	ptr = _fileData = _vm->resource()->loadFile(filename, 20);
 
 	if (0 == scumm_stricmp(filename, "comic.cut"))
-		/* XXX _songBeforeComic = CURRSONG */; 
+		_songBeforeComic = _vm->sound()->lastOverride(); 
 
 	strcpy(_basename, filename);
 	_basename[strlen(_basename)-4] = '\0';

Index: journal.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/journal.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- journal.cpp	21 Feb 2004 08:52:25 -0000	1.30
+++ journal.cpp	27 Feb 2004 23:54:13 -0000	1.31
@@ -255,9 +255,9 @@
 	} else if (zoneNum == ZN_MUSIC_TOGGLE) {
 		_vm->sound()->toggleMusic();
 		if (_vm->sound()->musicOn()) {
-			// XXX playsong(lastoverride);
+			_vm->sound()->playLastSong();
 		} else {
-			// XXX playsong(-1);
+			_vm->music()->stopSong();
 		}
 		drawConfigPanel();
 	} else if (zoneNum == ZN_VOICE_TOGGLE) {

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- logic.cpp	21 Feb 2004 20:50:56 -0000	1.189
+++ logic.cpp	27 Feb 2004 23:54:13 -0000	1.190
@@ -1363,7 +1363,7 @@
 	uint16 flag = _vm->bam()->_flag;
 	_vm->bam()->_flag = BamScene::F_STOP;
 
-	_vm->sound()->playSong(_vm->sound()->lastOverride());
+	_vm->sound()->playLastSong();
 
 	switch (gameState(VAR_DRESSING_MODE)) {
 	case 0: 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- sound.cpp	22 Feb 2004 14:11:13 -0000	1.37
+++ sound.cpp	27 Feb 2004 23:54:13 -0000	1.38
@@ -33,7 +33,7 @@
 namespace Queen {
 
 Sound::Sound(SoundMixer *mixer, QueenEngine *vm) : 
-	_mixer(mixer), _vm(vm), _sfxToggle(true), _speechToggle(true), _musicToggle(true), _lastOverride(0), _currentSong(0) {
+	_mixer(mixer), _vm(vm), _sfxToggle(true), _speechToggle(true), _musicToggle(true), _lastOverride(0) {
 }
 
 Sound::~Sound() {

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- sound.h	22 Feb 2004 14:11:13 -0000	1.20
+++ sound.h	27 Feb 2004 23:54:13 -0000	1.21
@@ -58,21 +58,22 @@
 	void playSfx(uint16 sfx, bool isSpeech);
 	void playSfx(const char *base, bool isSpeech);
 	void playSong(int16 songNum);
+	void playLastSong()		{ playSong(_lastOverride); }
 	void stopSpeech()		{ _mixer->stopHandle(_speechHandle); }
 	
-	bool sfxOn()			{ return _sfxToggle; }
+	bool sfxOn() const		{ return _sfxToggle; }
 	void sfxToggle(bool val)	{ _sfxToggle = val; }
 	void toggleSfx()		{ _sfxToggle ^= true; }
 
-	bool speechOn()			{ return _speechToggle; }
+	bool speechOn()	const		{ return _speechToggle; }
 	void speechToggle(bool val)	{ _speechToggle = val; }
 	void toggleSpeech()		{ _speechToggle ^= true; }
 	
-	bool musicOn()			{ return _musicToggle; }
+	bool musicOn() const		{ return _musicToggle; }
 	void musicToggle(bool val)	{ _musicToggle = val; }
 	void toggleMusic()		{ _musicToggle ^= true; }
 
-	int16 lastOverride()		{ return _lastOverride; }
+	int16 lastOverride() const	{ return _lastOverride; }
 
 	void saveState(byte *&ptr);
 	void loadState(uint32 ver, byte *&ptr);
@@ -95,11 +96,6 @@
 	bool _musicToggle;
 	
 	int16 _lastOverride;
-	int16 _lastMerge;
-	int16 _altMrgPri;
-	int16 _currentSong;
-	int16 _previousSong;
-	int16 _previousSongNum;
 	PlayingSoundHandle _sfxHandle;
 	PlayingSoundHandle _speechHandle;
 };

Index: xref.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/xref.txt,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- xref.txt	23 Jan 2004 10:40:32 -0000	1.62
+++ xref.txt	27 Feb 2004 23:54:13 -0000	1.63
@@ -332,11 +332,6 @@
 -
 song[]						Sound::_song[]
 tunelist[]					Sound::_tune[]
-lastmerge					Sound::_lastMerge
-altmrgpri					Sound::_altMrgPri
-oldsn						Sound::_previousSongNum
-LASTSONG					Sound::_previousSong
-CURRSONG					Sound::_currentSong
 SFXNAME						Sound::_sfxName
 VOLUME