Difference for server/commands.c from version 1.58 to 1.59

version 1.58 version 1.59
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_commands_c =   * static char *rcsid_commands_c =
  *   "$Id: commands.c,v 1.58 2006/02/08 21:41:54 ryo_saeba Exp $";   *   "$Id: commands.c,v 1.59 2006/03/18 15:05:37 ryo_saeba Exp $";
  */   */
   
 /*  /*
Line 45
 
Line 45
 /*  /*
  * Normal game commands   * Normal game commands
  */   */
 CommArray_s Commands[] = {  command_array_struct Commands[] = {
   {"save", command_save, 0.0},    {"save", command_save, 0.0},
   
   {"sound", command_sound, 0.0},    {"sound", command_sound, 0.0},
Line 133
 
Line 133
   {"northwest", command_northwest, 1.0},    {"northwest", command_northwest, 1.0},
 };  };
   
 const int CommandsSize =sizeof(Commands) / sizeof(CommArray_s);  const int CommandsSize =sizeof(Commands) / sizeof(command_array_struct);
   
 CommArray_s CommunicationCommands [] = {  command_array_struct CommunicationCommands [] = {
   /* begin emotions */    /* begin emotions */
   {"tell", command_tell, 0.1},    {"tell", command_tell, 0.1},
   {"reply", command_reply, 0.0},    {"reply", command_reply, 0.0},
Line 202
 
Line 202
   {"printlos", command_printlos,0.0},    {"printlos", command_printlos,0.0},
 };  };
   
 const int CommunicationCommandSize = sizeof(CommunicationCommands)/ sizeof(CommArray_s);  const int CommunicationCommandSize = sizeof(CommunicationCommands)/ sizeof(command_array_struct);
   
 CommArray_s NewServerCommands [] = {  command_array_struct NewServerCommands [] = {
   {"run", command_run, 1.0},    {"run", command_run, 1.0},
   {"run_stop", command_run_stop, 0.0},    {"run_stop", command_run_stop, 0.0},
   {"fire", command_fire, 1.0},    {"fire", command_fire, 1.0},
   {"fire_stop", command_fire_stop, 0.0}    {"fire_stop", command_fire_stop, 0.0}
 };  };
   
 const int NewServerCommandSize = sizeof(NewServerCommands)/ sizeof(CommArray_s);  const int NewServerCommandSize = sizeof(NewServerCommands)/ sizeof(command_array_struct);
   
 /*  /*
  * Wizard commands (for both)   * Wizard commands (for both)
  */   */
 CommArray_s WizCommands [] = {  command_array_struct WizCommands [] = {
   {"abil", command_abil,0.0},    {"abil", command_abil,0.0},
   {"addexp", command_addexp,0.0},    {"addexp", command_addexp,0.0},
   {"arrest", command_arrest,0.0},    {"arrest", command_arrest,0.0},
Line 268
 
Line 268
   {"mon_aggr", command_mon_aggr, 0.0},    {"mon_aggr", command_mon_aggr, 0.0},
   {"loadtest", command_loadtest, 0.0},    {"loadtest", command_loadtest, 0.0},
 };  };
 const int WizCommandsSize =sizeof(WizCommands) / sizeof(CommArray_s);  const int WizCommandsSize =sizeof(WizCommands) / sizeof(command_array_struct);
   
 /* Socket commands - these should really do nothing more than output things  /* Socket commands - these should really do nothing more than output things
  * to the various players/sockets.   * to the various players/sockets.
  */   */
 CommArray_s Socket_Commands[] = {  command_array_struct Socket_Commands[] = {
   {"hiscore", command_hiscore, 0.0},    {"hiscore", command_hiscore, 0.0},
   {"logs", command_logs, 0.0},    {"logs", command_logs, 0.0},
   {"maps", command_maps, 0.0},    {"maps", command_maps, 0.0},
Line 283
 
Line 283
   {"who", command_who, 0.0},    {"who", command_who, 0.0},
 };  };
   
 const int Socket_CommandsSize =sizeof(Socket_Commands) / sizeof(CommArray_s);  const int Socket_CommandsSize =sizeof(Socket_Commands) / sizeof(command_array_struct);
   
   
 /* Socket commands - these should really do nothing more than output things  /* Socket commands - these should really do nothing more than output things
  * to the various players/sockets.   * to the various players/sockets.
  */   */
 CommArray_s Socket2_Commands[] = {  command_array_struct Socket2_Commands[] = {
   {"shout", command_shout, 0.1},    {"shout", command_shout, 0.1},
   {"chat", command_chat, 0.1},    {"chat", command_chat, 0.1},
   {"tell", command_tell, 0.1},    {"tell", command_tell, 0.1},
 };  };
   
 const int Socket2_CommandsSize =sizeof(Socket2_Commands) / sizeof(CommArray_s);  const int Socket2_CommandsSize =sizeof(Socket2_Commands) / sizeof(command_array_struct);
   
   
   
 static int compare_A(const void *a, const void *b)  static int compare_A(const void *a, const void *b)
 {  {
   return strcmp(((CommArray_s *)a)->name, ((CommArray_s *)b)->name);      return strcmp(((command_array_struct *)a)->name, ((command_array_struct *)b)->name);
 }  }
   
 void init_commands(void)  void init_commands(void)
 {  {
   qsort(Commands, CommandsSize, sizeof(CommArray_s), compare_A);      qsort(Commands, CommandsSize, sizeof(command_array_struct), compare_A);
   qsort(CommunicationCommands, CommunicationCommandSize, sizeof(CommArray_s), compare_A);      qsort(CommunicationCommands, CommunicationCommandSize, sizeof(command_array_struct), compare_A);
   qsort(NewServerCommands, NewServerCommandSize, sizeof(CommArray_s), compare_A);      qsort(NewServerCommands, NewServerCommandSize, sizeof(command_array_struct), compare_A);
   qsort(WizCommands, WizCommandsSize, sizeof(CommArray_s), compare_A);      qsort(WizCommands, WizCommandsSize, sizeof(command_array_struct), compare_A);
   qsort(Socket_Commands, Socket_CommandsSize, sizeof(CommArray_s), compare_A);      qsort(Socket_Commands, Socket_CommandsSize, sizeof(command_array_struct), compare_A);
   qsort(Socket2_Commands, Socket2_CommandsSize, sizeof(CommArray_s), compare_A);      qsort(Socket2_Commands, Socket2_CommandsSize, sizeof(command_array_struct), compare_A);
 }  }
   
 #ifndef tolower  #ifndef tolower
