[Scummvm-cvs-logs] CVS: scummvm gui.cpp,1.38,1.39

Nicolas Bacca arisme at users.sourceforge.net
Wed May 1 15:17:09 CEST 2002


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

Modified Files:
	gui.cpp 
Log Message:
Fixed second key page for WinCE, start of volume support

Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** gui.cpp	27 Apr 2002 04:31:24 -0000	1.38
--- gui.cpp	1 May 2002 22:16:17 -0000	1.39
***************
*** 34,42 ****
  extern bool get_key_mapping;
  extern struct keyops keyMapping;
! extern void registry_save(void);
  uint16 _key_mapping_required;
  uint16 _current_page;
  #else
! #define registry_save() ;
  bool get_key_mapping;
  uint16 _key_mapping_required;
--- 34,42 ----
  extern bool get_key_mapping;
  extern struct keyops keyMapping;
! extern void save_key_mapping(void);
  uint16 _key_mapping_required;
  uint16 _current_page;
  #else
! #define save_key_mapping() ;
  bool get_key_mapping;
  uint16 _key_mapping_required;
***************
*** 169,173 ****
  	case GUI_KEYTEXT:
  	case GUI_ACTIONTEXT:
! 	case GUI_RESTEXT:{
  			char text[500];
  			text[0] = '\0';
--- 169,174 ----
  	case GUI_KEYTEXT:
  	case GUI_ACTIONTEXT:
! 	case GUI_RESTEXT:
! 	case GUI_NEXTTEXT:{
  			char text[500];
  			text[0] = '\0';
***************
*** 493,497 ****
  			imuse->set_music_volume(_s->_sound_volume_music);
  			imuse->set_master_volume(_s->_sound_volume_master);
! 			registry_save();
  		}
  
--- 494,502 ----
  			imuse->set_music_volume(_s->_sound_volume_music);
  			imuse->set_master_volume(_s->_sound_volume_master);
! 			_s->_mixer->set_volume(_s->_sound_volume_sfx);
! 			scummcfg->set("master_volume", _s->_sound_volume_master, "scummvm");
! 			scummcfg->set("music_volume", _s->_sound_volume_music, "scummvm");
! 			scummcfg->set("sfx_volume", _s->_sound_volume_sfx, "scummvm");
! 			scummcfg->flush();
  		}
  
***************
*** 546,550 ****
  {
  #ifdef _WIN32_WCE
! 	if (cmd < 100 && cmd != 60) {
  
  		if ((cmd % 10) == 1)
--- 551,555 ----
  {
  #ifdef _WIN32_WCE
! 	if (cmd < 100 && cmd != 60 && cmd != 61) {
  
  		if ((cmd % 10) == 1)
***************
*** 563,567 ****
  	if (cmd == 60) {
  		get_key_mapping = false;
! 		registry_save();
  		close();
  	}
--- 568,572 ----
  	if (cmd == 60) {
  		get_key_mapping = false;
! 		save_key_mapping();
  		close();
  	}
***************
*** 894,897 ****
--- 899,903 ----
  		toolbar_drawn = false;
  	}
+ 
  #endif
  }





More information about the Scummvm-git-logs mailing list