diff options
author | Filippos Karapetis | 2014-12-24 13:55:49 +0200 |
---|---|---|
committer | Filippos Karapetis | 2014-12-24 13:55:49 +0200 |
commit | c93776e1e05bd5a683459831d61542c134d7b856 (patch) | |
tree | c648e2893be01b446b544a0ee2b32d483d10ca64 | |
parent | 9948d3ca16ceff79dd3ccf6dde5024de04470f08 (diff) | |
download | scummvm-rg350-c93776e1e05bd5a683459831d61542c134d7b856.tar.gz scummvm-rg350-c93776e1e05bd5a683459831d61542c134d7b856.tar.bz2 scummvm-rg350-c93776e1e05bd5a683459831d61542c134d7b856.zip |
ZVISION: Remove dead code
-rw-r--r-- | engines/zvision/graphics/cursors/cursor.cpp | 29 | ||||
-rw-r--r-- | engines/zvision/graphics/cursors/cursor.h | 1 |
2 files changed, 0 insertions, 30 deletions
diff --git a/engines/zvision/graphics/cursors/cursor.cpp b/engines/zvision/graphics/cursors/cursor.cpp index 07323b45c4..515358fe59 100644 --- a/engines/zvision/graphics/cursors/cursor.cpp +++ b/engines/zvision/graphics/cursors/cursor.cpp @@ -36,35 +36,6 @@ ZorkCursor::ZorkCursor() _hotspotY(0) { } -ZorkCursor::ZorkCursor(const Common::String &fileName) - : _width(0), - _height(0), - _hotspotX(0), - _hotspotY(0) { - Common::File file; - if (!file.open(fileName)) - return; - - uint32 magic = file.readUint32BE(); - if (magic != MKTAG('Z', 'C', 'R', '1')) { - warning("%s is not a Zork Cursor file", fileName.c_str()); - return; - } - - _hotspotX = file.readUint16LE(); - _hotspotY = file.readUint16LE(); - _width = file.readUint16LE(); - _height = file.readUint16LE(); - - uint dataSize = _width * _height * sizeof(uint16); - _surface.create(_width, _height, Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0)); - uint32 bytesRead = file.read(_surface.getPixels(), dataSize); - assert(bytesRead == dataSize); - - // Convert to RGB 565 - _surface.convertToInPlace(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0)); -} - ZorkCursor::ZorkCursor(ZVision *engine, const Common::String &fileName) : _width(0), _height(0), diff --git a/engines/zvision/graphics/cursors/cursor.h b/engines/zvision/graphics/cursors/cursor.h index 0c1e99411f..6e0083520a 100644 --- a/engines/zvision/graphics/cursors/cursor.h +++ b/engines/zvision/graphics/cursors/cursor.h @@ -39,7 +39,6 @@ namespace ZVision { class ZorkCursor { public: ZorkCursor(); - ZorkCursor(const Common::String &fileName); ZorkCursor(ZVision *engine, const Common::String &fileName); ZorkCursor(const ZorkCursor &other); ~ZorkCursor(); |