[Scummvm-cvs-logs] CVS: scummvm scumm.h,1.54,1.55 scummvm.cpp,1.51,1.52

[James Brown]

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

Modified Files:
	scumm.h scummvm.cpp 
Log Message:
Added a new '-t' commandline option to set TEMPO_BASE (note: In decimal, not hex.. should fix).



Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** scumm.h	27 Feb 2002 22:48:55 -0000	1.54
--- scumm.h	2 Mar 2002 12:54:32 -0000	1.55
***************
*** 800,804 ****
  	ScummDebugger *_debugger;
  	void *_gui; /* actually a pointer to a Gui */
! 	
  	int _lastLoadedRoom;
  	int _roomResource;
--- 800,805 ----
  	ScummDebugger *_debugger;
  	void *_gui; /* actually a pointer to a Gui */
! 
!         int _gameTempo;
  	int _lastLoadedRoom;
  	int _roomResource;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** scummvm.cpp	2 Mar 2002 08:48:31 -0000	1.51
--- scummvm.cpp	2 Mar 2002 12:54:33 -0000	1.52
***************
*** 196,200 ****
  
  	_gameDataPath = NULL;
! 	
  	parseCommandLine(argc, argv);
  
--- 196,201 ----
  
  	_gameDataPath = NULL;
!         _gameTempo = 0;
! 
  	parseCommandLine(argc, argv);
  
***************
*** 209,213 ****
  	if (!_gameDataPath) {
  		warning("No path was provided. Assuming that data file are in the current directory");
!         _gameDataPath = (char *)malloc(sizeof(char) * 2);
  		strcpy(_gameDataPath, "");        
  	}
--- 210,214 ----
  	if (!_gameDataPath) {
  		warning("No path was provided. Assuming that data file are in the current directory");
!                 _gameDataPath = (char *)malloc(sizeof(char) * 2);
  		strcpy(_gameDataPath, "");        
  	}
***************
*** 414,417 ****
--- 415,421 ----
  					_gameDataPath = argv[++i];
  					break;
+                 case 't':
+                     _gameTempo = atoi(s+1);
+                     goto NextArg;
  				default:
  ShowHelpAndExit:;
***************
*** 422,425 ****
--- 426,430 ----
  						"Flags:\n"
  						"\tb<num> - start in that room\n"
+                                                 "\tt<num> - Set music tempo. Suggested: 1F0000\n"
  						"\tf - fullscreen mode\n");
  					exit(1);