[Crossfire-cvs] CVS commit: crossfire

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

Module Name:	crossfire
Committed By:	ryo_saeba
Date:		Tue Mar 22 23:22:42 UTC 2005

Modified Files:
	crossfire: ChangeLog
	crossfire/include: sproto.h
	crossfire/server: c_misc.c c_wiz.c

Log Message:
Fix broken win32 compilation. Remove sleep(1) in hide commandas that causes the whole server to sleep



Start of context diffs


Index: crossfire/ChangeLog
diff -c crossfire/ChangeLog:1.265 crossfire/ChangeLog:1.266
*** crossfire/ChangeLog:1.265	Tue Mar 22 13:44:36 2005
--- crossfire/ChangeLog	Tue Mar 22 15:22:37 2005
***************
*** 17,22 ****
--- 17,27 ----
  ------------------------------------------------------------------------------
  Changes for CVS:
  
+ 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.
+ Ryo 2005-03-23
+ 
  common/living.c: Allow luck to drop back to zero. Limit bad luck object to
     +/-100 to prevent overflows.
  Andreas Kirschbaum 2005-03-22

Index: crossfire/include/sproto.h
diff -c crossfire/include/sproto.h:1.116 crossfire/include/sproto.h:1.117
*** crossfire/include/sproto.h:1.116	Sun Mar 20 14:20:40 2005
--- crossfire/include/sproto.h	Tue Mar 22 15:22:41 2005
***************
*** 151,157 ****
  void current_map_info(object *op);
  void current_region_info(object *op);
  int command_who(object *op, char *params);
! void *get_who_escape_code_value(char *return_val, const char letter, player *pl);
  int command_malloc(object *op, char *params);
  int command_mapinfo(object *op, char *params);
  int command_whereami(object *op, char *params);
--- 151,157 ----
  void current_map_info(object *op);
  void current_region_info(object *op);
  int command_who(object *op, char *params);
! void get_who_escape_code_value(char *return_val, const char letter, player *pl);
  int command_malloc(object *op, char *params);
  int command_mapinfo(object *op, char *params);
  int command_whereami(object *op, char *params);

Index: crossfire/server/c_misc.c
diff -c crossfire/server/c_misc.c:1.51 crossfire/server/c_misc.c:1.52
*** crossfire/server/c_misc.c:1.51	Mon Mar 21 18:39:50 2005
--- crossfire/server/c_misc.c	Tue Mar 22 15:22:42 2005
***************
*** 1,6 ****
  /*
   * static char *rcsid_c_misc_c =
!  *   "$Id: c_misc.c,v 1.51 2005/03/22 02:39:50 majorwoo Exp $";
   */
  
  /*
--- 1,6 ----
  /*
   * static char *rcsid_c_misc_c =
!  *   "$Id: c_misc.c,v 1.52 2005/03/22 23:22:42 ryo_saeba Exp $";
   */
  
  /*
***************
*** 250,258 ****
  	else
  		new_draw_info(NDI_UNIQUE, 0,op,"Heap checks out OK.");
  	return 1;
! yea	}
  #endif
  
  int command_who (object *op, char *params) {
      player *pl;
      uint16 i;
--- 250,270 ----
  	else
  		new_draw_info(NDI_UNIQUE, 0,op,"Heap checks out OK.");
  	return 1;
! 	}
  #endif
  
+ typedef struct
+     {
+       char namebuf[MAX_BUF];
+       int login_order;
+     } chars_names;
+ 
+ /*local functon for qsort comparison*/
+ int name_cmp (chars_names *c1, chars_names *c2)
+     {
+       return strcasecmp (c1->namebuf, c2->namebuf);
+     }
+ 
  int command_who (object *op, char *params) {
      player *pl;
      uint16 i;
***************
*** 261,277 ****
      int num_wiz = 0;
      int num_afk = 0;
      char players_str[MAX_BUF];
-     typedef struct
-     {
-       char namebuf[MAX_BUF];
-       int login_order;
-     } chars_names;
      chars_names *chars = NULL;
-     /*local functon for qsort comparison*/
-     int name_cmp (chars_names *c1, chars_names *c2)
-     {
-       return strcasecmp (c1->namebuf, c2->namebuf);
-     }
      
      /* 
       * The who formats are defined in config to be blank. They should have been
--- 273,279 ----
***************
*** 368,374 ****
   * _	a literal underscore
   */
    
! void *get_who_escape_code_value(char *return_val, const char letter, player *pl) {
      
      switch (letter) {
  	case 'N' :    strcpy(return_val, pl->ob->name);
--- 370,376 ----
   * _	a literal underscore
   */
    
! void get_who_escape_code_value(char *return_val, const char letter, player *pl) {
      
      switch (letter) {
  	case 'N' :    strcpy(return_val, pl->ob->name);

Index: crossfire/server/c_wiz.c
diff -c crossfire/server/c_wiz.c:1.60 crossfire/server/c_wiz.c:1.61
*** crossfire/server/c_wiz.c:1.60	Mon Mar 21 17:54:00 2005
--- crossfire/server/c_wiz.c	Tue Mar 22 15:22:42 2005
***************
*** 1,6 ****
  /*
   * static char *rcsid_c_wiz_c =
!  *   "$Id: c_wiz.c,v 1.60 2005/03/22 01:54:00 majorwoo Exp $";
   */
  
  /*
--- 1,6 ----
  /*
   * static char *rcsid_c_wiz_c =
!  *   "$Id: c_wiz.c,v 1.61 2005/03/22 23:22:42 ryo_saeba Exp $";
   */
  
  /*
***************
*** 124,131 ****
              "%s has entered the game.",op->name);
          if ( !silent_dm )
              {
- 	    /*slight delay to make it look like a person doing it*/
-             sleep (1);
  	    new_draw_info(NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL,
                  "The Dungeon Master has arrived!");
              }
--- 124,129 ----
***************
*** 142,151 ****
              }
  	new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL,
              "%s leaves the game.",op->name);
!         /*slight delay to make it look like a person doing it*/
! 	sleep (1);
! 	new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL,

!             "%s left the game.",op->name);

          }
      }
  
--- 140,147 ----
              }
  	new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL,
              "%s leaves the game.",op->name);
! 	new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL,
!             "%s left the game.",op->name);
          }
      }