sword1: slight cleanup of psx related sound code and comments

svn-id: r41380

2 files changed, 3 insertions, 3 deletions

diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp
index 9f602aca2c..fb9068dde7 100644
--- a/engines/sword1/music.cpp
+++ b/engines/sword1/music.cpp
@@ -272,7 +272,7 @@ bool MusicHandle::playPSX(uint16 id, bool loop) {
 
 	tableFile.close();
 
-	if (size != 0xffffffff && size) {
+	if ((size != 0) && (size != 0xffffffff)) {
 		_file.seek(offset, SEEK_SET);
 		_audioSource = new Audio::VagStream(_file.readStream(size), loop);
 		fadeUp();
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index 306d23db57..5577c66fc6 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -226,14 +226,14 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) {
 			return false;
 		}
 		
-		uint16 numRooms = file.readUint16LE(); // Number of rooms 
+		uint16 numRooms = file.readUint16LE(); // Read number of rooms referenced in this file
 
 		file.seek(locIndex * 4 + 2); // 4 bytes per room, skip first 2 bytes
 
 		uint16 numLines = file.readUint16LE();
 		uint16 roomOffset = file.readUint16LE();
 
-		file.seek(2 + numRooms * 4 + roomOffset * 2); // The offset is in terms of uint16's, so multiply by 2. Skip the 0x112 byte header too.
+		file.seek(2 + numRooms * 4 + roomOffset * 2); // The offset is in terms of uint16's, so multiply by 2. Skip the room indexes too.
 
 		locIndex = 0xFFFFFFFF;