[Scummvm-cvs-logs] scummvm master -> 94809c4995ccd7a765ce86efdf24f2d3af175d4f
Strangerke
Strangerke at scummvm.org
Mon Jan 4 13:59:45 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
94809c4995 TONY: Reduce variable scope, use MKTAG to check file signature
Commit: 94809c4995ccd7a765ce86efdf24f2d3af175d4f
https://github.com/scummvm/scummvm/commit/94809c4995ccd7a765ce86efdf24f2d3af175d4f
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-01-04T13:53:11+01:00
Commit Message:
TONY: Reduce variable scope, use MKTAG to check file signature
Changed paths:
engines/tony/tony.cpp
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index 6308cf6..08e30cd 100644
--- a/engines/tony/tony.cpp
+++ b/engines/tony/tony.cpp
@@ -573,9 +573,6 @@ void TonyEngine::loadState(CORO_PARAM, int n) {
}
bool TonyEngine::openVoiceDatabase() {
- char id[4];
- uint32 numfiles;
-
// Open the voices database
if (_vdbFP.open("voices.vdb"))
_vdbCodec = FPCODEC_ADPCM;
@@ -589,30 +586,29 @@ bool TonyEngine::openVoiceDatabase() {
return false;
_vdbFP.seek(-8, SEEK_END);
- numfiles = _vdbFP.readUint32LE();
- _vdbFP.read(id, 4);
+ uint32 numfiles = _vdbFP.readUint32LE();
switch (_vdbCodec) {
case FPCODEC_ADPCM:
- if (id[0] != 'V' || id[1] != 'D' || id[2] != 'B' || id[3] != '1') {
+ if (_vdbFP.readUint32BE() != MKTAG('V', 'D', 'B', '1')) {
_vdbFP.close();
return false;
}
break;
case FPCODEC_MP3:
- if (id[0] != 'M' || id[1] != 'D' || id[2] != 'B' || id[3] != '1') {
+ if (_vdbFP.readUint32BE() != MKTAG('M', 'D', 'B', '1')) {
_vdbFP.close();
return false;
}
break;
case FPCODEC_OGG:
- if (id[0] != 'O' || id[1] != 'D' || id[2] != 'B' || id[3] != '1') {
+ if (_vdbFP.readUint32BE() != MKTAG('O', 'D', 'B', '1')) {
_vdbFP.close();
return false;
}
break;
case FPCODEC_FLAC:
- if (id[0] != 'F' || id[1] != 'D' || id[2] != 'B' || id[3] != '1') {
+ if (_vdbFP.readUint32BE() != MKTAG('F', 'D', 'B', '1')) {
_vdbFP.close();
return false;
}
More information about the Scummvm-git-logs
mailing list