[Scummvm-cvs-logs] CVS: scummvm readme.txt,1.8,1.9 scummvm.cpp,1.57,1.58

[James Brown]

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

Modified Files:
	readme.txt scummvm.cpp 
Log Message:
Fix typo in music volume, and add -m parameter to set it.



Index: readme.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/readme.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** readme.txt	5 Mar 2002 21:20:06 -0000	1.8
--- readme.txt	6 Mar 2002 00:00:38 -0000	1.9
***************
*** 86,90 ****
  	-p <path> - path to where the game is installed
  	-b<num>   - start in that room
! 	-t<num>   - Set music tempo. Suggested: 1F0000
  	-f        - fullscreen mode
  
--- 86,91 ----
  	-p <path> - path to where the game is installed
  	-b<num>   - start in that room
! 	-m<num>	  - set the music volume, 0-100. default is '60'.
! 	-t<num>   - set music tempo.			 default: 2031616
  	-f        - fullscreen mode
  

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** scummvm.cpp	5 Mar 2002 23:41:41 -0000	1.57
--- scummvm.cpp	6 Mar 2002 00:00:38 -0000	1.58
***************
*** 24,27 ****
--- 24,28 ----
  #include "gui.h"
  #include "string.h"
+ #include "sound.h"
  
  void Scumm::initRandSeeds() {
***************
*** 196,200 ****
  
  	_gameDataPath = NULL;
!         _gameTempo = 0;
  
  	parseCommandLine(argc, argv);
--- 197,201 ----
  
  	_gameDataPath = NULL;
!     _gameTempo = 0;
  
  	parseCommandLine(argc, argv);
***************
*** 424,427 ****
--- 425,434 ----
                      _gameTempo = atoi(s+1);
                      goto NextArg;
+                 case 'm': {
+ 					SoundEngine *se = (SoundEngine*)_soundEngine;
+ 					if (se) 
+ 						se->set_music_volume(atoi(s+1));
+                     goto NextArg;
+ 				}
  				default:
  ShowHelpAndExit:;
***************
*** 429,436 ****
  						"ScummVM - Scumm Interpreter\n"
  						"Syntax:\n"
! 						"\tscummvm [-b<num>] [-p path] game\n"
  						"Flags:\n"
  						"\tb<num> - start in that room\n"
-                                                 "\tt<num> - Set music tempo. Suggested: 1F0000\n"
  						"\tf - fullscreen mode\n");
  					exit(1);
--- 436,444 ----
  						"ScummVM - Scumm Interpreter\n"
  						"Syntax:\n"
! 						"\tscummvm [-b<num>] [-p path] [-f] [-m<num>] [-t<num>] game\n"
  						"Flags:\n"
+ 						"\tm<num> - Set music volume (0-100)\n"
+ 						"\tt<num> - Set music tempo (Default: 2031616)\n"
  						"\tb<num> - start in that room\n"
  						"\tf - fullscreen mode\n");
  					exit(1);