[Scummvm-cvs-logs] SF.net SVN: scummvm: [26150] scummvm/trunk/engines/queen

[cyx at users.sourceforge.net]

Revision: 26150
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26150&view=rev
Author:   cyx
Date:     2007-03-16 15:34:59 -0700 (Fri, 16 Mar 2007)

Log Message:
-----------
minor simplification

Modified Paths:
--------------
    scummvm/trunk/engines/queen/music.cpp
    scummvm/trunk/engines/queen/music.h

Modified: scummvm/trunk/engines/queen/music.cpp
===================================================================
--- scummvm/trunk/engines/queen/music.cpp	2007-03-16 22:28:25 UTC (rev 26149)
+++ scummvm/trunk/engines/queen/music.cpp	2007-03-16 22:34:59 UTC (rev 26150)
@@ -43,6 +43,8 @@
 	_musicData = vm->resource()->loadFile(filename, 0, &_musicDataSize);
 	_numSongs = READ_LE_UINT16(_musicData);
 	this->open();
+
+	_tune = vm->resource()->isDemo() ? Sound::_tuneDemo : Sound::_tune;
 }
 
 MidiMusic::~MidiMusic() {
@@ -194,7 +196,7 @@
 		return;
 	}
 
-	int mode = (_numSongs == 40) ? Sound::_tuneDemo[tuneList].mode : Sound::_tune[tuneList].mode;
+	int mode = _tune[tuneList].mode;
 	switch (mode) {
 	case 0: // random loop
 		_randomLoop = true;
@@ -210,13 +212,8 @@
 	}
 
 	int i = 0;
-	if (_numSongs == 40) {
-		while (Sound::_tuneDemo[tuneList].tuneNum[i])
-			queueSong(Sound::_tuneDemo[tuneList].tuneNum[i++] - 1);
-	} else {
-		while (Sound::_tune[tuneList].tuneNum[i])
-			queueSong(Sound::_tune[tuneList].tuneNum[i++] - 1);
-	}
+	while (_tune[tuneList].tuneNum[i])
+		queueSong(_tune[tuneList].tuneNum[i++] - 1);
 
 	if (_randomLoop)
 		_queuePos = randomQueuePos();

Modified: scummvm/trunk/engines/queen/music.h
===================================================================
--- scummvm/trunk/engines/queen/music.h	2007-03-16 22:28:25 UTC (rev 26149)
+++ scummvm/trunk/engines/queen/music.h	2007-03-16 22:34:59 UTC (rev 26150)
@@ -30,6 +30,8 @@
 
 namespace Queen {
 
+struct tuneData;
+
 class QueenEngine;
 
 class MidiMusic : public MidiDriver {
@@ -100,6 +102,7 @@
 	uint32 _musicDataSize;
 	bool _vToggle;
 	byte *_musicData;
+	const tuneData *_tune;
 };
 
 } // End of namespace Queen


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.