diff options
author | lukaslw | 2014-08-01 17:38:04 +0200 |
---|---|---|
committer | lukaslw | 2014-08-01 17:38:04 +0200 |
commit | 3c29d61f6705a6f05d86fa2599a6992d2d17e3ac (patch) | |
tree | 9c0033d66c9a1cbf1cb5c52ca27b8159d194d432 /engines/prince/pscr.cpp | |
parent | b3589c76da856239828377a3011525a888b04920 (diff) | |
download | scummvm-rg350-3c29d61f6705a6f05d86fa2599a6992d2d17e3ac.tar.gz scummvm-rg350-3c29d61f6705a6f05d86fa2599a6992d2d17e3ac.tar.bz2 scummvm-rg350-3c29d61f6705a6f05d86fa2599a6992d2d17e3ac.zip |
PRINCE: Code clean-up
Diffstat (limited to 'engines/prince/pscr.cpp')
-rw-r--r-- | engines/prince/pscr.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/engines/prince/pscr.cpp b/engines/prince/pscr.cpp index bb4316d465..d9d36a3356 100644 --- a/engines/prince/pscr.cpp +++ b/engines/prince/pscr.cpp @@ -21,17 +21,13 @@ */ #include "common/archive.h" -#include "common/debug-channels.h" -#include "common/debug.h" #include "common/stream.h" -#include "graphics/surface.h" - #include "prince/pscr.h" namespace Prince { -PScr::PScr() :_file(0), _x(0), _y(0), _step(0), _addr(0), _len(0), _surface(nullptr) +PScr::PScr() : _x(0), _y(0), _step(0), _surface(nullptr) { } @@ -58,15 +54,14 @@ void PScr::loadSurface(Common::SeekableReadStream &stream) { bool PScr::loadFromStream(Common::SeekableReadStream &stream) { int32 pos = stream.pos(); uint16 file = stream.readUint16LE(); - if (file == 0xFFFF) + if (file == 0xFFFF) { return false; - _file = file; + } _x = stream.readUint16LE(); _y = stream.readUint16LE(); _step = stream.readUint16LE(); - _addr = stream.readUint32LE(); - const Common::String pscrStreamName = Common::String::format("PS%02d", _file); + const Common::String pscrStreamName = Common::String::format("PS%02d", file); Common::SeekableReadStream *pscrStream = SearchMan.createReadStreamForMember(pscrStreamName); if (pscrStream != nullptr) { loadSurface(*pscrStream); @@ -74,9 +69,7 @@ bool PScr::loadFromStream(Common::SeekableReadStream &stream) { delete pscrStream; stream.seek(pos + 12); // size of PScrList struct - debug("Parallex nr %d, x %d, y %d, step %d", _file, _x, _y, _step); - return true; } -} +} // End of namespace Prince |