[Scummvm-cvs-logs] CVS: scummvm akos.cpp,1.13,1.14 gfx.cpp,1.76,1.77 object.cpp,1.62,1.63 scumm.h,1.136,1.137

Vincent Hamm yazoo at users.sourceforge.net
Mon Apr 22 09:19:10 CEST 2002


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

Modified Files:
	akos.cpp gfx.cpp object.cpp scumm.h 
Log Message:
More work done on blast objects. Very preliminary implementation of akos codec 5

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/akos.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** akos.cpp	21 Apr 2002 19:38:00 -0000	1.13
--- akos.cpp	22 Apr 2002 16:18:20 -0000	1.14
***************
*** 897,902 ****
  
  void Scumm::akos_codec5(AkosRenderer * ar)
! {
! 	warning("akos_codec5: not implemented");
  }
  
--- 897,921 ----
  
  void Scumm::akos_codec5(AkosRenderer * ar)
! {
! 	VirtScreen *vs;
! 	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;
! 	bdd.scale_x = 0xFF;
! 	bdd.scale_y = 0xFF;
! 	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);
! 
! 
  }
  

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** gfx.cpp	21 Apr 2002 17:46:41 -0000	1.76
--- gfx.cpp	22 Apr 2002 16:18:20 -0000	1.77
***************
*** 2544,2549 ****
  	return bestitem;
  }
! 
! void Scumm::drawBomp(BompDrawData * bd)
  {
  	byte *dest = bd->out + bd->y * bd->outwidth, *src;
--- 2544,2552 ----
  	return bestitem;
  }
! 
! // param3=clipping ?
! // param2=scalling or not ?
! // param1= never used ?
! void Scumm::drawBomp(BompDrawData *bd, int param1, byte* dataPtr, int param2, int param3)
  {
  	byte *dest = bd->out + bd->y * bd->outwidth, *src;
***************
*** 2639,2643 ****
  CHECK_HEAP;
  }
- 
  
  
--- 2642,2645 ----

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** object.cpp	22 Apr 2002 13:55:28 -0000	1.62
--- object.cpp	22 Apr 2002 16:18:20 -0000	1.63
***************
*** 1247,1251 ****
  
  	bdd.out = vs->screenPtr + vs->xstart;
! 	bdd.outwidth = 320;
  	bdd.outheight = vs->height;
  	bdd.dataptr = bomp + 10;
--- 1247,1251 ----
  
  	bdd.out = vs->screenPtr + vs->xstart;
! 	bdd.outwidth = vs->width;
  	bdd.outheight = vs->height;
  	bdd.dataptr = bomp + 10;
***************
*** 1255,1264 ****
  	bdd.scale_y = (unsigned char)eo->unk4;
  
! 	updateDirtyRect(vs->number, bdd.x, bdd.x + bdd.srcwidth, bdd.y,
! 									bdd.y + bdd.srcheight, 0);
  
- 	if (eo->number) {
- 		drawBomp(&bdd);
- 	}
  }
  
--- 1255,1264 ----
  	bdd.scale_y = (unsigned char)eo->unk4;
  
! 	drawBomp(&bdd, 0, bdd.dataptr, 1, 0);
! 
! 
! 	updateDirtyRect(vs->number, bdd.x, bdd.x + bdd.srcwidth, bdd.y,
! 								bdd.y + bdd.srcheight, 0);
  
  }
  

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** scumm.h	22 Apr 2002 11:36:41 -0000	1.136
--- scumm.h	22 Apr 2002 16:18:20 -0000	1.137
***************
*** 1156,1160 ****
  	void drawRoomObject(int i, int arg);
  	void drawBox(int x, int y, int x2, int y2, int color);
! 	void drawBomp(BompDrawData *bd);
  
  	void restoreBG(int left, int top, int right, int bottom);
--- 1156,1160 ----
  	void drawRoomObject(int i, int arg);
  	void drawBox(int x, int y, int x2, int y2, int color);
! 	void drawBomp(BompDrawData *bd, int param1, byte* dataPtr, int param2, int param3);
  
  	void restoreBG(int left, int top, int right, int bottom);





More information about the Scummvm-git-logs mailing list