diff options
author | Colin Snover | 2016-05-26 18:58:44 -0500 |
---|---|---|
committer | Colin Snover | 2016-05-26 19:06:35 -0500 |
commit | 741e26cfd2c9484bd4ae4698c9ba0f5925be2b38 (patch) | |
tree | 5ce2a0a65b7dfbabfda37308987fc882e105085f | |
parent | a2174d76c18952d8b513299bf09c8d3453bba67e (diff) | |
download | scummvm-rg350-741e26cfd2c9484bd4ae4698c9ba0f5925be2b38.tar.gz scummvm-rg350-741e26cfd2c9484bd4ae4698c9ba0f5925be2b38.tar.bz2 scummvm-rg350-741e26cfd2c9484bd4ae4698c9ba0f5925be2b38.zip |
SCI32: Remove unused Plane fields
These fields were written and never read in SSCI.
-rw-r--r-- | engines/sci/graphics/plane32.cpp | 12 | ||||
-rw-r--r-- | engines/sci/graphics/plane32.h | 14 |
2 files changed, 0 insertions, 26 deletions
diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp index d05e4f79e1..d5c297ebf7 100644 --- a/engines/sci/graphics/plane32.cpp +++ b/engines/sci/graphics/plane32.cpp @@ -45,8 +45,6 @@ void DrawList::add(ScreenItem *screenItem, const Common::Rect &rect) { uint16 Plane::_nextObjectId = 20000; Plane::Plane(const Common::Rect &gameRect, PlanePictureCodes pictureId) : -_width(g_sci->_gfxFrameout->getCurrentBuffer().scriptWidth), -_height(g_sci->_gfxFrameout->getCurrentBuffer().scriptHeight), _pictureId(pictureId), _mirrored(false), _back(0), @@ -65,8 +63,6 @@ _gameRect(gameRect) { } Plane::Plane(reg_t object) : -_width(g_sci->_gfxFrameout->getCurrentBuffer().scriptWidth), -_height(g_sci->_gfxFrameout->getCurrentBuffer().scriptHeight), _priorityChanged(false), _object(object), _redrawAllCount(g_sci->_gfxFrameout->getScreenCount()), @@ -97,8 +93,6 @@ _moved(0) { Plane::Plane(const Plane &other) : _pictureId(other._pictureId), _mirrored(other._mirrored), -_field_34(other._field_34), _field_38(other._field_38), -_field_3C(other._field_3C), _field_40(other._field_40), _back(other._back), _object(other._object), _priority(other._priority), @@ -116,11 +110,7 @@ void Plane::operator=(const Plane &other) { _mirrored = other._mirrored; _priority = other._priority; _back = other._back; - _width = other._width; - _field_34 = other._field_34; - _height = other._height; _screenRect = other._screenRect; - _field_3C = other._field_3C; _priorityChanged = other._priorityChanged; } @@ -769,8 +759,6 @@ void Plane::sync(const Plane *other, const Common::Rect &screenRect) { } convertGameRectToPlaneRect(); - _width = g_sci->_gfxFrameout->getCurrentBuffer().scriptWidth; - _height = g_sci->_gfxFrameout->getCurrentBuffer().scriptHeight; _screenRect = _planeRect; // NOTE: screenRect originally was retrieved through globals // instead of being passed into the function diff --git a/engines/sci/graphics/plane32.h b/engines/sci/graphics/plane32.h index 53749f86f4..c93fb5b64e 100644 --- a/engines/sci/graphics/plane32.h +++ b/engines/sci/graphics/plane32.h @@ -101,16 +101,6 @@ private: static uint16 _nextObjectId; /** - * The dimensions of the plane, in game script - * coordinates. - * TODO: These are never used and are always - * scriptWidth x scriptHeight in SCI engine? The actual - * dimensions of the plane are always in - * gameRect/planeRect. - */ - int16 _width, _height; - - /** * For planes that are used to render picture data, the * resource ID of the picture to be displayed. This * value may also be one of the special @@ -135,10 +125,6 @@ private: */ bool _pictureChanged; - // TODO: Are these ever actually used? - int _field_34, _field_38; // probably a point or ratio - int _field_3C, _field_40; // probably a point or ratio - /** * Converts the dimensions of the game rect used by * scripts to the dimensions of the plane rect used to |