[Scummvm-cvs-logs] SF.net SVN: scummvm:[44075] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 44075
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44075&view=rev
Author:   lordhoto
Date:     2009-09-13 21:48:02 +0000 (Sun, 13 Sep 2009)

Log Message:
-----------
- Cleanup
- Fix mismatching new[]/delete

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound.h
    scummvm/trunk/engines/kyra/sound_adlib.h
    scummvm/trunk/engines/kyra/sound_towns.cpp

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2009-09-13 21:41:29 UTC (rev 44074)
+++ scummvm/trunk/engines/kyra/sound.h	2009-09-13 21:48:02 UTC (rev 44075)
@@ -110,14 +110,14 @@
 	/**
 	 * Load hard coded data for playing music
 	 * (and somtimes sound effects) from.
-	 */	
-	virtual void loadSoundFile(const uint8 *data, int len) { }
+	 */
+	virtual void loadSoundFile(const uint8 *data, int len) {}
 
 	/**
 	 * Load a sound file for playing sound
 	 * effects from.
 	 */
-	virtual void loadSfxFile(Common::String file) { }
+	virtual void loadSfxFile(Common::String file) {}
 
 	/**
 	 * Plays the specified track.

Modified: scummvm/trunk/engines/kyra/sound_adlib.h
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.h	2009-09-13 21:41:29 UTC (rev 44074)
+++ scummvm/trunk/engines/kyra/sound_adlib.h	2009-09-13 21:48:02 UTC (rev 44075)
@@ -72,7 +72,6 @@
 
 	void loadSoundFile(uint file);
 	void loadSoundFile(Common::String file);
-	void loadSoundFile(const uint8 *data, int len) {}
 
 	void playTrack(uint8 track);
 	void haltTrack();

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2009-09-13 21:41:29 UTC (rev 44074)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2009-09-13 21:48:02 UTC (rev 44075)
@@ -4075,14 +4075,14 @@
 
 void SoundPC98::loadSoundFile(Common::String file) {
 	if (_sfxTrackData)
-		delete _sfxTrackData;
+		delete[] _sfxTrackData;
 	
 	_sfxTrackData = _vm->resource()->fileData(file.c_str(), 0);
 }
 
 void SoundPC98::loadSoundFile(const uint8 *data, int len) {
 	if (_sfxTrackData)
-		delete _sfxTrackData;
+		delete[] _sfxTrackData;
 
 	_sfxTrackData = new uint8[len];
 	memcpy(_sfxTrackData, data, len);


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