[Jake2-commits] jake2/src/jake2/qcommon Q2DataDialog.java,1.13,1.14 Cvar.java,1.7,1.8 Qcommon.java,1.16,1.17 FS.java,1.13,1.14

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

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

Modified Files:
	Q2DataDialog.java Cvar.java Qcommon.java FS.java 
Log Message:
merge last changes from 0.9.4 branch

Index: Qcommon.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Qcommon.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Qcommon.java	14 May 2005 10:10:45 -0000	1.16
--- Qcommon.java	26 May 2005 16:56:32 -0000	1.17
***************
*** 247,250 ****
--- 247,254 ----
  		Cbuf.AddText("bind MWHEELUP weapnext\n");
  		Cbuf.AddText("bind MWHEELDOWN weapprev\n");
+ 		Cbuf.AddText("bind w +forward\n");
+ 		Cbuf.AddText("bind s +back\n");
+ 		Cbuf.AddText("bind a +moveleft\n");
+ 		Cbuf.AddText("bind d +moveright\n");
  		Cbuf.Execute();
  		Cvar.Set("vid_fullscreen", "0");

Index: Q2DataDialog.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Q2DataDialog.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Q2DataDialog.java	12 May 2005 12:52:50 -0000	1.13
--- Q2DataDialog.java	26 May 2005 16:56:32 -0000	1.14
***************
*** 36,40 ****
  		int y = (mode.getHeight() - getHeight()) / 2;
  		setLocation(x, y);
! 		dir = home + sep + "jake2" + sep + "baseq2";
  		jTextField1.setText(dir);
      }
--- 36,40 ----
  		int y = (mode.getHeight() - getHeight()) / 2;
  		setLocation(x, y);
! 		dir = home + sep + "Jake2" + sep + "baseq2";
  		jTextField1.setText(dir);
      }
***************
*** 184,188 ****
      
      private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {
!     	
      	if (dir != null) {
      		Cvar.Set("cddir", dir);
--- 184,188 ----
      
      private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {
!     	dir = jTextField1.getText();
      	if (dir != null) {
      		Cvar.Set("cddir", dir);
***************
*** 228,232 ****
      private NotFoundPanel notFoundPanel;
      private JLabel status;
!     private javax.swing.JTextField jTextField1;
      private javax.swing.JButton okButton;
      // End of variables declaration//GEN-END:variables
--- 228,232 ----
      private NotFoundPanel notFoundPanel;
      private JLabel status;
!     javax.swing.JTextField jTextField1;
      private javax.swing.JButton okButton;
      // End of variables declaration//GEN-END:variables
***************
*** 442,446 ****
  		public InstallPanel(Q2DataDialog d) {
  			initComponents();
! 			String dir = Q2DataDialog.home + Q2DataDialog.sep + "jake2";
  			destDir.setText(dir);
  			initMirrors();
--- 442,446 ----
  		public InstallPanel(Q2DataDialog d) {
  			initComponents();
! 			String dir = Q2DataDialog.home + Q2DataDialog.sep + "Jake2";
  			destDir.setText(dir);
  			initMirrors();
***************
*** 761,765 ****
  		void endInstall(String message) {
  			parent.notFoundPanel.message.setText(message);
! 			parent.dir = destDir + "/baseq2";
  			parent.showChooseDialog();
  			parent.okButtonActionPerformed(null);			
--- 761,765 ----
  		void endInstall(String message) {
  			parent.notFoundPanel.message.setText(message);
! 			parent.jTextField1.setText(destDir + "/baseq2");
  			parent.showChooseDialog();
  			parent.okButtonActionPerformed(null);			

Index: FS.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/FS.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FS.java	20 May 2005 15:05:54 -0000	1.13
--- FS.java	26 May 2005 16:56:32 -0000	1.14
***************
*** 660,671 ****
       */
      public static void ExecAutoexec() {
  
-         String dir;
          String name;
- 
-         dir = Cvar.VariableString("gamedir");
- 
          if (dir != null && dir.length() > 0) {
!             name = fs_basedir.string + '/' + dir + "/autoexec.cfg";
          } else {
              name = fs_basedir.string + '/' + Globals.BASEDIRNAME
--- 660,668 ----
       */
      public static void ExecAutoexec() {
+         String dir = fs_userdir;
  
          String name;
          if (dir != null && dir.length() > 0) {
!             name = dir + "/autoexec.cfg";
          } else {
              name = fs_basedir.string + '/' + Globals.BASEDIRNAME

Index: Cvar.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Cvar.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Cvar.java	8 Feb 2005 18:00:02 -0000	1.7
--- Cvar.java	26 May 2005 16:56:32 -0000	1.8
***************
*** 295,302 ****
       * ============ Cvar_SetValue ============
       */
!     public static void SetValue(String var_name, float value) {
          Cvar.Set(var_name, "" + value);
      }
  
      /*
       * ============ Cvar_VariableValue ============
--- 295,313 ----
       * ============ Cvar_SetValue ============
       */
!     // the overloading is very important
!     // there was a problem with networt "rate" string
!     // 10000 became "10000.0" and that wasn't right
!     public static void SetValue(String var_name, int value) {
          Cvar.Set(var_name, "" + value);
      }
  
+     public static void SetValue(String var_name, float value) {
+         if (value == (int)value) {
+             Cvar.Set(var_name, "" + (int)value);
+         } else {
+             Cvar.Set(var_name, "" + value);
+         }
+     }
+ 
      /*
       * ============ Cvar_VariableValue ============