Line 319
 
Line 319
 #endif  #endif
   
   
 CommFunc find_oldsocket_command(char *cmd)  command_function find_oldsocket_command(char *cmd)
 {  {
   CommArray_s *asp, dummy;    command_array_struct *asp, dummy;
   char *cp;    char *cp;
   
   for (cp=cmd; *cp; cp++) {    for (cp=cmd; *cp; cp++) {
Line 329
 
Line 329
   }    }
   
   dummy.name =cmd;    dummy.name =cmd;
   asp =(CommArray_s *)bsearch((void *)&dummy,    asp =(command_array_struct *)bsearch((void *)&dummy,
        (void *)Socket_Commands, Socket_CommandsSize,         (void *)Socket_Commands, Socket_CommandsSize,
        sizeof(CommArray_s), compare_A);         sizeof(command_array_struct), compare_A);
   if (asp)    if (asp)
     return asp->func;      return asp->func;
   return NULL;    return NULL;
 }  }
   
 CommFunc find_oldsocket_command2(char *cmd)  command_function find_oldsocket_command2(char *cmd)
 {  {
   CommArray_s *asp, dummy;    command_array_struct *asp, dummy;
   char *cp;    char *cp;
   
   for (cp=cmd; *cp; cp++) {    for (cp=cmd; *cp; cp++) {
Line 347
 
Line 347
   }    }
   
   dummy.name =cmd;    dummy.name =cmd;
   asp =(CommArray_s *)bsearch((void *)&dummy,    asp =(command_array_struct *)bsearch((void *)&dummy,
        (void *)Socket2_Commands, Socket2_CommandsSize,         (void *)Socket2_Commands, Socket2_CommandsSize,
        sizeof(CommArray_s), compare_A);         sizeof(command_array_struct), compare_A);
   if (asp)    if (asp)
     return asp->func;      return asp->func;
   return NULL;    return NULL;
 }  }
   
 static CommFunc find_command(char *cmd)  static command_function find_command(char *cmd)
 {  {
   CommArray_s *asp, dummy;    command_array_struct *asp, dummy;
   char *cp;    char *cp;
   
   for (cp=cmd; *cp; cp++)    for (cp=cmd; *cp; cp++)
     *cp =tolower(*cp);      *cp =tolower(*cp);
   
   dummy.name =cmd;    dummy.name =cmd;
   asp =(CommArray_s *)bsearch((void *)&dummy,    asp =(command_array_struct *)bsearch((void *)&dummy,
        (void *)Commands, CommandsSize,         (void *)Commands, CommandsSize,
        sizeof(CommArray_s), compare_A);         sizeof(command_array_struct), compare_A);
   LOG(llevDebug, "Getting asp for command string %s\n", cmd);    LOG(llevDebug, "Getting asp for command string %s\n", cmd);
   if (asp)    if (asp)
     return asp->func;      return asp->func;
   else    else
   {    {
     LOG(llevDebug, "Now we are here\n");      LOG(llevDebug, "Now we are here\n");
     asp =(CommArray_s *)bsearch((void *)&dummy,      asp =(command_array_struct *)bsearch((void *)&dummy,
       (void *)CommunicationCommands, CommunicationCommandSize,        (void *)CommunicationCommands, CommunicationCommandSize,
       sizeof(CommArray_s), compare_A);        sizeof(command_array_struct), compare_A);
     if (asp)      if (asp)
       return asp->func;        return asp->func;
     else      else
Line 383
 
Line 383
   };    };
 }  }
   
 static CommFunc find_wizcommand(char *cmd)  static command_function find_wizcommand(char *cmd)
 {  {
   CommArray_s *asp, dummy;    command_array_struct *asp, dummy;
   char *cp;    char *cp;
   
   for (cp=cmd; *cp; cp++)    for (cp=cmd; *cp; cp++)
     *cp =tolower(*cp);      *cp =tolower(*cp);
   
   dummy.name =cmd;    dummy.name =cmd;
   asp =(CommArray_s *)bsearch((void *)&dummy,    asp =(command_array_struct *)bsearch((void *)&dummy,
        (void *)WizCommands, WizCommandsSize,         (void *)WizCommands, WizCommandsSize,
        sizeof(CommArray_s), compare_A);         sizeof(command_array_struct), compare_A);
   if (asp)    if (asp)
     return asp->func;      return asp->func;
   return NULL;    return NULL;
 }  }
   
   
 /*  /**
  * parse_string may be called from a player in the game or from a socket   * parse_string may be called from a player in the game or from a socket
  * (op is NULL if it's a socket).   * (op is NULL if it's a socket).
  * It returnes 1 if it recognized the command, otherwise 0.   * It returnes 1 if it recognized the command, otherwise 0.
Line 410
 
Line 410
   
 int parse_string(object *op, char *str)  int parse_string(object *op, char *str)
 {  {
     CommFunc f;      command_function f;
     char *cp;      char *cp;
     CommArray_s *asp;      command_array_struct *asp;
   
 #ifdef INPUT_DEBUG  #ifdef INPUT_DEBUG
     LOG(llevDebug, "Command: '%s'\n", str);      LOG(llevDebug, "Command: '%s'\n", str);
Line 468
 
Line 468
 }  }
   
   
 /*  this function handles splitting up a ; separated  /**  this function handles splitting up a ; separated
  *  compound command into sub-commands:  it is recursive.   *  compound command into sub-commands:  it is recursive.
  */   */
 int parse_command(object *op, char *str) {  int parse_command(object *op, char *str) {

Legend:
line(s) removed in v.1.58 
line(s) changed
 line(s) added in v.1.59
File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:31