aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorAndrew Kurushin2005-10-21 15:26:57 +0000
committerAndrew Kurushin2005-10-21 15:26:57 +0000
commit75e02d2da994d1c487700a7754d6d8d3c38cb2f7 (patch)
tree897f5bdddc58c7fe515568aa7f231b7d238352cd /scumm
parent37660b0b0a619de100ed4509ad869277cf8e49f8 (diff)
downloadscummvm-rg350-75e02d2da994d1c487700a7754d6d8d3c38cb2f7.tar.gz
scummvm-rg350-75e02d2da994d1c487700a7754d6d8d3c38cb2f7.tar.bz2
scummvm-rg350-75e02d2da994d1c487700a7754d6d8d3c38cb2f7.zip
fix compilation warn
svn-id: r19219
Diffstat (limited to 'scumm')
-rw-r--r--scumm/resource.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index fa7a5320df..5309e713ba 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -396,7 +396,7 @@ void ScummEngine::readIndexFile() {
bool checkTryMedia(BaseScummFile *handle) {
byte buf[TRYMEDIA_MARK_LEN];
- bool matched;
+ bool matched = true;
const byte magic[2][TRYMEDIA_MARK_LEN] =
{{ 0x00, 'T', 'M', 'S', 'A', 'M' },
{ 'i', '=', '$', ':', '(', '$' }}; // Same but 0x69 xored
@@ -406,8 +406,10 @@ bool checkTryMedia(BaseScummFile *handle) {
for (int i = 0; i < 2; i++) {
matched = true;
for (int j = 0; j < TRYMEDIA_MARK_LEN; j++)
- if (buf[j] != magic[i][j])
+ if (buf[j] != magic[i][j]) {
matched = false;
+ break;
+ }
if (matched)
break;