[Scummvm-cvs-logs] SF.net SVN: scummvm: [26217] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 26217
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26217&view=rev
Author:   peres001
Date:     2007-03-18 10:33:54 -0700 (Sun, 18 Mar 2007)

Log Message:
-----------
hidden _cnv member of Animation from callers

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/animation.cpp
    scummvm/trunk/engines/parallaction/walk.cpp
    scummvm/trunk/engines/parallaction/zone.h

Modified: scummvm/trunk/engines/parallaction/animation.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/animation.cpp	2007-03-18 17:22:07 UTC (rev 26216)
+++ scummvm/trunk/engines/parallaction/animation.cpp	2007-03-18 17:33:54 UTC (rev 26217)
@@ -127,7 +127,6 @@
 					strcat(vC8, "tras");
 				}
 			}
-
 			_disk->loadFrames(vC8, &vD0->_cnv);
 //			int16 _ax = _vm->_gfx->loadCnv(vC8, &vD0->_cnv);
 //			if (_ax == -1) exit(-1);
@@ -193,8 +192,8 @@
 		if ((v18->_zone._flags & kFlagsActive) && ((v18->_zone._flags & kFlagsRemove) == 0))   {
 			v14._width = v18->width();
 			v14._height = v18->height();
-			v14._data0 = v18->_cnv._array[v18->_frame];
-//			v14._data1 = v18->_cnv.field_8[v18->_frame];
+			v14._data0 = v18->getFrameData(v18->_frame);
+//			v14._data1 = v18->_cnv->field_8[v18->_frame];
 
 			if (v18->_zone._flags & kFlagsNoMasked)
 				_si = 3;
@@ -573,7 +572,7 @@
 			case INST_PUT:	// put
 				v18._width = inst->_opBase._a->width();
 				v18._height = inst->_opBase._a->height();
-				v18._data0 = inst->_opBase._a->_cnv._array[inst->_opBase._a->_frame];
+				v18._data0 = inst->_opBase._a->getFrameData(inst->_opBase._a->_frame);
 				v18._data1 = NULL; // inst->_opBase._a->_cnv.field_8[inst->_opBase._a->_frame];
 
 				if (inst->_flags & kInstMaskedPut) {

Modified: scummvm/trunk/engines/parallaction/walk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/walk.cpp	2007-03-18 17:22:07 UTC (rev 26216)
+++ scummvm/trunk/engines/parallaction/walk.cpp	2007-03-18 17:33:54 UTC (rev 26217)
@@ -94,7 +94,7 @@
 
 		if (close == right) {
 			to.x += right;
-			walkData3 = (_vm->_char._ani._cnv._count == 20) ? 7 : 9;
+			walkData3 = (_vm->_char._ani.getFrameNum() == 20) ? 7 : 9;
 		} else
 		if (close == left) {
 			to.x -= left;
@@ -105,7 +105,7 @@
 		} else
 		if (close == bottom) {
 			to.y += bottom;
-			walkData3 = (_vm->_char._ani._cnv._count == 20) ? 17 : 21;
+			walkData3 = (_vm->_char._ani.getFrameNum() == 20) ? 17 : 21;
 		}
 
 	}
@@ -333,7 +333,7 @@
 
 	// walk frame selection
 	int16 v16;
-	if (_vm->_char._ani._cnv._count == 20) {
+	if (_vm->_char._ani.getFrameNum() == 20) {
 
 		if (dist.x > dist.y) {
 			walkData2 = (node->_x > _si) ? 0 : 7;

Modified: scummvm/trunk/engines/parallaction/zone.h
===================================================================
--- scummvm/trunk/engines/parallaction/zone.h	2007-03-18 17:22:07 UTC (rev 26216)
+++ scummvm/trunk/engines/parallaction/zone.h	2007-03-18 17:33:54 UTC (rev 26217)
@@ -227,6 +227,14 @@
 	uint16 height() const {
 		return _cnv._height;
 	}
+
+	uint16 getFrameNum() {
+		return _cnv._count;
+	}
+
+	byte* getFrameData(uint32 index) {
+		return _cnv.getFramePtr(index);
+	}
 };
 
 extern Node _zones;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.