diff options
author | lukaslw | 2014-06-29 17:56:25 +0200 |
---|---|---|
committer | lukaslw | 2014-06-29 17:56:25 +0200 |
commit | 7ebcbea0f9b7dae6e7c8631cfa65e1e6437b3fbc (patch) | |
tree | 0ad77ba0521a174cc7e6034e292e42ab1b4374ef /engines/prince/object.cpp | |
parent | dc400682af7f6a3e2b9c5069c0879a033598cd0d (diff) | |
download | scummvm-rg350-7ebcbea0f9b7dae6e7c8631cfa65e1e6437b3fbc.tar.gz scummvm-rg350-7ebcbea0f9b7dae6e7c8631cfa65e1e6437b3fbc.tar.bz2 scummvm-rg350-7ebcbea0f9b7dae6e7c8631cfa65e1e6437b3fbc.zip |
PRINCE: Object, checkMob() update, prepareInventoryToView() fix
Diffstat (limited to 'engines/prince/object.cpp')
-rw-r--r-- | engines/prince/object.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/prince/object.cpp b/engines/prince/object.cpp index 94d55b5716..86d4238bc0 100644 --- a/engines/prince/object.cpp +++ b/engines/prince/object.cpp @@ -32,8 +32,8 @@ namespace Prince { -Object::Object() : _surface(NULL), _x(0), _y(0), _z(0), _mask(0), - _zoomInSource(0), _zoomInLen(0), _zoomInAddr(0), _zoomInTime(0) +Object::Object() : _surface(NULL), _x(0), _y(0), _z(0), _mask(0), _width(0), + _height(0), _zoomInSource(0), _zoomInLen(0), _zoomInAddr(0), _zoomInTime(0) { } @@ -47,12 +47,12 @@ Object::~Object() { void Object::loadSurface(Common::SeekableReadStream &stream) { stream.skip(4); - int width = stream.readUint16LE(); - int height = stream.readUint16LE(); + _width = stream.readUint16LE(); + _height = stream.readUint16LE(); _surface = new Graphics::Surface(); - _surface->create(width, height, Graphics::PixelFormat::createFormatCLUT8()); + _surface->create(_width, _height, Graphics::PixelFormat::createFormatCLUT8()); - for (int h = 0; h < _surface->h; ++h) { + for (int h = 0; h < _surface->h; h++) { stream.read(_surface->getBasePtr(0, h), _surface->w); } } |