[Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.1,1.2 adlibchannel.h,1.1,1.2 adlibmusic.cpp,1.1,1.2 adlibmusic.h,1.1,1.2 gmmusic.cpp,1.2,1.3 gmmusic.h,1.1,1.2 mt32music.cpp,1.2,1.3 mt32music.h,1.1,1.2 musicbase.cpp,1.1,1.2 musicbase.h,1.1,1.2

[Robert G?ffringmann]

Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1:/tmp/cvs-serv29700/sky/music

Modified Files:
	adlibchannel.cpp adlibchannel.h adlibmusic.cpp adlibmusic.h 
	gmmusic.cpp gmmusic.h mt32music.cpp mt32music.h musicbase.cpp 
	musicbase.h 
Log Message:
cleaned code a bit, added SYSTEM_FLAGS and MOUSE_FLAG

Index: adlibchannel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibchannel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- adlibchannel.cpp	28 May 2003 23:31:43 -0000	1.1
+++ adlibchannel.cpp	1 Jun 2003 21:21:09 -0000	1.2
@@ -22,9 +22,8 @@
 #include "adlibchannel.h"
 #include "sound/fmopl.h"
 
-SkyAdlibChannel::SkyAdlibChannel(uint8 *pMusicData, uint16 startOfData, uint32 version)
+SkyAdlibChannel::SkyAdlibChannel(uint8 *pMusicData, uint16 startOfData)
 {
-	_gameVersion = version;
 	_musicData = pMusicData;
 	_channelData.startOfData = startOfData;
 	_channelData.eventDataPtr = startOfData;
@@ -42,7 +41,7 @@
 
 	uint16 instrumentDataLoc;
 
-	if (_gameVersion == 267) {
+	if (SkyState::_systemVars.gameVersion == 267) {
 		instrumentDataLoc = (_musicData[0x11FC] << 8) | _musicData[0x11FB];
 		_frequenceTable = (uint16*)(_musicData+0x7F4);
 		_registerTable = _musicData+0xDF4;

Index: adlibchannel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibchannel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- adlibchannel.h	28 May 2003 23:31:43 -0000	1.1
+++ adlibchannel.h	1 Jun 2003 21:21:10 -0000	1.2
@@ -24,6 +24,7 @@
 
 #include "stdafx.h"
 #include "common/engine.h"
+#include "sky/sky.h"
 #include "sky/music/musicbase.h"
 
 typedef struct {
@@ -59,12 +60,11 @@
 
 class SkyAdlibChannel : public SkyChannelBase {
 public:
-	SkyAdlibChannel(uint8 *pMusicData, uint16 startOfData, uint32 version);
+	SkyAdlibChannel(uint8 *pMusicData, uint16 startOfData);
 	virtual void stopNote(void);
 	virtual uint8 process(uint16 aktTime);
 	virtual void updateVolume(uint16 pVolume);
 private:
-	uint32 _gameVersion;
 	uint8 *_musicData;
 	uint16 _musicVolume;
 	AdlibChannelType _channelData;

Index: adlibmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- adlibmusic.cpp	28 May 2003 23:31:43 -0000	1.1
+++ adlibmusic.cpp	1 Jun 2003 21:21:10 -0000	1.2
@@ -27,8 +27,8 @@
 	((SkyAdlibMusic*)param)->premixerCall(buf, len);
 }
 
-SkyAdlibMusic::SkyAdlibMusic(SoundMixer *pMixer, SkyDisk *pSkyDisk, uint32 version)
-	: SkyMusicBase(pSkyDisk, version) {
+SkyAdlibMusic::SkyAdlibMusic(SoundMixer *pMixer, SkyDisk *pSkyDisk)
+	: SkyMusicBase(pSkyDisk) {
 
 	_driverFileBase = 60202;
     _mixer = pMixer;
@@ -74,8 +74,7 @@
 
 void SkyAdlibMusic::setupPointers(void) {
 
-	printf("game version: %d\n",_gameVersion);
-	if (_gameVersion == 267) {
+	if (SkyState::_systemVars.gameVersion == 267) {
 		// disk demo uses a different adlib driver version, some offsets have changed
 		_musicDataLoc = (_musicData[0x11F8] << 8) | _musicData[0x11F7];
 		_initSequence = _musicData + 0xE87;
@@ -92,7 +91,7 @@
 	channelData++;
 	for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) {
 		uint16 chDataStart = ((channelData[(cnt << 1) | 1] << 8) | channelData[cnt << 1]) + _musicDataLoc;
-		_channels[cnt] = new SkyAdlibChannel(_musicData, chDataStart, _gameVersion);
+		_channels[cnt] = new SkyAdlibChannel(_musicData, chDataStart);
 	}
 }
 

Index: adlibmusic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- adlibmusic.h	28 May 2003 23:31:43 -0000	1.1
+++ adlibmusic.h	1 Jun 2003 21:21:10 -0000	1.2
@@ -23,6 +23,7 @@
 #define ADLIBMUSIC_H
 
 #include "stdafx.h"
+#include "sky/sky.h"
 #include "sound/mixer.h"
 #include "common/engine.h"
 #include "adlibchannel.h"
@@ -30,7 +31,7 @@
 
 class SkyAdlibMusic : public SkyMusicBase {
 public:
-	SkyAdlibMusic(SoundMixer *pMixer, SkyDisk *pSkyDisk, uint32 version);
+	SkyAdlibMusic(SoundMixer *pMixer, SkyDisk *pSkyDisk);
 	~SkyAdlibMusic(void);
 private:
 	SoundMixer *_mixer;

Index: gmmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmmusic.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gmmusic.cpp	28 May 2003 23:44:11 -0000	1.2
+++ gmmusic.cpp	1 Jun 2003 21:21:10 -0000	1.3
@@ -26,8 +26,8 @@
 	((SkyGmMusic*)param)->timerCall();
 }
 
-SkyGmMusic::SkyGmMusic(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, uint32 version)
-	: SkyMusicBase(pSkyDisk, version) {
+SkyGmMusic::SkyGmMusic(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk)
+	: SkyMusicBase(pSkyDisk) {
 
 	_driverFileBase = 60200;
     _midiDrv = pMidiDrv;

Index: gmmusic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmmusic.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gmmusic.h	28 May 2003 23:31:43 -0000	1.1
+++ gmmusic.h	1 Jun 2003 21:21:10 -0000	1.2
@@ -30,7 +30,7 @@
 
 class SkyGmMusic : public SkyMusicBase {
 public:
-	SkyGmMusic(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, uint32 version);
+	SkyGmMusic(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk);
 	~SkyGmMusic(void);
 private:
 	static void passTimerFunc(void *param);

Index: mt32music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/mt32music.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mt32music.cpp	29 May 2003 03:19:10 -0000	1.2
+++ mt32music.cpp	1 Jun 2003 21:21:10 -0000	1.3
@@ -26,8 +26,8 @@
 	((SkyMT32Music*)param)->timerCall();
 }
 
-SkyMT32Music::SkyMT32Music(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, uint32 version)
-	: SkyMusicBase(pSkyDisk, version) {
+SkyMT32Music::SkyMT32Music(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk)
+	: SkyMusicBase(pSkyDisk) {
 
 	_driverFileBase = 60200;
     _midiDrv = pMidiDrv;

Index: mt32music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/mt32music.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mt32music.h	28 May 2003 23:31:43 -0000	1.1
+++ mt32music.h	1 Jun 2003 21:21:10 -0000	1.2
@@ -30,7 +30,7 @@
 
 class SkyMT32Music : public SkyMusicBase {
 public:
-	SkyMT32Music(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, uint32 version);
+	SkyMT32Music(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk);
 	~SkyMT32Music(void);
 private:
 	static void passTimerFunc(void *param);

Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- musicbase.cpp	28 May 2003 23:31:43 -0000	1.1
+++ musicbase.cpp	1 Jun 2003 21:21:10 -0000	1.2
@@ -21,9 +21,8 @@
 
 #include "musicbase.h"
 
-SkyMusicBase::SkyMusicBase(SkyDisk *pSkyDisk, uint32 version) {
+SkyMusicBase::SkyMusicBase(SkyDisk *pSkyDisk) {
 
-	_gameVersion = version;
 	_musicData = NULL;
 	_allowedCommands = 0;
 	_skyDisk = pSkyDisk;

Index: musicbase.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- musicbase.h	28 May 2003 23:31:43 -0000	1.1
+++ musicbase.h	1 Jun 2003 21:21:10 -0000	1.2
@@ -43,14 +43,13 @@
 
 class SkyMusicBase {
 public:
-	SkyMusicBase(SkyDisk *pSkyDisk, uint32 version);
+	SkyMusicBase(SkyDisk *pSkyDisk);
 	virtual ~SkyMusicBase(void);
 	void loadSection(uint8 pSection);
 	void musicCommand(uint16 command);
 	void startMusic(uint16 param) { _onNextPoll.musicToProcess = param & 0xF; }; // 4
 	
 protected:
-	uint32 _gameVersion;
 
 	SkyDisk *_skyDisk;
 	uint8 *_musicData;