Difference for common/object.c from version 1.5 to 1.6


version 1.5 version 1.6
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_object_c =   * static char *rcsid_object_c =
  *   "$Id: object.c,v 1.5 2000/05/26 09:50:45 jec Exp $";   *   "$Id: object.c,v 1.6 2000/05/27 06:02:58 cvs Exp $";
  */   */
   
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
   
     Copyright (C) 1994 Mark Wedel      Copyright (C) 2000 Mark Wedel
     Copyright (C) 1992 Frank Tore Johansen      Copyright (C) 1992 Frank Tore Johansen
   
     This program is free software; you can redistribute it and/or modify      This program is free software; you can redistribute it and/or modify
Line 23
 
Line 23
     along with this program; if not, write to the Free Software      along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   
     The author can be reached via e-mail to master@rahul.net      The author can be reached via e-mail to mwedel@scruz.net
 */  */
   
 /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.  /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
Line 87
 
Line 87
      * be animated or have a very low speed.  Is this an attempted monster       * be animated or have a very low speed.  Is this an attempted monster
      * check?       * check?
      */       */
     if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > 0.001 ) return 0;      if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED)
    return 0;
   
   
     /* If the objects have been identified, set the BEEN_APPLIED flag.      /* If the objects have been identified, set the BEEN_APPLIED flag.
Line 697
 
Line 698
     if (arch_init) {      if (arch_init) {
  return;   return;
     }      }
     if (FABS(op->speed)>0.001) {      if (FABS(op->speed)>MIN_ACTIVE_SPEED) {
  /* If already on active list, don't do anything */   /* If already on active list, don't do anything */
  if (op->active_next || op->active_prev || op==active_objects)   if (op->active_next || op->active_prev || op==active_objects)
      return;       return;


Legend:
line(s) removed in v.1.5 
line(s) changed
 line(s) added in v.1.6

File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:16