[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.54,1.55 akos.cpp,1.14,1.15 gfx.cpp,1.77,1.78

Vincent Hamm yazoo at users.sourceforge.net
Mon Apr 22 15:29:05 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv5458

Modified Files:
	actor.cpp akos.cpp gfx.cpp 
Log Message:
Made great progress with the akos codec 5. Placement is now correct but still experiencing bugs with background reset. Also fixed missing dialogues in dig when the talking actor isn't in the room (fix not 100% correct yet).

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** actor.cpp	21 Apr 2002 17:54:59 -0000	1.54
--- actor.cpp	22 Apr 2002 22:18:24 -0000	1.55
***************
*** 1084,1088 ****
  	} else {
  		a = derefActorSafe(_actorToPrintStrFor, "actorTalk");
! 		if (a->room != _currentRoom) {
  			oldact = 0xFF;
  		} else {
--- 1084,1088 ----
  	} else {
  		a = derefActorSafe(_actorToPrintStrFor, "actorTalk");
! 		if (a->room != _currentRoom && !(_features & GF_AFTER_V7)) {
  			oldact = 0xFF;
  		} else {

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/akos.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** akos.cpp	22 Apr 2002 16:18:20 -0000	1.14
--- akos.cpp	22 Apr 2002 22:18:24 -0000	1.15
***************
*** 901,908 ****
  	BompDrawData bdd;
  	
! 	vs = &virtscr[1];
  
  	bdd.dataptr = ar->srcptr;
! 	bdd.out = ar->outptr - (ar->width/2) - (ar->height * ar->outwidth);
  	bdd.outheight = ar->outheight;
  	bdd.outwidth = ar->outwidth;
--- 901,952 ----
  	BompDrawData bdd;
  	
! 	int mirror;
! 	int moveX;
! 	int moveY;
! 	int left;
! 	int var_20;
! 	int max_width;
! 	int right;
! 	int top;
! 	int bottom;
! 
! 	vs = &virtscr[0];
! 
! 	//setBlastObjectMode(ar->shadow_mode); // not implemented yet
! 
! 	mirror = ar->mirror;
! 
! 	moveX=ar->move_x_cur;
! 	moveY=ar->move_y_cur;
! 
! 	if (!mirror)
! 	{
! 		left = (ar->x - moveX - ar->width) + 1;
! 	}
! 	else
! 	{
! 		left = ar->x + moveX -1;
! 	}
! 
! 	var_20=0;
! 	max_width = ar->outwidth;
! 
! 	right = left + ar->width - 1;
! 	top = ar->y + moveY;
! 	bottom = top + ar->height;
! 
! 	if(left < 0)
! 		left = 0;
! 
! 	if(left > max_width)
! 		left -= left - max_width;
! 
! 	ar->draw_top = top;
! 	ar->draw_bottom = bottom;
! 
! 	updateDirtyRect(0, left, right+1, top, bottom+1, 1 << ar->dirty_id);
  
  	bdd.dataptr = ar->srcptr;
! 	bdd.out = vs->screenPtr;
  	bdd.outheight = ar->outheight;
  	bdd.outwidth = ar->outwidth;
***************
*** 911,921 ****
  	bdd.srcheight = ar->height;
  	bdd.srcwidth = ar->width;
! 	bdd.x = ar->x;
! 	bdd.y = ar->y;
  
  	drawBomp(&bdd,0,bdd.dataptr,0,0);
- 	updateDirtyRect(0, ar->x - ar->width /2, ar->x - ar->width/2+ar->width, ar->y -ar->height, ar->y, 0);
- 
- 
  }
  
--- 955,962 ----
  	bdd.srcheight = ar->height;
  	bdd.srcwidth = ar->width;
! 	bdd.x = left+1;
! 	bdd.y = top;
  
  	drawBomp(&bdd,0,bdd.dataptr,0,0);
  }
  

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** gfx.cpp	22 Apr 2002 16:18:20 -0000	1.77
--- gfx.cpp	22 Apr 2002 22:18:24 -0000	1.78
***************
*** 2545,2550 ****
  }
  
! // param3=clipping ?
! // param2=scalling or not ?
  // param1= never used ?
  void Scumm::drawBomp(BompDrawData *bd, int param1, byte* dataPtr, int param2, int param3)
--- 2545,2550 ----
  }
  
! // param3= clipping
! // param2= mirror
  // param1= never used ?
  void Scumm::drawBomp(BompDrawData *bd, int param1, byte* dataPtr, int param2, int param3)





More information about the Scummvm-git-logs mailing list