[Scummvm-cvs-logs] CVS: scummvm gfx.cpp,1.80,1.81 script_v2.cpp,1.52,1.53 scummvm.cpp,1.125,1.126

[Vincent Hamm]

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

Modified Files:
	gfx.cpp script_v2.cpp scummvm.cpp 
Log Message:
Fixed transition effects in non V7 games

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** gfx.cpp	24 Apr 2002 04:26:08 -0000	1.80
--- gfx.cpp	24 Apr 2002 14:13:09 -0000	1.81
***************
*** 183,190 ****
  		bottom = vs->bdirty[i];
  
! 		if (_vm->camera._cur.y != _vm->camera._last.y)
! 
  			drawStripToScreen(vs, start, w, 0, vs->height);
- 
  		else
  		if (bottom) {
--- 183,188 ----
  		bottom = vs->bdirty[i];
  
! 		if (_vm->_features & GF_AFTER_V7 && (_vm->camera._cur.y != _vm->camera._last.y))
  			drawStripToScreen(vs, start, w, 0, vs->height);
  		else
  		if (bottom) {
***************
*** 197,203 ****
  				continue;
  			}
! 		//	drawStripToScreen(vs, start, w, top, bottom);
! 
! 			drawStripToScreen(vs, start, w, 0, vs->height);
  			w = 8;
  		}
--- 195,202 ----
  				continue;
  			}
! 			if(_vm->_features & GF_AFTER_V7)
! 				drawStripToScreen(vs, start, w, 0, vs->height);
! 			else
! 				drawStripToScreen(vs, start, w, top, bottom);
  			w = 8;
  		}

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** script_v2.cpp	23 Apr 2002 18:11:36 -0000	1.52
--- script_v2.cpp	24 Apr 2002 14:13:09 -0000	1.53
***************
*** 1627,1631 ****
  		error("Can't set actor %d name with new-name-of", obj);
  
! 	if (!getOBCDFromObject(obj))
  		error("Can't set name of object %d", obj);
  
--- 1627,1631 ----
  		error("Can't set actor %d name with new-name-of", obj);
  
! 	if (!(_features & GF_AFTER_V7) && !getOBCDFromObject(obj))
  		error("Can't set name of object %d", obj);
  

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** scummvm.cpp	24 Apr 2002 04:26:09 -0000	1.125
--- scummvm.cpp	24 Apr 2002 14:13:09 -0000	1.126
***************
*** 310,315 ****
  					|| _BgNeedsRedraw || _fullRedraw) {
  				redrawBGAreas();
- 
- 				_videoBuffer = virtscr[0].screenPtr + (camera._cur.y - 100) * 328;
  			}
  		}
--- 310,313 ----
***************
*** 695,702 ****
  	initBGBuffers(_scrHeight);
  
- 
- 	_videoBuffer = virtscr[0].screenPtr;
- 
- 
  	memset(_extraBoxFlags, 0, sizeof(_extraBoxFlags));
  }
--- 693,696 ----
***************
*** 1249,1253 ****
  
  	/* Create a primary virtual screen */
! 	_videoBuffer = (byte*)malloc(328*800);
  
  	allocResTypeData(rtBuffer, MKID('NONE'), 10, "buffer", 0);
--- 1243,1247 ----
  
  	/* Create a primary virtual screen */
! 	_videoBuffer = (byte*)malloc(328*200);
  
  	allocResTypeData(rtBuffer, MKID('NONE'), 10, "buffer", 0);