[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.30,1.31 script_v2.cpp,1.51,1.52

[James Brown]

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

Modified Files:
	gameDetector.cpp script_v2.cpp 
Log Message:
Quick patch to allow space between -p - Also remove compiler warning 


Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** gameDetector.cpp	22 Apr 2002 03:04:58 -0000	1.30
--- gameDetector.cpp	23 Apr 2002 18:11:35 -0000	1.31
***************
*** 96,103 ****
  					exit(1);
  				case 'p':
! 					if (*(s + 1) == '\0')
! 						goto ShowHelpAndExit;
! 					_gameDataPath = s + 1;
! 					goto NextArg;
  				case 't':
  					if (*(s + 1) == '\0')
--- 96,108 ----
  					exit(1);
  				case 'p':
! 					if (*(s + 1) == '\0') {
! 						if (i+1 < argc && argv[i+1] && argv[i+1][0] != '-' && argv[i+1][0] != '\0') {
! 							i++;
! 							_gameDataPath = argv[i];
! 						} else
! 							goto ShowHelpAndExit;
! 					} else
! 						_gameDataPath = s + 1;
!  					goto NextArg; 				
  				case 't':
  					if (*(s + 1) == '\0')

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** script_v2.cpp	22 Apr 2002 08:16:10 -0000	1.51
--- script_v2.cpp	23 Apr 2002 18:11:36 -0000	1.52
***************
*** 23,28 ****
  
  #include "stdafx.h"
! #include "scumm.h"
! #include "sound/mididrv.h"
  #include "sound/imuse.h"
  
--- 23,30 ----
  
  #include "stdafx.h"
! #include "scumm.h"
! 
! #include "sound/mididrv.h"
! 
  #include "sound/imuse.h"
  
***************
*** 2677,2681 ****
  	int16 args[30];
  	int i;
! 	Actor *a;
  	IMuse *se = _imuse; //yazoo: not very nice
  
--- 2679,2684 ----
  	int16 args[30];
  	int i;
! 	Actor *a;
! 
  	IMuse *se = _imuse; //yazoo: not very nice
  
***************
*** 2849,2854 ****
  			break;
  
! 		case 122:
! 			_vars[VAR_SOUNDRESULT] = se->do_command(	args[1], args[2], args[3], args[4],
  							args[5], args[6], args[7], args[8]
  							);
--- 2852,2858 ----
  			break;
  
! 		case 122:
! 
! 			_vars[VAR_SOUNDRESULT] = (short)se->do_command(	args[1], args[2], args[3], args[4],
  							args[5], args[6], args[7], args[8]
  							);