diff options
| author | Johannes Schickel | 2010-07-16 23:30:50 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-07-16 23:30:50 +0000 |
| commit | ddb364412e3286eb68479285abc567351f4b5b45 (patch) | |
| tree | 9f146e508be9ae9879bce280bc07429897c23ad5 /engines | |
| parent | bf17cc1053b4273ff21f069e161fdb38b4aec83a (diff) | |
| download | scummvm-rg350-ddb364412e3286eb68479285abc567351f4b5b45.tar.gz scummvm-rg350-ddb364412e3286eb68479285abc567351f4b5b45.tar.bz2 scummvm-rg350-ddb364412e3286eb68479285abc567351f4b5b45.zip | |
Fix use of "&&" instead of "&" for bit masking. (This looks much more sensible at least!)
svn-id: r50953
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/m4/mads_player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/m4/mads_player.cpp b/engines/m4/mads_player.cpp index 5106d2210d..a8b6469771 100644 --- a/engines/m4/mads_player.cpp +++ b/engines/m4/mads_player.cpp @@ -634,7 +634,7 @@ int MadsPlayer::scanPath(M4Surface *depthSurface, const Common::Point &srcPos, c // Outer horizontal movement loop for (int yIndex = 0; yIndex < yDiff; ++yIndex) { index += yDiff; - int v = (*srcP && 0x7F) >> 4; + int v = (*srcP & 0x7F) >> 4; if (v) return v; @@ -642,7 +642,7 @@ int MadsPlayer::scanPath(M4Surface *depthSurface, const Common::Point &srcPos, c while (index >= xDiff) { index -= xDiff; - v = (*srcP && 0x7F) >> 4; + v = (*srcP & 0x7F) >> 4; if (v) return v; |