[Scummvm-cvs-logs] CVS: scummvm/sky gmmusic.cpp,1.3,1.4 musicbase.cpp,1.3,1.4 text.cpp,1.21,1.22 text.h,1.13,1.14

[Robert G?ffringmann]

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

Modified Files:
	gmmusic.cpp musicbase.cpp text.cpp text.h 
Log Message:
small fix and added skyText destructor

Index: gmmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/gmmusic.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gmmusic.cpp	15 May 2003 18:56:15 -0000	1.3
+++ gmmusic.cpp	17 May 2003 20:04:05 -0000	1.4
@@ -41,8 +41,9 @@
 
 SkyGmMusic::~SkyGmMusic(void) {
 
-	_midiDrv->close();
 	_midiDrv->setTimerCallback(NULL, NULL);
+	if (_currentMusic) stopMusic();
+	_midiDrv->close();
 	delete _midiDrv;
 }
 

Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/musicbase.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- musicbase.cpp	16 May 2003 15:33:18 -0000	1.3
+++ musicbase.cpp	17 May 2003 20:04:05 -0000	1.4
@@ -30,7 +30,6 @@
 
 SkyMusicBase::~SkyMusicBase(void)
 {
-	if (_currentMusic) stopMusic();
 	if (_musicData) free(_musicData);
 }
 

Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- text.cpp	9 May 2003 22:06:37 -0000	1.21
+++ text.cpp	17 May 2003 20:04:05 -0000	1.22
@@ -46,7 +46,7 @@
 	_mainCharacterSet.charSpacing = 0;
 	
 	fnSetFont(0);
-	
+
 	if (!SkyState::isDemo(_gameVersion)) {
 		_controlCharacterSet.addr = _skyDisk->loadFile(60520, NULL);
 		_controlCharacterSet.charHeight = 12;
@@ -55,11 +55,21 @@
 		_linkCharacterSet.addr = _skyDisk->loadFile(60521, NULL);
 		_linkCharacterSet.charHeight = 12;
 		_linkCharacterSet.charSpacing = 0;
+	} else {
+		_controlCharacterSet.addr = NULL;
+		_linkCharacterSet.addr = NULL;
 	}
 
 	if (SkyState::isCDVersion(_gameVersion)) {
 		_preAfterTableArea = _skyDisk->loadFile(60522, NULL);
-	}
+	} else _preAfterTableArea = NULL;
+}
+
+SkyText::~SkyText(void) {
+
+	if (_controlCharacterSet.addr) free(_controlCharacterSet.addr);
+	if (_linkCharacterSet.addr) free(_linkCharacterSet.addr);
+	if (_preAfterTableArea) free(_preAfterTableArea);
 }
 
 void SkyText::fnSetFont(uint32 fontNr) { 

Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- text.h	12 May 2003 20:50:59 -0000	1.13
+++ text.h	17 May 2003 20:04:05 -0000	1.14
@@ -33,6 +33,7 @@
 class SkyText {
 public:
 	SkyText(SkyDisk *skyDisk, uint32 gameVersion, uint16 _language);
+	~SkyText(void);
 	void getText(uint32 textNr);
 	struct displayText_t displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
 	struct displayText_t displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);