[Jake2-commits] jake2/src/jake2/client Menu.java,1.12.6.1,1.12.6.2 entity_t.java,1.1.1.1,1.1.1.1.10.1 SCR.java,1.8,1.8.6.1 VID.java,1.11,1.11.2.1 CL_fx.java,1.7,1.7.6.1

[Rene S. <sa...@us...>]

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

Modified Files:
      Tag: RST
	Menu.java entity_t.java SCR.java VID.java CL_fx.java 
Log Message:
This has vec3-optimize and the OAK bot.

Index: Menu.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v
retrieving revision 1.12.6.1
retrieving revision 1.12.6.2
diff -C2 -d -r1.12.6.1 -r1.12.6.2
*** Menu.java	31 Dec 2004 14:08:34 -0000	1.12.6.1
--- Menu.java	16 Jan 2005 21:20:56 -0000	1.12.6.2
***************
*** 1313,1320 ****
          //s_options_quality_list.curvalue = 1 - ((int)
          // Cvar.VariableValue("s_loadas8bit"));
!         if ("joal".equals(Cvar.VariableString("s_impl"))) {
!             s_options_quality_list.curvalue = 0;
!         } else {
!             s_options_quality_list.curvalue = 1;
          }
  
--- 1313,1321 ----
          //s_options_quality_list.curvalue = 1 - ((int)
          // 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;
!         	}
          }
  
***************
*** 1391,1405 ****
      static void UpdateSoundQualityFunc(Object unused) {
          boolean driverNotChanged = false;
!         if (s_options_quality_list.curvalue != 0) {
!             //			Cvar.SetValue("s_khz", 22);
!             //			Cvar.SetValue("s_loadas8bit", 0);
!             driverNotChanged = S.getDriverName().equals("dummy");
!             Cvar.Set("s_impl", "dummy");
!         } else {
!             //			Cvar.SetValue("s_khz", 11);
!             //			Cvar.SetValue("s_loadas8bit", 1);
!             driverNotChanged = S.getDriverName().equals("joal");
!             Cvar.Set("s_impl", "joal");
!         }
  
          //Cvar.SetValue("s_primary", s_options_compatibility_list.curvalue);
--- 1392,1408 ----
      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) {
! //            //			Cvar.SetValue("s_khz", 22);
! //            //			Cvar.SetValue("s_loadas8bit", 0);
! //            driverNotChanged = S.getDriverName().equals("dummy");
! //            Cvar.Set("s_impl", "dummy");
! //        } else {
! //            //			Cvar.SetValue("s_khz", 11);
! //            //			Cvar.SetValue("s_loadas8bit", 1);
! //            driverNotChanged = S.getDriverName().equals("joal");
! //            Cvar.Set("s_impl", "joal");
! //        }
  
          //Cvar.SetValue("s_primary", s_options_compatibility_list.curvalue);
***************
*** 1409,1413 ****
              return;
          } else {
! 
              DrawTextBox(8, 120 - 48, 36, 3);
              Print(16 + 16, 120 - 48 + 8, "Restarting the sound system. This");
--- 1412,1417 ----
              return;
          } else {
!         	Cvar.Set("s_impl", current);
!         	
              DrawTextBox(8, 120 - 48, 36, 3);
              Print(16 + 16, 120 - 48 + 8, "Restarting the sound system. This");
***************
*** 1422,1438 ****
      }
  
!     static String cd_music_items[] = { "disabled", "enabled", null };
! 
!     static String soundstate_items[] = { "on", "off", null };
  
      static String compatibility_items[] = { "max compatibility",
!             "max performance", null };
  
!     static String yesno_names[] = { "no", "yes", null };
  
!     static String crosshair_names[] = { "none", "cross", "dot", "angle", null };
  
      static void Options_MenuInit() {
  
          win_noalttab = Cvar.Get("win_noalttab", "0", CVAR_ARCHIVE);
  
--- 1426,1453 ----
      }
  
!     static String cd_music_items[] = { "disabled", "enabled" };
  
      static String compatibility_items[] = { "max compatibility",
!             "max performance" };
  
!     static String yesno_names[] = { "no", "yes" };
  
!     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);
  
***************
*** 1480,1499 ****
              }
          };
