[Scummvm-cvs-logs] CVS: scummvm string.cpp,1.29,1.30 verbs.cpp,1.19,1.20

[James Brown]

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

Modified Files:
	string.cpp verbs.cpp 
Log Message:
Fix Zak and Indy3 verbage



Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** string.cpp	7 Mar 2002 04:32:26 -0000	1.29
--- string.cpp	11 Mar 2002 13:05:54 -0000	1.30
***************
*** 698,706 ****
  	VirtScreen *vs;
  	byte *char_ptr, *dest_ptr;
! 	unsigned int buffer, mask=0, x, y;
  	unsigned char color;
  
  	_vm->checkRange(_vm->_maxCharsets-1, 0, _curId, "Printing with bad charset %d");
! 
  	if ((vs=_vm->findVirtScreen(_top)) == NULL)
  		return;
--- 698,706 ----
  	VirtScreen *vs;
  	byte *char_ptr, *dest_ptr;
! 	unsigned int buffer, mask=0, x = 0, y = 0;
  	unsigned char color;
  
  	_vm->checkRange(_vm->_maxCharsets-1, 0, _curId, "Printing with bad charset %d");
! 		
  	if ((vs=_vm->findVirtScreen(_top)) == NULL)
  		return;
***************
*** 721,726 ****
  		}
  	}
! 		
  	_left+=8;
  }
  
--- 721,733 ----
  		}
  	}
! 
  	_left+=8;
+ 
+ 	if (_left  > _strRight)
+ 		_strRight = _left;
+ 
+ 	if (_top + 8 > _strBottom)
+ 		_strBottom = _top + 8;
+ 
  }
  

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/verbs.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** verbs.cpp	5 Mar 2002 21:03:32 -0000	1.19
--- verbs.cpp	11 Mar 2002 13:05:54 -0000	1.20
***************
*** 68,72 ****
  	if (_verbMouseOver==verb)
  		return;
! 
  	if (_verbs[_verbMouseOver].type!=1) {
  		drawVerb(_verbMouseOver, 0);
--- 68,72 ----
  	if (_verbMouseOver==verb)
  		return;
! 	
  	if (_verbs[_verbMouseOver].type!=1) {
  		drawVerb(_verbMouseOver, 0);
***************
*** 75,79 ****
  
  	if (_verbs[verb].type!=1 && _verbs[verb].hicolor) {
! 		drawVerb(verb, 1);
  		_verbMouseOver = verb;
  	}
--- 75,79 ----
  
  	if (_verbs[verb].type!=1 && _verbs[verb].hicolor) {
! 		drawVerb(verb, 1);		
  		_verbMouseOver = verb;
  	}
***************
*** 86,99 ****
  	vs = &_verbs[i];
  	do {
  		if (vs->curmode!=1 || !vs->verbid || vs->saveid ||
! 				y < vs->y || y >= vs->bottom)
  				continue;
  		if (vs->center) {
  			if (x < -(vs->right - vs->x - vs->x) || x >= vs->right)
! 					continue;
! 		} else {
  			if (x < vs->x || x >= vs->right)
  				continue;
  		}
  		return i;
  	} while (--vs,--i);
--- 86,103 ----
  	vs = &_verbs[i];
  	do {
+ 		if (_features && GF_OLD256)
+ 			vs->saveid = 0;
+ 
  		if (vs->curmode!=1 || !vs->verbid || vs->saveid ||
! 			y < vs->y || y >= vs->bottom)
  				continue;
  		if (vs->center) {
  			if (x < -(vs->right - vs->x - vs->x) || x >= vs->right)
! 				continue;
! 		} else {	
  			if (x < vs->x || x >= vs->right)
  				continue;
  		}
+ 		
  		return i;
  	} while (--vs,--i);
***************
*** 110,114 ****
  
  	vs = &_verbs[vrb];
! 
  	if (!vs->saveid && vs->curmode && vs->verbid) {
  		if (vs->type==1) {
--- 114,118 ----
  
  	vs = &_verbs[vrb];
! 	
  	if (!vs->saveid && vs->curmode && vs->verbid) {
  		if (vs->type==1) {
***************
*** 130,139 ****
--- 134,146 ----
  		if (vs->curmode==2)
  			string[4].color = vs->dimcolor;
+ 
  		_messagePtr = getResourceAddress(rtVerb, vrb);
  		assert(_messagePtr);
+ 		
  		tmp = charset._center;
  		charset._center = 0;
  		drawString(4);
  		charset._center = tmp;
+ 		
  		vs->right = charset._strRight;
  		vs->bottom = charset._strBottom;
***************
*** 142,146 ****
  		vs->oldtop = charset._strTop;
  		vs->oldbottom = charset._strBottom;
! 		charset._strLeft = charset._strRight;
  	} else {
  		restoreVerbBG(vrb);
--- 149,153 ----
  		vs->oldtop = charset._strTop;
  		vs->oldbottom = charset._strBottom;
! 		charset._strLeft = charset._strRight;				
  	} else {
  		restoreVerbBG(vrb);