[Scummvm-cvs-logs] CVS: scummvm resource.cpp,1.32,1.33 scumm.h,1.43,1.44 scummvm.cpp,1.35,1.36

[Vincent Hamm]

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

Modified Files:
	resource.cpp scumm.h scummvm.cpp 
Log Message:


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** resource.cpp	12 Feb 2002 21:45:33 -0000	1.32
--- resource.cpp	12 Feb 2002 22:25:41 -0000	1.33
***************
*** 68,76 ****
  #else
                  if (!(_features & GF_SMALL_HEADER)) {
!                         sprintf(buf, "%s.%.3d", _exe_name,  room==0 ? 0 : res.roomno[rtRoom][room]);
                          _encbyte = (_features & GF_USE_KEY) ? 0x69 : 0;
                  } else if(!(_features & GF_SMALL_NAMES)) {
  			if(room==0 || room>=900) {
! 				sprintf(buf, "%s\\%.3d.lfl",_exe_name,room);	
  				_encbyte = 0;
  				if (openResourceFile(buf)) {
--- 68,77 ----
  #else
                  if (!(_features & GF_SMALL_HEADER)) {
!                         sprintf(buf, "%s//%s.%.3d", _exe_name, _exe_name,  room==0 ? 0 : res.roomno[rtRoom][room]);
! 			
                          _encbyte = (_features & GF_USE_KEY) ? 0x69 : 0;
                  } else if(!(_features & GF_SMALL_NAMES)) {
  			if(room==0 || room>=900) {
! 				sprintf(buf, "%s//%.3d.lfl",_exe_name,room);	
  				_encbyte = 0;
  				if (openResourceFile(buf)) {
***************
*** 80,88 ****
  
  			} else {
! 				sprintf(buf, "%s\\disk%.2d.lec",_exe_name,res.roomno[rtRoom][room]);
  				_encbyte = 0x69;
  			}
  		} else {
! 				sprintf(buf, "%s\\%.2d.lfl",_exe_name,room);	
  				if(_features & GF_OLD_BUNDLE)
  					_encbyte = 0xFF;
--- 81,89 ----
  
  			} else {
! 				sprintf(buf, "%s//disk%.2d.lec",_exe_name,res.roomno[rtRoom][room]);
  				_encbyte = 0x69;
  			}
  		} else {
! 				sprintf(buf, "%s//%.2d.lfl",_exe_name,room);	
  				if(_features & GF_OLD_BUNDLE)
  					_encbyte = 0xFF;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** scumm.h	12 Feb 2002 21:28:07 -0000	1.43
--- scumm.h	12 Feb 2002 22:25:41 -0000	1.44
***************
*** 927,930 ****
--- 927,931 ----
  	GF_16COLOR = 256,
  	GF_OLD256 = 512,
+ 	GF_AUDIOTRACKS = 1024,
  };
  

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** scummvm.cpp	12 Feb 2002 21:28:07 -0000	1.35
--- scummvm.cpp	12 Feb 2002 22:25:41 -0000	1.36
***************
*** 272,276 ****
  	_vars[VAR_DEBUGMODE] = _debugMode;
  
! 	if (_gameId==GID_MONKEY)
  		_vars[VAR_MI1_TIMER]+=40;
  
--- 272,276 ----
  	_vars[VAR_DEBUGMODE] = _debugMode;
  
! 	if (_features & GF_AUDIOTRACKS)
  		_vars[VAR_MI1_TIMER]+=40;
  
***************
*** 444,449 ****
  
          /* Scumm version 5 */
!         {"loomcd",      "Loom (256 color CD version)",                  GID_LOOM256,    5, 1, 42, GF_SMALL_HEADER|GF_USE_KEY},
!         {"monkey",      "Monkey Island 1",                              GID_MONKEY,     5, 2, 2,  GF_USE_KEY},
          {"monkey2",     "Monkey Island 2: LeChuck's revenge",           GID_MONKEY2,    5, 2, 2,  GF_USE_KEY},
          {"atlantis",    "Indiana Jones 4 and the Fate of Atlantis",     GID_INDY4,      5, 5, 0,  GF_USE_KEY},
--- 444,449 ----
  
          /* Scumm version 5 */
!         {"loomcd",      "Loom (256 color CD version)",                  GID_LOOM256,    5, 1, 42, GF_SMALL_HEADER|GF_USE_KEY|GF_AUDIOTRACKS},
!         {"monkey",      "Monkey Island 1",                              GID_MONKEY,     5, 2, 2,  GF_USE_KEY|GF_AUDIOTRACKS},
          {"monkey2",     "Monkey Island 2: LeChuck's revenge",           GID_MONKEY2,    5, 2, 2,  GF_USE_KEY},
          {"atlantis",    "Indiana Jones 4 and the Fate of Atlantis",     GID_INDY4,      5, 5, 0,  GF_USE_KEY},