[Jake2-commits] jake2/src/jake2/client Menu.java,1.15,1.16

[Holger Z. <hz...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31119/src/jake2/client

Modified Files:
	Menu.java 
Log Message:
sound menu entries

Index: Menu.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Menu.java	12 Jan 2005 08:36:21 -0000	1.15
--- Menu.java	12 Jan 2005 08:47:42 -0000	1.16
***************
*** 1314,1327 ****
          // Cvar.VariableValue("s_loadas8bit"));
          String s = Cvar.VariableString("s_impl");
!         for (int i = 0; i < s_options_quality_list.itemnames.length; i++) {
!         	if (s.equals(s_options_quality_list.itemnames[i])) {
          		s_options_quality_list.curvalue = i;
          	}
          }
- //        if ("joal".equals(Cvar.VariableString("s_impl"))) {
- //            s_options_quality_list.curvalue = 0;
- //        } else {
- //            s_options_quality_list.curvalue = 1;
- //        }
  
          s_options_sensitivity_slider.curvalue = (sensitivity.value) * 2;
--- 1314,1322 ----
          // Cvar.VariableValue("s_loadas8bit"));
          String s = Cvar.VariableString("s_impl");
!         for (int i = 0; i < s_drivers.length; i++) {
!         	if (s.equals(s_drivers[i])) {
          		s_options_quality_list.curvalue = i;
          	}
          }
  
          s_options_sensitivity_slider.curvalue = (sensitivity.value) * 2;
***************
*** 1397,1401 ****
      static void UpdateSoundQualityFunc(Object unused) {
          boolean driverNotChanged = false;
!         String current = s_options_quality_list.itemnames[s_options_quality_list.curvalue];
          driverNotChanged = S.getDriverName().equals(current);
  //        if (s_options_quality_list.curvalue != 0) {
--- 1392,1396 ----
      static void UpdateSoundQualityFunc(Object unused) {
          boolean driverNotChanged = false;
!         String current = s_drivers[s_options_quality_list.curvalue];
          driverNotChanged = S.getDriverName().equals(current);
  //        if (s_options_quality_list.curvalue != 0) {
***************
*** 1440,1445 ****
--- 1435,1453 ----
      static String crosshair_names[] = { "none", "cross", "dot", "angle" };
  
+     static String[] s_labels;
+     static String[] s_drivers;
+     
      static void Options_MenuInit() {
  
+     	s_drivers = S.getDriverNames();
+     	s_labels = new String[s_drivers.length];
+     	for (int i = 0; i < s_drivers.length; i++) {
+     		if ("dummy".equals(s_drivers[i])) {
+     			s_labels[i] = "off";
+     		} else {
+     			s_labels[i] = s_drivers[i];
+     		}
+     	}
+     	
          win_noalttab = Cvar.Get("win_noalttab", "0", CVAR_ARCHIVE);
  
***************
*** 1487,1506 ****
              }
          };
!         s_options_quality_list.itemnames = S.getDriverNames();//soundstate_items;
!         //s_options_quality_list.curvalue = 1 - (int)
!         // Cvar.VariableValue("s_loadas8bit");
! 
!         //		s_options_compatibility_list.type = MTYPE_SPINCONTROL;
!         //		s_options_compatibility_list.x = 0;
!         //		s_options_compatibility_list.y = 30;
!         //		s_options_compatibility_list.name = "sound compatibility";
!         //		s_options_compatibility_list.callback = new mcallback() {
!         //			public void execute(Object o) {
!         //				UpdateSoundQualityFunc(o);
!         //			}
!         //		};
!         //		s_options_compatibility_list.itemnames = compatibility_items;
!         //		s_options_compatibility_list.curvalue = (int)
!         // Cvar.VariableValue("s_primary");
  
          s_options_sensitivity_slider.type = MTYPE_SLIDER;
--- 1495,1499 ----
              }
          };
!         s_options_quality_list.itemnames = s_labels;
  
          s_options_sensitivity_slider.type = MTYPE_SLIDER;