[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.36,1.37 string.cpp,1.14,1.15

[Vincent Hamm]

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

Modified Files:
	scummvm.cpp string.cpp 
Log Message:
fixed text and timer in LoomCD

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** scummvm.cpp	12 Feb 2002 22:25:41 -0000	1.36
--- scummvm.cpp	12 Feb 2002 22:46:30 -0000	1.37
***************
*** 273,277 ****
  
  	if (_features & GF_AUDIOTRACKS)
! 		_vars[VAR_MI1_TIMER]+=40;
  
  	if (_saveLoadFlag) {
--- 273,277 ----
  
  	if (_features & GF_AUDIOTRACKS)
! 		_vars[VAR_MI1_TIMER]+=5;
  
  	if (_saveLoadFlag) {

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** string.cpp	12 Feb 2002 21:28:07 -0000	1.14
--- string.cpp	12 Feb 2002 22:46:30 -0000	1.15
***************
*** 673,681 ****
  		return;
  
-         if (_vm->_features & GF_SMALL_HEADER)
-                _ptr -= 12;
- 
  	_ptr = _vm->getResourceAddress(rtCharset, _curId) + 29;
! 
  	_bpp = _unk2 = *_ptr;
  	_invNumBits = 8 - _bpp;
--- 673,680 ----
  		return;
  
  	_ptr = _vm->getResourceAddress(rtCharset, _curId) + 29;
! 	if (_vm->_features & GF_SMALL_HEADER)
! 		_ptr -=12;
! 	
  	_bpp = _unk2 = *_ptr;
  	_invNumBits = 8 - _bpp;