[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.13,1.14 simon.h,1.8,1.9

[Ludvig Strigeus]

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

Modified Files:
	simon.cpp simon.h 
Log Message:
command line option for sfx volume

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** simon.cpp	15 Apr 2002 14:37:47 -0000	1.13
--- simon.cpp	15 Apr 2002 18:07:55 -0000	1.14
***************
*** 7556,7568 ****
  
  
! void SimonState::go(OSystem *syst, MidiDriver *driver) {
! 	_system = syst;
! 
  	if (!_dump_file)
  		_dump_file = stdout;
  
- 	/* Setup midi driver */
- 	midi.set_driver(driver);
- 
  	/* allocate buffers */
  	sdl_buf_3 = (byte*)calloc(320*200,1);
--- 7556,7563 ----
  
  
! void SimonState::go() {
  	if (!_dump_file)
  		_dump_file = stdout;
  
  	/* allocate buffers */
  	sdl_buf_3 = (byte*)calloc(320*200,1);
***************
*** 7594,7600 ****
  
  	_system->property(OSystem::PROP_SHOW_DEFAULT_CURSOR, 1);
- 	
- 	_mixer->bind_to_system(_system);
- 	_mixer->set_volume(256);
  
  	while(1) {
--- 7589,7592 ----
***************
*** 8785,8790 ****
  }
  
! SimonState *SimonState::create() {
! 	return new SimonState;
  }
  
--- 8777,8797 ----
  }
  
! SimonState *SimonState::create(OSystem *syst, MidiDriver *driver) {
! 	SimonState *s =  new SimonState;
! 
! 	s->_system = syst;
! 
! 	/* Setup midi driver */
! 	s->midi.set_driver(driver);
! 	
! 	/* Setup mixer */
! 	s->_mixer->bind_to_system(syst);
! 
! 	return s;
! 
! }
! 
! void SimonState::set_volume(byte volume) {
! 	_mixer->set_volume(volume * 256 / 100);
  }
  

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** simon.h	14 Apr 2002 18:13:08 -0000	1.8
--- simon.h	15 Apr 2002 18:07:56 -0000	1.9
***************
*** 962,966 ****
  	void resfile_read(void *dst, uint32 offs, uint32 size);
  
! 	void go(OSystem *syst, MidiDriver *driver);
  	void openGameFile();
  
--- 962,966 ----
  	void resfile_read(void *dst, uint32 offs, uint32 size);
  
! 	void go();
  	void openGameFile();
  
***************
*** 1032,1038 ****
  	void vc_kill_thread(uint file, uint sprite);
  
! 	static SimonState *create();
  
  	void set_dummy_cursor();
  };
  
--- 1032,1040 ----
  	void vc_kill_thread(uint file, uint sprite);
  
! 	static SimonState *create(OSystem *syst, MidiDriver *driver);
  
  	void set_dummy_cursor();
+ 
+ 	void set_volume(byte volume);
  };