[Crossfire-cvs] CVS commit: crossfire

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

Module Name:	crossfire
Committed By:	mwedel
Date:		Mon Mar 28 07:20:10 UTC 2005

Modified Files:
	crossfire: ChangeLog
	crossfire/socket: image.c request.c

Log Message:
socket/image.c: Change esrv_send_face to check for <=0 instead of <0 on face
  number.
socket/request.c: Change if statement that acted improperly to determine when
  to send faces.
MSW 2005-03-27



Start of context diffs


Index: crossfire/ChangeLog
diff -c crossfire/ChangeLog:1.266 crossfire/ChangeLog:1.267
*** crossfire/ChangeLog:1.266	Tue Mar 22 15:22:37 2005
--- crossfire/ChangeLog	Sun Mar 27 23:20:07 2005
***************
*** 17,22 ****
--- 17,28 ----
  ------------------------------------------------------------------------------
  Changes for CVS:
  
+ socket/image.c: Change esrv_send_face to check for <=0 instead of <0 on face
+   number.
+ socket/request.c: Change if statement that acted improperly to determine when 
+   to send faces.
+ MSW 2005-03-27
+ 
  include/sproto.h: get_who_escape_code_value is void, not void*.
  server/c_misc.c: move local function outside the function.
  server/c_wiz.c: remove sleep( 1 ) that would cause whole server to sleep one sec.

Index: crossfire/socket/image.c
diff -c crossfire/socket/image.c:1.6 crossfire/socket/image.c:1.7
*** crossfire/socket/image.c:1.6	Sat Mar 19 01:14:57 2005
--- crossfire/socket/image.c	Sun Mar 27 23:20:10 2005
***************
*** 1,6 ****
  /*
   * static char *rcsid_init_c =
!  *    "$Id: image.c,v 1.6 2005/03/19 09:14:57 mwedel Exp $";
   */
  
  /*
--- 1,6 ----
  /*
   * static char *rcsid_init_c =
!  *    "$Id: image.c,v 1.7 2005/03/28 07:20:10 mwedel Exp $";
   */
  
  /*
***************
*** 327,333 ****
      SockList sl;
      char fallback;
  
!     if (face_num < 0 || face_num >= nrofpixmaps) {
  	LOG(llevError,"esrv_send_face (%d) out of bounds??\n",face_num);
  	return;
      }
--- 327,333 ----
      SockList sl;
      char fallback;
  
!     if (face_num <= 0 || face_num >= nrofpixmaps) {
  	LOG(llevError,"esrv_send_face (%d) out of bounds??\n",face_num);
  	return;
      }

Index: crossfire/socket/request.c
diff -c crossfire/socket/request.c:1.67 crossfire/socket/request.c:1.68
*** crossfire/socket/request.c:1.67	Sat Mar 19 01:14:57 2005
--- crossfire/socket/request.c	Sun Mar 27 23:20:10 2005
***************
*** 1,6 ****
  /*
   * static char *rcsid_init_c =
!  *    "$Id: request.c,v 1.67 2005/03/19 09:14:57 mwedel Exp $";
   */
  
  /*
--- 1,6 ----
  /*
   * static char *rcsid_init_c =
!  *    "$Id: request.c,v 1.68 2005/03/28 07:20:10 mwedel Exp $";
   */
  
  /*
***************
*** 1072,1078 ****
  
      if (face_num != ns->lastmap.cells[ax][ay].faces[layer]) {
  	SockList_AddShort(sl, face_num);
! 	if (!(face_num && ns->faces_sent[face_num] & NS_FACESENT_FACE))
  	    esrv_send_face(ns, face_num, 0);
  	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
  	ns->lastmap.cells[ax][ay].faces[layer] = face_num;
--- 1072,1078 ----
  
      if (face_num != ns->lastmap.cells[ax][ay].faces[layer]) {
  	SockList_AddShort(sl, face_num);
! 	if (face_num && !(ns->faces_sent[face_num] & NS_FACESENT_FACE))
  	    esrv_send_face(ns, face_num, 0);
  	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
  	ns->lastmap.cells[ax][ay].faces[layer] = face_num;