[Crossfire-cvs] CVS commit: crossfire/server

[<cro...@li...>]

Module Name:	crossfire
Committed By:	mwedel
Date:		Wed Mar 19 08:10:00 UTC 2003

Modified Files:
	crossfire/server: main.c time.c

Log Message:
crossedit/Attr.c, server/main.c, server/time.c: Update calls to animate_object()
MSW 2003-03-18



Start of context diffs


Index: crossfire/server/main.c
diff -c crossfire/server/main.c:1.74 crossfire/server/main.c:1.75
*** crossfire/server/main.c:1.74	Sun Feb 16 18:37:38 2003
--- crossfire/server/main.c	Wed Mar 19 00:09:59 2003
***************
*** 1,6 ****
  /*
   * static char *rcsid_main_c =
!  *    "$Id: main.c,v 1.74 2003/02/17 02:37:38 mwedel Exp $";
   */
  
  /*
--- 1,6 ----
  /*
   * static char *rcsid_main_c =
!  *    "$Id: main.c,v 1.75 2003/03/19 08:09:59 mwedel Exp $";
   */
  
  /*
***************
*** 945,951 ****
  	 * is based on ticks, and not the creatures speed?
  	 */
  	if (op->anim_speed && op->last_anim >= op->anim_speed) {
! 	    animate_object (op);
  	    op->last_anim = 1;
  	} else {
  	    op->last_anim++;
--- 945,951 ----
  	 * is based on ticks, and not the creatures speed?
  	 */
  	if (op->anim_speed && op->last_anim >= op->anim_speed) {
! 	    animate_object (op, op->direction);
  	    op->last_anim = 1;
  	} else {
  	    op->last_anim++;

Index: crossfire/server/time.c
diff -c crossfire/server/time.c:1.52 crossfire/server/time.c:1.53
*** crossfire/server/time.c:1.52	Sun Feb  2 23:23:48 2003
--- crossfire/server/time.c	Wed Mar 19 00:09:59 2003
***************
*** 1,6 ****
  /*
   * static char *rcsid_time_c =
!  *    "$Id: time.c,v 1.52 2003/02/03 07:23:48 mwedel Exp $";
   */
  
  /*
--- 1,6 ----
  /*
   * static char *rcsid_time_c =
!  *    "$Id: time.c,v 1.53 2003/03/19 08:09:59 mwedel Exp $";
   */
  
  /*
***************
*** 1223,1229 ****
      if(move_monster(op) || QUERY_FLAG(op, FLAG_FREED)) 
        return 1;
    if(QUERY_FLAG(op, FLAG_ANIMATE) && op->anim_speed==0) {
!     animate_object(op);
      if (QUERY_FLAG(op, FLAG_SEE_ANYWHERE))
        make_sure_seen(op);
    }
--- 1223,1229 ----
      if(move_monster(op) || QUERY_FLAG(op, FLAG_FREED)) 
        return 1;
    if(QUERY_FLAG(op, FLAG_ANIMATE) && op->anim_speed==0) {
!     animate_object(op, op->direction);
      if (QUERY_FLAG(op, FLAG_SEE_ANYWHERE))
        make_sure_seen(op);
    }