Difference for main/kconfig.c from version 1.1 to 1.2


version 1.1 version 1.2
Line 19
 
Line 19
  * Routines to configure keyboard, joystick, etc..   * Routines to configure keyboard, joystick, etc..
  *    *
  * $Log$   * $Log$
  * Revision 1.1  1999/06/14 22:08:14  donut   * Revision 1.2  1999/09/06 07:01:37  sekmu
  * Initial revision   * better dos jostick config menu
    *
    * Revision 1.1.1.1  1999/06/14 22:08:14  donut
    * Import of d1x 1.37 source.
  *   *
  * Revision 2.11  1995/08/23  16:08:04  john   * Revision 2.11  1995/08/23  16:08:04  john
  * Added version 2 of external controls that passes the ship   * Added version 2 of external controls that passes the ship
Line 1371
 
Line 1374
 //added/changed 3/7/99 Owen Evans -> #endif  //added/changed 3/7/99 Owen Evans -> #endif
  int axis[JOY_NUM_AXES];   int axis[JOY_NUM_AXES];
  int old_axis[JOY_NUM_AXES];   int old_axis[JOY_NUM_AXES];
         int temp_min[JOY_NUM_AXES];  //        int temp_min[JOY_NUM_AXES];
         int temp_center[JOY_NUM_AXES];  //        int temp_center[JOY_NUM_AXES];
         int temp_max[JOY_NUM_AXES];  //        int temp_max[JOY_NUM_AXES];
 #endif  #endif
  int n,i,k;   int n,i,k;
  ubyte code;   ubyte code;
Line 1414
 
Line 1417
                     if (abs (axis[i] - old_axis[i]) > ((j_axis[i].max_val - j_axis[i].min_val) / 32))                      if (abs (axis[i] - old_axis[i]) > ((j_axis[i].max_val - j_axis[i].min_val) / 32))
                      {                       {
 #else  #else
 //added/changed 3/17/99 Owen Evans (next three lines)  //added/changed 3/17/99 Owen Evans
                joy_get_cal_vals(temp_min, temp_center, temp_max);  //added/edited on 9/6/99 by Victor Rachels for better config
   //-unneeded-           joy_get_cal_vals(temp_min, temp_center, temp_max);
                 for (i=0; i<JOY_NUM_AXES; i++ )                  for (i=0; i<JOY_NUM_AXES; i++ )
                  {                   {
                     if (abs(axis[i] - old_axis[i]) > ((temp_max[i] - temp_min[i]) / 32))                     axis[i] = joy_get_scaled_reading(axis[i],i);
                       if(axis[i])    //-was- if (abs(axis[i] - old_axis[i]) > ((temp_max[i] - temp_min[i]) / 32))
   //end this section addition/edit - VR
                      {                       {
 #endif  #endif
                        code = i;                         code = i;

Legend:
line(s) removed in v.1.1 
line(s) changed
 line(s) added in v.1.2