!         s_options_quality_list.itemnames = 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;
***************
*** 2013,2017 ****
  
      static String difficulty_names[] = { "easy", "medium",
!             "fuckin shitty hard", null };
  
      static void Game_MenuInit() {
--- 2013,2017 ----
  
      static String difficulty_names[] = { "easy", "medium",
!             "fuckin shitty hard" };
  
      static void Game_MenuInit() {
***************
*** 2688,2696 ****
      }
  
!     static String dm_coop_names[] = { "deathmatch", "cooperative", null };
  
!     static String dm_coop_names_rogue[] = { "deathmatch", "cooperative", "tag",
!     //			"deathball",
!             null };
  
      static void StartServer_MenuInit() {
--- 2688,2694 ----
      }
  
!     static String dm_coop_names[] = { "deathmatch", "cooperative" };
  
!     static String dm_coop_names_rogue[] = { "deathmatch", "cooperative", "tag" };
  
      static void StartServer_MenuInit() {
***************
*** 2735,2739 ****
              Com.Error(ERR_DROP, "no maps in maps.lst\n");
  
!         mapnames = new String[nummaps + 1];
  
          for (i = 0; i < nummaps; i++) {
--- 2733,2737 ----
              Com.Error(ERR_DROP, "no maps in maps.lst\n");
  
!         mapnames = new String[nummaps];
  
          for (i = 0; i < nummaps; i++) {
***************
*** 2747,2751 ****
              mapnames[i] = scratch;
          }
-         mapnames[nummaps] = null;
  
          if (fp != null) {
--- 2745,2748 ----
***************
*** 3086,3090 ****
  
      //static String yes_no_names[] = { "no", "yes", 0 };
!     static String teamplay_names[] = { "disabled", "by skin", "by model", null };
  
      static void DMOptions_MenuInit() {
--- 3083,3087 ----
  
      //static String yes_no_names[] = { "no", "yes", 0 };
!     static String teamplay_names[] = { "disabled", "by skin", "by model" };
  
      static void DMOptions_MenuInit() {
***************
*** 3441,3445 ****
      }
  
!     static String yes_no_names[] = { "no", "yes", null };
  
      static void DownloadOptions_MenuInit() {
--- 3438,3442 ----
      }
  
!     static String yes_no_names[] = { "no", "yes" };
  
      static void DownloadOptions_MenuInit() {
***************
*** 3711,3715 ****
  
      static String rate_names[] = { "28.8 Modem", "33.6 Modem", "Single ISDN",
!             "Dual ISDN/Cable", "T1/LAN", "User defined", null };
  
      static void DownloadOptionsFunc(Object self) {
--- 3708,3712 ----
  
      static String rate_names[] = { "28.8 Modem", "33.6 Modem", "Single ISDN",
!             "Dual ISDN/Cable", "T1/LAN", "User defined" };
  
      static void DownloadOptionsFunc(Object self) {
***************
*** 3917,3921 ****
      }
  
!     static String handedness[] = { "right", "left", "center", null };
  
      static boolean PlayerConfig_MenuInit() {
--- 3914,3918 ----
      }
  
!     static String handedness[] = { "right", "left", "center" };
  
      static boolean PlayerConfig_MenuInit() {
***************
*** 4891,4895 ****
          if (s.curvalue < 0)
              s.curvalue = 0;
!         else if (s.itemnames[s.curvalue] == null)
              s.curvalue--;
  
--- 4888,4892 ----
          if (s.curvalue < 0)
              s.curvalue = 0;
!         else if (s.curvalue >= s.itemnames.length || s.itemnames[s.curvalue] == null)
              s.curvalue--;
  

Index: VID.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/VID.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** VID.java	14 Dec 2004 12:54:25 -0000	1.11
--- VID.java	16 Jan 2005 21:20:58 -0000	1.11.2.1
***************
*** 256,262 ****
  			Globals.cls.disable_screen = 1.0f; // true;
  
  			if ( !LoadRefresh( vid_ref.string ) )
  			{
! 				if ( vid_ref.string.equals("jogl") ) {
  					Com.Printf("Refresh failed\n");
  					gl_mode = Cvar.Get( "gl_mode", "0", 0 );
--- 256,264 ----
  			Globals.cls.disable_screen = 1.0f; // true;
  
+ 			String defaultName = Renderer.getDefaultName();
+ 			
  			if ( !LoadRefresh( vid_ref.string ) )
  			{
! 				if ( vid_ref.string.equals(defaultName) ) {
  					Com.Printf("Refresh failed\n");
  					gl_mode = Cvar.Get( "gl_mode", "0", 0 );
***************
*** 265,274 ****
  						Cvar.SetValue("gl_mode", 0);
  						if ( !LoadRefresh( vid_ref.string ) )
! 							Com.Error(Defines.ERR_FATAL, "Couldn't fall back to jogl refresh!");
  					} else
! 						Com.Error(Defines.ERR_FATAL, "Couldn't fall back to jogl refresh!");
  				}
  
! 				Cvar.Set( "vid_ref", "jogl" );
  
  				/*
--- 267,276 ----
  						Cvar.SetValue("gl_mode", 0);
  						if ( !LoadRefresh( vid_ref.string ) )
! 							Com.Error(Defines.ERR_FATAL, "Couldn't fall back to " + defaultName +" refresh!");
  					} else
! 						Com.Error(Defines.ERR_FATAL, "Couldn't fall back to " + defaultName +" refresh!");
  				}
  
! 				Cvar.Set("vid_ref", defaultName);
  
  				/*
***************
*** 295,299 ****
  	{
  		/* Create the video variables so we know how to start the graphics drivers */
! 		vid_ref = Cvar.Get("vid_ref", "fastjogl", CVAR_ARCHIVE);
  		vid_xpos = Cvar.Get("vid_xpos", "3", CVAR_ARCHIVE);
  		vid_ypos = Cvar.Get("vid_ypos", "22", CVAR_ARCHIVE);
--- 297,301 ----
  	{
  		/* Create the video variables so we know how to start the graphics drivers */
! 		vid_ref = Cvar.Get("vid_ref", Renderer.getPreferedName(), CVAR_ARCHIVE);
  		vid_xpos = Cvar.Get("vid_xpos", "3", CVAR_ARCHIVE);
  		vid_ypos = Cvar.Get("vid_ypos", "22", CVAR_ARCHIVE);
***************
*** 364,430 ****
  	====================================================================
  	*/
- 	static final int SOFTWARE_MENU  = 0;
- 	static final int OPENGL_MENU  = 1;
  
- 	static Menu.menuframework_s  s_software_menu = new Menu.menuframework_s();
  	static Menu.menuframework_s	s_opengl_menu = new Menu.menuframework_s();
  	static Menu.menuframework_s s_current_menu; // referenz
- 	static int s_current_menu_index = 1; // default is the openGL menu
  
! 	static Menu.menulist_s[] s_mode_list = new Menu.menulist_s[2];
! 	static {
! 		s_mode_list[0] = new Menu.menulist_s();
! 		s_mode_list[1] = new Menu.menulist_s();
! 	}
! 	static Menu.menulist_s[] s_ref_list = new Menu.menulist_s[2];
! 	static {
! 		s_ref_list[0] = new Menu.menulist_s();
! 		s_ref_list[1] = new Menu.menulist_s();
! 	}
  	static Menu.menuslider_s s_tq_slider = new Menu.menuslider_s();
! 	static Menu.menuslider_s[] s_screensize_slider = new Menu.menuslider_s[2];
! 	static {
! 		s_screensize_slider[0] = new Menu.menuslider_s();
! 		s_screensize_slider[1] = new Menu.menuslider_s();
! 	}
! 	static Menu.menuslider_s[] s_brightness_slider = new Menu.menuslider_s[2];
! 	static {
! 		s_brightness_slider[0] = new Menu.menuslider_s();
! 		s_brightness_slider[1] = new Menu.menuslider_s();
! 	}
! 	static Menu.menulist_s[] s_fs_box = new Menu.menulist_s[2];
! 	static {
! 		s_fs_box[0] = new Menu.menulist_s();
! 		s_fs_box[1] = new Menu.menulist_s();
! 	}
  	static Menu.menulist_s s_stipple_box = new Menu.menulist_s();
  	static Menu.menulist_s s_paletted_texture_box = new Menu.menulist_s();
  	static Menu.menulist_s s_windowed_mouse = new Menu.menulist_s();
! 	static Menu.menuaction_s[] s_apply_action = new Menu.menuaction_s[2];
! 	static {
! 		s_apply_action[0] = new Menu.menuaction_s();
! 		s_apply_action[1] = new Menu.menuaction_s();
! 	}
! 	static Menu.menuaction_s[] s_defaults_action= new Menu.menuaction_s[2];
! 	static {
! 		s_defaults_action[0] = new Menu.menuaction_s();
! 		s_defaults_action[1] = new Menu.menuaction_s();
! 	}
  
  	static void DriverCallback( Object unused )
  	{
! 		s_ref_list[1 - s_current_menu_index].curvalue = s_ref_list[s_current_menu_index].curvalue;
! 
! 		if ( s_ref_list[s_current_menu_index].curvalue < 2 )
! 		{
! 			// we only use opengl today
! 			s_current_menu = s_opengl_menu; // s_software_menu;
! 			s_current_menu_index = 1; // 0;
! 		}
! 		else
! 		{
! 			s_current_menu = s_opengl_menu;
! 			s_current_menu_index = 1;
! 		}
  	}
  
--- 366,394 ----
  	====================================================================
  	*/
  
  	static Menu.menuframework_s	s_opengl_menu = new Menu.menuframework_s();
  	static Menu.menuframework_s s_current_menu; // referenz
  
! 	static Menu.menulist_s s_mode_list = new Menu.menulist_s();
! 
! 	static Menu.menulist_s s_ref_list = new Menu.menulist_s();
! 
  	static Menu.menuslider_s s_tq_slider = new Menu.menuslider_s();
! 	static Menu.menuslider_s s_screensize_slider = new Menu.menuslider_s();
! 
! 	static Menu.menuslider_s s_brightness_slider = new Menu.menuslider_s();
! 
! 	static Menu.menulist_s s_fs_box = new Menu.menulist_s();
! 
  	static Menu.menulist_s s_stipple_box = new Menu.menulist_s();
  	static Menu.menulist_s s_paletted_texture_box = new Menu.menulist_s();
  	static Menu.menulist_s s_windowed_mouse = new Menu.menulist_s();
! 	static Menu.menuaction_s s_apply_action = new Menu.menuaction_s();
! 
! 	static Menu.menuaction_s s_defaults_action= new Menu.menuaction_s();
  
  	static void DriverCallback( Object unused )
  	{
! 		s_current_menu = s_opengl_menu; // s_software_menu;
  	}
  
***************
*** 440,448 ****
  		Menu.menuslider_s slider = (Menu.menuslider_s) s;
  
- 		if ( s_current_menu_index == 0)
- 			s_brightness_slider[1].curvalue = s_brightness_slider[0].curvalue;
- 		else
- 			s_brightness_slider[0].curvalue = s_brightness_slider[1].curvalue;
- 
  		// if ( stricmp( vid_ref.string, "soft" ) == 0 ||
  		//	stricmp( vid_ref.string, "softx" ) == 0 )
--- 404,407 ----
***************
*** 463,543 ****
  	static void ApplyChanges( Object unused )
  	{
- 		/*
- 		** make values consistent
- 		*/
- 		s_fs_box[1 - s_current_menu_index].curvalue = s_fs_box[s_current_menu_index].curvalue;
- 		s_brightness_slider[1 - s_current_menu_index].curvalue = s_brightness_slider[s_current_menu_index].curvalue;
- 		s_ref_list[1 - s_current_menu_index].curvalue = s_ref_list[s_current_menu_index].curvalue;
  
  		/*
  		** invert sense so greater = brighter, and scale to a range of 0.5 to 1.3
  		*/
! 		float gamma = ( 0.8f - ( s_brightness_slider[s_current_menu_index].curvalue/10.0f - 0.5f ) ) + 0.5f;
  
  		Cvar.SetValue( "vid_gamma", gamma );
  		Cvar.SetValue( "sw_stipplealpha", s_stipple_box.curvalue );
  		Cvar.SetValue( "gl_picmip", 3 - s_tq_slider.curvalue );
! 		Cvar.SetValue( "vid_fullscreen", s_fs_box[s_current_menu_index].curvalue );
  		Cvar.SetValue( "gl_ext_palettedtexture", s_paletted_texture_box.curvalue );
! 		Cvar.SetValue( "sw_mode", s_mode_list[SOFTWARE_MENU].curvalue );
! 		Cvar.SetValue( "gl_mode", s_mode_list[OPENGL_MENU].curvalue );
  		Cvar.SetValue( "_windowed_mouse", s_windowed_mouse.curvalue);
  
! 		switch ( s_ref_list[s_current_menu_index].curvalue )
! 		{
! //		case REF_SOFT:
! //			Cvar_Set( "vid_ref", "soft" );
! //			break;
! //		case REF_SOFTX11:
! //			Cvar_Set( "vid_ref", "softx" );
! //			break;
! //
! //		case REF_MESA3D :
! //			Cvar_Set( "vid_ref", "gl" );
! //			Cvar_Set( "gl_driver", "libMesaGL.so.2" );
! //			if (gl_driver->modified)
! //				vid_ref->modified = true;
! //			break;
! //
! //		case REF_OPENGLX :
! //			Cvar_Set( "vid_ref", "glx" );
! //			Cvar_Set( "gl_driver", "libGL.so" );
! //			if (gl_driver->modified)
! //				vid_ref->modified = true;
! //			break;
! //
! //		case REF_MESA3DGLX :
! //			Cvar_Set( "vid_ref", "glx" );
! //			Cvar_Set( "gl_driver", "libMesaGL.so.2" );
! //			if (gl_driver->modified)
! //				vid_ref->modified = true;
! //			break;
! //
! //		case REF_3DFXGL :
! //			Cvar_Set( "vid_ref", "gl" );
! //			Cvar_Set( "gl_driver", "lib3dfxgl.so" );
! //			if (gl_driver->modified)
! //				vid_ref->modified = true;
! //			break;
! 		case REF_OPENGL_JOGL :
! 			Cvar.Set( "vid_ref", "jogl" );
! 			Cvar.Set( "gl_driver", "jogl" );
! 			if (gl_driver.modified)
! 				vid_ref.modified = true;
! 			break;
! 		case REF_OPENGL_FASTJOGL :
! 				Cvar.Set( "vid_ref", "fastjogl" );
! 				Cvar.Set( "gl_driver", "fastjogl" );
! 				if (gl_driver.modified)
! 					vid_ref.modified = true;
! 				break;
! 		case REF_OPENGL_LWJGL :
! 				Cvar.Set( "vid_ref", "lwjgl" );
! 				Cvar.Set( "gl_driver", "lwjgl" );
! 				if (gl_driver.modified)
! 					vid_ref.modified = true;
! 				break;
! 		}
! 
  		Menu.ForceMenuOff();
  	}
--- 422,444 ----
  	static void ApplyChanges( Object unused )
  	{
  
  		/*
  		** invert sense so greater = brighter, and scale to a range of 0.5 to 1.3
  		*/
! 		float gamma = ( 0.8f - ( s_brightness_slider.curvalue/10.0f - 0.5f ) ) + 0.5f;
  
  		Cvar.SetValue( "vid_gamma", gamma );
  		Cvar.SetValue( "sw_stipplealpha", s_stipple_box.curvalue );
  		Cvar.SetValue( "gl_picmip", 3 - s_tq_slider.curvalue );
! 		Cvar.SetValue( "vid_fullscreen", s_fs_box.curvalue );
  		Cvar.SetValue( "gl_ext_palettedtexture", s_paletted_texture_box.curvalue );
! 		Cvar.SetValue( "gl_mode", s_mode_list.curvalue );
  		Cvar.SetValue( "_windowed_mouse", s_windowed_mouse.curvalue);
  
! 		Cvar.Set( "vid_ref", drivers[s_ref_list.curvalue] );
! 		Cvar.Set( "gl_driver", drivers[s_ref_list.curvalue] );
! 		if (gl_driver.modified)
! 			vid_ref.modified = true;
! 		
  		Menu.ForceMenuOff();
  	}
***************
*** 557,588 ****
  		"[2048 1536]",
  		"user mode",
- 		null
  	};
  	static String[] fs_resolutions;
  	static int mode_x;
  	
! 	static final String[] refs =
! 	{
! 		// "[software       ]",
! 		// "[software X11   ]",
! 		// "[Mesa 3-D 3DFX  ]",
! 		// "[3DFXGL Miniport]",
! 		// "[OpenGL glX     ]",
! 		// "[Mesa 3-D glX   ]",
! 		"[OpenGL jogl    ]",
! 		"[OpenGL fastjogl]",
! 		"[OpenGL lwjgl   ]",
! 		null
! 	};
  	static final String[] yesno_names =
  	{
  		"no",
  		"yes",
- 		null
  	};
  
  	static void initModeList() {
  		DisplayMode[] modes = re.getModeList();
! 		fs_resolutions = new String[modes.length + 1];
  		fs_modes = new vidmode_t[modes.length];
  		for (int i = 0; i < modes.length; i++) {
--- 458,477 ----
  		"[2048 1536]",
  		"user mode",
  	};
  	static String[] fs_resolutions;
  	static int mode_x;
  	
! 	static String[] refs;
! 	static String[] drivers;
! 	
  	static final String[] yesno_names =
  	{
  		"no",
  		"yes",
  	};
  
  	static void initModeList() {
  		DisplayMode[] modes = re.getModeList();
! 		fs_resolutions = new String[modes.length];
  		fs_modes = new vidmode_t[modes.length];
  		for (int i = 0; i < modes.length; i++) {
***************
*** 607,610 ****
--- 496,512 ----
  	}
  	
+ 	private static void initRefs() {
+ 		drivers = Renderer.getDriverNames();
+ 		refs = new String[drivers.length];
+ 		StringBuffer sb = new StringBuffer();
+ 		for (int i = 0; i < drivers.length; i++) {
+ 			sb.setLength(0);
+ 			sb.append("[OpenGL ").append(drivers[i]);
+ 			while (sb.length() < 16) sb.append(" ");
+ 			sb.append("]");
+ 			refs[i] = sb.toString();
+ 		}
+ 	}
+ 
  	/*
  	** VID_MenuInit
***************
*** 612,617 ****
  	public static void MenuInit() {
  		
  		if ( gl_driver == null )
! 			gl_driver = Cvar.Get( "gl_driver", "jogl", 0 );
  		if ( gl_picmip == null )
  			gl_picmip = Cvar.Get( "gl_picmip", "0", 0 );
--- 514,521 ----
  	public static void MenuInit() {
  		
+ 		initRefs();
+ 		
  		if ( gl_driver == null )
! 			gl_driver = Cvar.Get( "gl_driver", Renderer.getPreferedName(), 0 );
  		if ( gl_picmip == null )
  			gl_picmip = Cvar.Get( "gl_picmip", "0", 0 );
***************
*** 629,646 ****
  			_windowed_mouse = Cvar.Get( "_windowed_mouse", "0", CVAR_ARCHIVE );
  
! 		s_mode_list[SOFTWARE_MENU].curvalue = (int)sw_mode.value;
! 		s_mode_list[OPENGL_MENU].curvalue = (int)gl_mode.value;
  		if (vid_fullscreen.value != 0.0f) {
! 			s_mode_list[OPENGL_MENU].itemnames = fs_resolutions;
! 			if (s_mode_list[OPENGL_MENU].curvalue >= fs_resolutions.length - 1) {
! 				s_mode_list[OPENGL_MENU].curvalue = 0;
  			}
! 			mode_x = fs_modes[s_mode_list[OPENGL_MENU].curvalue].width;
  		} else {
! 			s_mode_list[OPENGL_MENU].itemnames = resolutions;
! 			if (s_mode_list[OPENGL_MENU].curvalue >= resolutions.length - 1) {
! 				s_mode_list[OPENGL_MENU].curvalue = 0;
  			}
! 			mode_x = vid_modes[s_mode_list[OPENGL_MENU].curvalue].width;
  		}
  
--- 533,549 ----
  			_windowed_mouse = Cvar.Get( "_windowed_mouse", "0", CVAR_ARCHIVE );
  
! 		s_mode_list.curvalue = (int)gl_mode.value;
  		if (vid_fullscreen.value != 0.0f) {
! 			s_mode_list.itemnames = fs_resolutions;
! 			if (s_mode_list.curvalue >= fs_resolutions.length - 1) {
! 				s_mode_list.curvalue = 0;
  			}
! 			mode_x = fs_modes[s_mode_list.curvalue].width;
  		} else {
! 			s_mode_list.itemnames = resolutions;
! 			if (s_mode_list.curvalue >= resolutions.length - 1) {
! 				s_mode_list.curvalue = 0;
  			}
! 			mode_x = vid_modes[s_mode_list.curvalue].width;
  		}
  
***************
*** 648,786 ****
  			SCR.scr_viewsize = Cvar.Get ("viewsize", "100", CVAR_ARCHIVE);
  
! 		s_screensize_slider[SOFTWARE_MENU].curvalue = (int)(SCR.scr_viewsize.value/10);
! 		s_screensize_slider[OPENGL_MENU].curvalue = (int)(SCR.scr_viewsize.value/10);
  
! //		if ( strcmp( vid_ref->string, "soft" ) == 0)
! //		{
! //			s_current_menu_index = SOFTWARE_MENU;
! //			s_ref_list[0].curvalue = s_ref_list[1].curvalue = REF_SOFT;
! //		}
! 		if ( vid_ref.string.equalsIgnoreCase("jogl"))
! 		{
! 			s_current_menu_index = OPENGL_MENU;
! 			s_ref_list[0].curvalue = s_ref_list[1].curvalue = REF_OPENGL_JOGL;
! 		}
! 		else if ( vid_ref.string.equalsIgnoreCase("fastjogl"))
! 		{
! 			s_current_menu_index = OPENGL_MENU;
! 			s_ref_list[0].curvalue = s_ref_list[1].curvalue = REF_OPENGL_FASTJOGL;
! 		}
! 		else if ( vid_ref.string.equalsIgnoreCase("lwjgl"))
! 		{
! 			s_current_menu_index = OPENGL_MENU;
! 			s_ref_list[0].curvalue = s_ref_list[1].curvalue = REF_OPENGL_LWJGL;
  		}
! //		else if (strcmp( vid_ref->string, "softx" ) == 0 ) 
! //		{
! //			s_current_menu_index = SOFTWARE_MENU;
! //			s_ref_list[0].curvalue = s_ref_list[1].curvalue = REF_SOFTX11;
! //		}
! //		else if ( strcmp( vid_ref->string, "gl" ) == 0 )
! //		{
! //			s_current_menu_index = OPENGL_MENU;
! //			if ( strcmp( gl_driver->string, "lib3dfxgl.so" ) == 0 )
! //				s_ref_list[s_current_menu_index].curvalue = REF_3DFXGL;
! //			else
! //				s_ref_list[s_current_menu_index].curvalue = REF_MESA3D;
! //		}
! //		else if ( strcmp( vid_ref->string, "glx" ) == 0 )
! //		{
! //			s_current_menu_index = OPENGL_MENU;
! //			if ( strcmp( gl_driver->string, "libMesaGL.so.2" ) == 0 )
! //				s_ref_list[s_current_menu_index].curvalue = REF_MESA3DGLX;
! //			else
! //				s_ref_list[s_current_menu_index].curvalue = REF_OPENGLX;
! //		}
! //
! 		s_software_menu.x = (int)(viddef.width * 0.50f);
! 		s_software_menu.nitems = 0;
  		s_opengl_menu.x = (int)(viddef.width * 0.50f);
  		s_opengl_menu.nitems = 0;
  
! 		for (int i = 0; i < 2; i++ )
! 		{
! 			s_ref_list[i].type = MTYPE_SPINCONTROL;
! 			s_ref_list[i].name = "driver";
! 			s_ref_list[i].x = 0;
! 			s_ref_list[i].y = 0;
! 			s_ref_list[i].callback = new Menu.mcallback() {
! 				public void execute(Object self) {
! 					DriverCallback(self);
! 				}
! 			};
! 			s_ref_list[i].itemnames = refs;
! 
! 			s_mode_list[i].type = MTYPE_SPINCONTROL;
! 			s_mode_list[i].name = "video mode";
! 			s_mode_list[i].x = 0;
! 			s_mode_list[i].y = 10;
  
! 			s_screensize_slider[i].type	= MTYPE_SLIDER;
! 			s_screensize_slider[i].x		= 0;
! 			s_screensize_slider[i].y		= 20;
! 			s_screensize_slider[i].name	= "screen size";
! 			s_screensize_slider[i].minvalue = 3;
! 			s_screensize_slider[i].maxvalue = 12;
! 			s_screensize_slider[i].callback = new Menu.mcallback() {
! 				public void execute(Object self) {
! 					ScreenSizeCallback(self);
! 				}
! 			};
! 			s_brightness_slider[i].type	= MTYPE_SLIDER;
! 			s_brightness_slider[i].x	= 0;
! 			s_brightness_slider[i].y	= 30;
! 			s_brightness_slider[i].name	= "brightness";
! 			s_brightness_slider[i].callback =  new Menu.mcallback() {
! 				public void execute(Object self) {
! 					BrightnessCallback(self);
! 				}
! 			};
! 			s_brightness_slider[i].minvalue = 5;
! 			s_brightness_slider[i].maxvalue = 13;
! 			s_brightness_slider[i].curvalue = ( 1.3f - vid_gamma.value + 0.5f ) * 10;
  
! 			s_fs_box[i].type = MTYPE_SPINCONTROL;
! 			s_fs_box[i].x	= 0;
! 			s_fs_box[i].y	= 40;
! 			s_fs_box[i].name	= "fullscreen";
! 			s_fs_box[i].itemnames = yesno_names;
! 			s_fs_box[i].curvalue = (int)vid_fullscreen.value;
! 			s_fs_box[i].callback = new Menu.mcallback() {
! 				public void execute(Object o) {
! 					int fs = ((Menu.menulist_s)o).curvalue;
! 					if (fs == 0) {
! 						s_mode_list[1].itemnames = resolutions;
! 						int i = vid_modes.length - 2;
! 						while (i > 0 && vid_modes[i].width > mode_x) i--;
! 						s_mode_list[1].curvalue = i;
! 					} else {
! 						s_mode_list[1].itemnames = fs_resolutions;
! 						int i = fs_modes.length - 1;
! 						while (i > 0 && fs_modes[i].width > mode_x) i--;						
! 						s_mode_list[1].curvalue = i;						
! 					}
  				}
! 			};
  
! 			s_defaults_action[i].type = MTYPE_ACTION;
! 			s_defaults_action[i].name = "reset to default";
! 			s_defaults_action[i].x    = 0;
! 			s_defaults_action[i].y    = 90;
! 			s_defaults_action[i].callback = new Menu.mcallback() {
! 				public void execute(Object self) {
! 					ResetDefaults(self);
! 				}
! 			};
  
! 			s_apply_action[i].type = MTYPE_ACTION;
! 			s_apply_action[i].name = "apply";
! 			s_apply_action[i].x    = 0;
! 			s_apply_action[i].y    = 100;
! 			s_apply_action[i].callback = new Menu.mcallback() {
! 				public void execute(Object self) {
! 					ApplyChanges(self);
! 				}
! 			};
! 		}
  
  		s_stipple_box.type = MTYPE_SPINCONTROL;
--- 551,648 ----
  			SCR.scr_viewsize = Cvar.Get ("viewsize", "100", CVAR_ARCHIVE);
  
! 		s_screensize_slider.curvalue = (int)(SCR.scr_viewsize.value/10);
  
! 		for (int i = 0; i < drivers.length; i++) {
! 			if (vid_ref.string.equals(drivers[i])) {
! 				s_ref_list.curvalue = i;
! 			}
  		}
! 
  		s_opengl_menu.x = (int)(viddef.width * 0.50f);
  		s_opengl_menu.nitems = 0;
+ 		
+ 		s_ref_list.type = MTYPE_SPINCONTROL;
+ 		s_ref_list.name = "driver";
+ 		s_ref_list.x = 0;
+ 		s_ref_list.y = 0;
+ 		s_ref_list.callback = new Menu.mcallback() {
+ 			public void execute(Object self) {
+ 				DriverCallback(self);
+ 			}
+ 		};
+ 		s_ref_list.itemnames = refs;
  
! 		s_mode_list.type = MTYPE_SPINCONTROL;
! 		s_mode_list.name = "video mode";
! 		s_mode_list.x = 0;
! 		s_mode_list.y = 10;
  
! 		s_screensize_slider.type	= MTYPE_SLIDER;
! 		s_screensize_slider.x		= 0;
! 		s_screensize_slider.y		= 20;
! 		s_screensize_slider.name	= "screen size";
! 		s_screensize_slider.minvalue = 3;
! 		s_screensize_slider.maxvalue = 12;
! 		s_screensize_slider.callback = new Menu.mcallback() {
! 			public void execute(Object self) {
! 				ScreenSizeCallback(self);
! 			}
! 		};
! 		s_brightness_slider.type	= MTYPE_SLIDER;
! 		s_brightness_slider.x	= 0;
! 		s_brightness_slider.y	= 30;
! 		s_brightness_slider.name	= "brightness";
! 		s_brightness_slider.callback =  new Menu.mcallback() {
! 			public void execute(Object self) {
! 				BrightnessCallback(self);
! 			}
! 		};
! 		s_brightness_slider.minvalue = 5;
! 		s_brightness_slider.maxvalue = 13;
! 		s_brightness_slider.curvalue = ( 1.3f - vid_gamma.value + 0.5f ) * 10;
  
! 		s_fs_box.type = MTYPE_SPINCONTROL;
! 		s_fs_box.x	= 0;
! 		s_fs_box.y	= 40;
! 		s_fs_box.name	= "fullscreen";
! 		s_fs_box.itemnames = yesno_names;
! 		s_fs_box.curvalue = (int)vid_fullscreen.value;
! 		s_fs_box.callback = new Menu.mcallback() {
! 			public void execute(Object o) {
! 				int fs = ((Menu.menulist_s)o).curvalue;
! 				if (fs == 0) {
! 					s_mode_list.itemnames = resolutions;
! 					int i = vid_modes.length - 2;
! 					while (i > 0 && vid_modes[i].width > mode_x) i--;
! 					s_mode_list.curvalue = i;
! 				} else {
! 					s_mode_list.itemnames = fs_resolutions;
! 					int i = fs_modes.length - 1;
! 					while (i > 0 && fs_modes[i].width > mode_x) i--;						
! 					s_mode_list.curvalue = i;						
  				}
! 			}
! 		};
  
! 		s_defaults_action.type = MTYPE_ACTION;
! 		s_defaults_action.name = "reset to default";
! 		s_defaults_action.x    = 0;
! 		s_defaults_action.y    = 90;
! 		s_defaults_action.callback = new Menu.mcallback() {
! 			public void execute(Object self) {
! 				ResetDefaults(self);
! 			}
! 		};
  
! 		s_apply_action.type = MTYPE_ACTION;
! 		s_apply_action.name = "apply";
! 		s_apply_action.x    = 0;
! 		s_apply_action.y    = 100;
! 		s_apply_action.callback = new Menu.mcallback() {
! 			public void execute(Object self) {
! 				ApplyChanges(self);
! 			}
! 		};
! 		
  
  		s_stipple_box.type = MTYPE_SPINCONTROL;
***************
*** 813,841 ****
  		s_paletted_texture_box.curvalue = (int)gl_ext_palettedtexture.value;
  
! 		Menu.Menu_AddItem( s_software_menu, s_ref_list[SOFTWARE_MENU] );
! 		Menu.Menu_AddItem( s_software_menu, s_mode_list[SOFTWARE_MENU] );
! 		Menu.Menu_AddItem( s_software_menu, s_screensize_slider[SOFTWARE_MENU] );
! 		Menu.Menu_AddItem( s_software_menu, s_brightness_slider[SOFTWARE_MENU] );
! 		Menu.Menu_AddItem( s_software_menu, s_fs_box[SOFTWARE_MENU] );
! 		Menu.Menu_AddItem( s_software_menu, s_stipple_box );
! 		Menu.Menu_AddItem( s_software_menu, s_windowed_mouse );
! 
! 		Menu.Menu_AddItem( s_opengl_menu, s_ref_list[OPENGL_MENU] );
! 		Menu.Menu_AddItem( s_opengl_menu, s_mode_list[OPENGL_MENU] );
! 		Menu.Menu_AddItem( s_opengl_menu, s_screensize_slider[OPENGL_MENU] );
! 		Menu.Menu_AddItem( s_opengl_menu, s_brightness_slider[OPENGL_MENU] );
! 		Menu.Menu_AddItem( s_opengl_menu, s_fs_box[OPENGL_MENU] );
  		Menu.Menu_AddItem( s_opengl_menu, s_tq_slider );
  		Menu.Menu_AddItem( s_opengl_menu, s_paletted_texture_box );
  
! 		Menu.Menu_AddItem( s_software_menu, s_defaults_action[SOFTWARE_MENU] );
! 		Menu.Menu_AddItem( s_software_menu, s_apply_action[SOFTWARE_MENU] );
! 		Menu.Menu_AddItem( s_opengl_menu, s_defaults_action[OPENGL_MENU] );
! 		Menu.Menu_AddItem( s_opengl_menu, s_apply_action[OPENGL_MENU] );
  
- 		Menu.Menu_Center( s_software_menu );
  		Menu.Menu_Center( s_opengl_menu );
  		s_opengl_menu.x -= 8;
- 		s_software_menu.x -= 8;
  	}
  
--- 675,691 ----
  		s_paletted_texture_box.curvalue = (int)gl_ext_palettedtexture.value;
  
! 		Menu.Menu_AddItem( s_opengl_menu, s_ref_list );
! 		Menu.Menu_AddItem( s_opengl_menu, s_mode_list );
! 		Menu.Menu_AddItem( s_opengl_menu, s_screensize_slider );
! 		Menu.Menu_AddItem( s_opengl_menu, s_brightness_slider );
! 		Menu.Menu_AddItem( s_opengl_menu, s_fs_box );
  		Menu.Menu_AddItem( s_opengl_menu, s_tq_slider );
  		Menu.Menu_AddItem( s_opengl_menu, s_paletted_texture_box );
  
! 		Menu.Menu_AddItem( s_opengl_menu, s_defaults_action );
! 		Menu.Menu_AddItem( s_opengl_menu, s_apply_action );
  
  		Menu.Menu_Center( s_opengl_menu );
  		s_opengl_menu.x -= 8;
  	}
  
***************
*** 847,855 ****
  	static void MenuDraw()
  	{
! 
! 		if ( s_current_menu_index == 0 )
! 			s_current_menu = s_software_menu;
! 		else
! 			s_current_menu = s_opengl_menu;
  
  		/*
--- 697,701 ----
  	static void MenuDraw()
  	{
! 		s_current_menu = s_opengl_menu;
  
  		/*

Index: SCR.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/SCR.java,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -C2 -d -r1.8 -r1.8.6.1
*** SCR.java	22 Sep 2004 19:22:08 -0000	1.8
--- SCR.java	16 Jan 2005 21:20:58 -0000	1.8.6.1
***************
*** 1176,1184 ****
       * text to the screen. ==================
       */
      static void UpdateScreen2() {
          int numframes;
          int i;
-         float[] separation = { 0, 0 };
- 
          // if the screen is disabled (loading plaque is up, or vid mode
          // changing)
--- 1176,1184 ----
       * text to the screen. ==================
       */
+     private static final float[] separation = { 0, 0 };
+     
      static void UpdateScreen2() {
          int numframes;
          int i;
          // if the screen is disabled (loading plaque is up, or vid mode
          // changing)

Index: entity_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/entity_t.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.10.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.10.1
*** entity_t.java	7 Jul 2004 19:58:52 -0000	1.1.1.1
--- entity_t.java	16 Jan 2005 21:20:58 -0000	1.1.1.1.10.1
***************
*** 73,76 ****
--- 73,91 ----
  		this.flags = src.flags;
  	}
+ 
+ 	public void clear() {
+ 		model = null;
+ 		Math3D.VectorClear(angles);
+ 		Math3D.VectorClear(origin);
+ 		frame = 0;
+ 		Math3D.VectorClear(oldorigin);
+ 		oldframe = 0;
+ 		backlerp = 0;
+ 		skinnum = 0;
+ 		lightstyle = 0;
+ 		alpha = 0;
+ 		skin = null;
+ 		flags = 0;
+ 	}
  	
  }

Index: CL_fx.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_fx.java,v
retrieving revision 1.7
retrieving revision 1.7.6.1
diff -C2 -d -r1.7 -r1.7.6.1
*** CL_fx.java	11 Oct 2004 14:04:16 -0000	1.7
--- CL_fx.java	16 Jan 2005 21:20:58 -0000	1.7.6.1
***************
*** 28,33 ****
  import jake2.Defines;
  import jake2.Globals;
- import jake2.game.M_Flash;
  import jake2.game.entity_state_t;
  import jake2.qcommon.Com;
  import jake2.qcommon.MSG;
--- 28,33 ----
  import jake2.Defines;
  import jake2.Globals;
  import jake2.game.entity_state_t;
+ import jake2.game.monsters.M_Flash;
  import jake2.qcommon.Com;
  import jake2.qcommon.MSG;