diff options
author | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
---|---|---|
committer | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
commit | d5ed8b1901b88e361a2a420a9daf586f6089a36b (patch) | |
tree | d19e4dd7baf33b7447d69d8ad8d3c25732a69698 /engines/tony/utils.cpp | |
parent | ff51a7661d7a2cb296b987edfc3d81727160e627 (diff) | |
parent | 8808393b3a3428df2946d7967e52aba084c8ffe5 (diff) | |
download | scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.gz scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.bz2 scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.zip |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
AUTHORS
Diffstat (limited to 'engines/tony/utils.cpp')
-rw-r--r-- | engines/tony/utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/tony/utils.cpp b/engines/tony/utils.cpp index 3cc09a1454..81060146b7 100644 --- a/engines/tony/utils.cpp +++ b/engines/tony/utils.cpp @@ -383,7 +383,7 @@ void RMResUpdate::init(const Common::String &fileName) { // It doesn't exist, so exit immediately return; - uint8 version = _hFile.readByte(); + _hFile.readByte(); // Version, unused _numUpd = _hFile.readUint32LE(); |