[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.229,1.230 actor.h,1.51,1.52 akos.cpp,1.108,1.109

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25317/scumm

Modified Files:
	actor.cpp actor.h akos.cpp 
Log Message:

Add akos drawing offsets


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- actor.cpp	9 Feb 2004 08:05:23 -0000	1.229
+++ actor.cpp	16 Feb 2004 02:55:19 -0000	1.230
@@ -46,6 +46,7 @@
 
 Actor::Actor() {
 	assert(_vm != 0);
+	offs_x = offs_y = 0;
 	top = bottom = 0;
 	number = 0;
 	needRedraw = needBgReset = costumeNeedsInit = visible = false;
@@ -954,8 +955,8 @@
 
 	bcr->_actorID = number;
 
-	bcr->_actorX = _pos.x - _vm->virtscr[0].xstart;
-	bcr->_actorY = _pos.y - elevation;
+	bcr->_actorX = _pos.x + offs_x - _vm->virtscr[0].xstart;
+	bcr->_actorY = _pos.y + offs_y - elevation;
 
 	if (_vm->_version <= 2) {
 		// HACK: We have to adjust the x position by one strip (8 pixels) in

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- actor.h	9 Feb 2004 08:05:23 -0000	1.51
+++ actor.h	16 Feb 2004 02:55:23 -0000	1.52
@@ -83,6 +83,7 @@
 
 public:
 	Common::Point _pos;
+	int offs_x, offs_y;
 	int top, bottom;
 	uint width;
 	byte number;

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- akos.cpp	15 Feb 2004 03:47:26 -0000	1.108
+++ akos.cpp	16 Feb 2004 02:55:23 -0000	1.109
@@ -1345,9 +1345,8 @@
 		a->forceClip = param_1;
 		break;
 	case 6:
-		warning("unimplemented akos_queCommand(6,%d,%d,%d)", a->number, param_1, param_2);
-//		a->offs_x = param_1;
-//		a->offs_y = param_2;
+		a->offs_x = param_1;
+		a->offs_y = param_2;
 		break;
 	case 7:
 		if (param_1 != 0) {