[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.20,1.21 resource.cpp,1.13,1.14

[Ludvig Strigeus]

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

Modified Files:
	scummvm.cpp resource.cpp 
Log Message:
minor cleanup

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** scummvm.cpp	2001/11/07 21:44:39	1.20
--- scummvm.cpp	2001/11/08 20:00:32	1.21
***************
*** 410,415 ****
  
  struct VersionSettings {
! 	char *filename;
! 	char *gamename;
  	byte id,major,middle,minor;
  };
--- 410,415 ----
  
  struct VersionSettings {
! 	const char *filename;
! 	const char *gamename;
  	byte id,major,middle,minor;
  };

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** resource.cpp	2001/11/07 18:10:51	1.13
--- resource.cpp	2001/11/08 20:00:33	1.14
***************
*** 59,67 ****
  			return;
  		}
! 		if (room==0) {
! 			sprintf(buf, "%s.000", _exe_name);
! 		} else {
! 			sprintf(buf, "%s.%.3d", _exe_name, res.roomno[1][room]);
! 		}
  		_encbyte = 0x69;
  		if (openResourceFile(buf)) {
--- 59,65 ----
  			return;
  		}
! 		sprintf(buf, "%s.%.3d", _exe_name, 
! 			room==0 ? 0 : res.roomno[rtRoom][room]);
! 
  		_encbyte = 0x69;
  		if (openResourceFile(buf)) {