diff options
| author | Bertrand Augereau | 2008-07-10 18:01:54 +0000 |
|---|---|---|
| committer | Bertrand Augereau | 2008-07-10 18:01:54 +0000 |
| commit | f41ab55021c98e2ae1aee77fa0c1dd45e0475023 (patch) | |
| tree | 1ca5cfabc3882b7c869a53c2f12edf93c8ad9342 /engines/scumm | |
| parent | c8488c060cea860d02fdf59221408f7974a80eab (diff) | |
| download | scummvm-rg350-f41ab55021c98e2ae1aee77fa0c1dd45e0475023.tar.gz scummvm-rg350-f41ab55021c98e2ae1aee77fa0c1dd45e0475023.tar.bz2 scummvm-rg350-f41ab55021c98e2ae1aee77fa0c1dd45e0475023.zip | |
Fixed a few warnings
svn-id: r32994
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/resource_he.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 9359c6610c..753ad45212 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -492,7 +492,7 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com // Note that GF_OLD_BUNDLE is true if and only if GF_OLD256 is false. // Candidates: maniac enhanced, zak enhanced, indy3ega, loom - if (g->version != 2 && g->version != 3 || (g->features & GF_OLD256)) + if ((g->version != 2 && g->version != 3) || (g->features & GF_OLD256)) return false; /* We distinguish the games by the presence/absence of diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp index 33e6748860..f8fb1efca2 100644 --- a/engines/scumm/he/resource_he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -522,12 +522,13 @@ int Win32ResExtractor::do_resources_recurs(WinLibrary *fi, WinResource *base, /* get a list of all resources at this level */ wr = list_resources(fi, base, &rescnt); - if (wr == NULL) + if (wr == NULL) { if (size != 0) return size; else return 0; - + } + /* process each resource listed */ for (c = 0 ; c < rescnt ; c++) { /* (over)write the corresponding WinResource holder with the current */ |