mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-13 21:31:53 +00:00
sword1: slight cleanup of psx related sound code and comments
svn-id: r41380
This commit is contained in:
parent
aef8d2b04b
commit
51d0005af3
@ -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();
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user