diff options
| author | Joel Teichroeb | 2014-04-11 19:50:16 -0700 |
|---|---|---|
| committer | Joel Teichroeb | 2014-04-11 19:53:03 -0700 |
| commit | 32e85a957de8142266c20271fd76aca0fa2c023c (patch) | |
| tree | 8642864b25e269ec20649df3b3eb3452d61db926 /video | |
| parent | 15c6293128bd45eca9d3783c1201d0b34f239862 (diff) | |
| download | scummvm-rg350-32e85a957de8142266c20271fd76aca0fa2c023c.tar.gz scummvm-rg350-32e85a957de8142266c20271fd76aca0fa2c023c.tar.bz2 scummvm-rg350-32e85a957de8142266c20271fd76aca0fa2c023c.zip | |
VIDEO: Use || instead of the currently incorrect &&
The code currenly has 4 logically dead lines. Instead of requiring
both newWidth and newHeight to be non zero, just make sure one of
them is non zero and set the other one to the current size.
Diffstat (limited to 'video')
| -rw-r--r-- | video/flic_decoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/flic_decoder.cpp b/video/flic_decoder.cpp index 5d27aa0a59..994f47cea8 100644 --- a/video/flic_decoder.cpp +++ b/video/flic_decoder.cpp @@ -176,7 +176,7 @@ const Graphics::Surface *FlicDecoder::FlicVideoTrack::decodeNextFrame() { uint16 newWidth = _fileStream->readUint16LE(); uint16 newHeight = _fileStream->readUint16LE(); - if ((newWidth != 0) && (newHeight != 0)) { + if ((newWidth != 0) || (newHeight != 0)) { if (newWidth == 0) newWidth = _surface->w; if (newHeight == 0) |