aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2009-07-14 16:45:18 +0000
committerTorbjörn Andersson2009-07-14 16:45:18 +0000
commitaa50dd61e9e698e4106ac0d0ad49cf05ec9b5e19 (patch)
tree0d3e08d0f0c533a21f5c6a524321c9a8fa6f641c
parent810961e685d54ed4758de770918d459e01519320 (diff)
downloadscummvm-rg350-aa50dd61e9e698e4106ac0d0ad49cf05ec9b5e19.tar.gz
scummvm-rg350-aa50dd61e9e698e4106ac0d0ad49cf05ec9b5e19.tar.bz2
scummvm-rg350-aa50dd61e9e698e4106ac0d0ad49cf05ec9b5e19.zip
Got rid of ioFailed(). I haven't actually tested it, but we don't use the MPEG
decoder at the moment, and it was only used in the BACKEND_8BIT case anyway. svn-id: r42484
-rw-r--r--graphics/video/mpeg_player.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/graphics/video/mpeg_player.cpp b/graphics/video/mpeg_player.cpp
index 1910babce4..5b7b3eb607 100644
--- a/graphics/video/mpeg_player.cpp
+++ b/graphics/video/mpeg_player.cpp
@@ -86,13 +86,10 @@ bool BaseAnimationState::init(const char *name) {
}
p = 0;
- while (1) {
+ while (!f.eos()) {
_palettes[p].end = f.readUint16LE();
_palettes[p].cnt = f.readUint16LE();
- if (f.ioFailed())
- break;
-
for (i = 0; i < _palettes[p].cnt; i++) {
_palettes[p].pal[4 * i] = f.readByte();
_palettes[p].pal[4 * i + 1] = f.readByte();