Added an abstract base class for representing multiple-frames for animations. Changed user code to rely on the new interface. Cnv has been turned into an implementation of the new interface, and it is now known as a concrete class only to Disk and Font code for Nippon Safes.

svn-id: r28734

1 files changed, 8 insertions, 4 deletions

diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp
index add2f87b5e..195d814265 100644
--- a/engines/parallaction/objects.cpp
+++ b/engines/parallaction/objects.cpp
@@ -62,22 +62,26 @@ Animation::~Animation() {
 
 uint16 Animation::width() const {
 	if (!_cnv) return 0;
-	return _cnv->_width;
+	Common::Rect r;
+	_cnv->getRect(0, r);
+	return r.width();
 }
 
 uint16 Animation::height() const {
 	if (!_cnv) return 0;
-	return _cnv->_height;
+	Common::Rect r;
+	_cnv->getRect(0, r);
+	return r.height();
 }
 
 uint16 Animation::getFrameNum() const {
 	if (!_cnv) return 0;
-	return _cnv->_count;
+	return _cnv->getNum();
 }
 
 byte* Animation::getFrameData(uint32 index) const {
 	if (!_cnv) return NULL;
-	return _cnv->getFramePtr(index);
+	return _cnv->getData(index);
 }