--- deliantra/server/server/commands.C 2006/10/02 00:10:58 1.14 +++ deliantra/server/server/commands.C 2007/01/27 23:59:29 1.25 @@ -1,36 +1,36 @@ /* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2002 Mark Wedel & Crossfire Development Team - Copyright (C) 1992 Frank Tore Johansen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - The author can be reached via e-mail to -*/ + * CrossFire, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * Copyright (C) 2002 Mark Wedel & Crossfire Development Team + * Copyright (C) 1992 Frank Tore Johansen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * The author can be reached via e-mail to + */ /* * Command parser */ +#include + #include #include -#ifndef __CEXTRACT__ -# include -#endif -#include +#include /* Added times to all the commands. However, this was quickly done, * and probably needs more refinements. All socket and DM commands @@ -41,8 +41,6 @@ * Normal game commands */ CommArray_s Commands[] = { - {"save", command_save, 0.0}, - {"sound", command_sound, 0.0}, {"party", command_party, 0.0}, {"gsay", command_gsay, 1.0}, @@ -59,7 +57,6 @@ {"drop", command_drop, 1.0}, {"dropall", command_dropall, 1.0}, {"examine", command_examine, 0.5}, - {"explore", command_explore, 0.0}, {"fix_me", command_fix_me, 0.0}, {"get", command_take, 1.0}, {"help", command_help, 0.0}, @@ -69,7 +66,6 @@ {"killpets", command_kill_pets, 0.0}, {"listen", command_listen, 0.0}, {"logs", command_logs, 0.0}, - {"maps", command_maps, 0.0}, {"mapinfo", command_mapinfo, 0.0}, {"mark", command_mark, 0.0}, {"motd", command_motd, 0.0}, @@ -78,8 +74,6 @@ {"peaceful", command_peaceful, 0.0}, {"pickup", command_pickup, 1.0}, {"prepare", command_prepare, 1.0}, - {"quit", command_quit, 0.0}, - {"quit_character", command_real_quit, 0.0}, {"resistances", command_resistances, 0.0}, {"rotateshoottype", command_rotateshoottype, 0.0}, {"skills", command_skills, 0.0}, /* shows player list of skills */ @@ -114,7 +108,6 @@ {"southwest", command_southwest, 1.0}, {"northwest", command_northwest, 1.0}, }; - const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s); CommArray_s CommunicationCommands[] = { @@ -178,7 +171,6 @@ {"orcknuckle", command_orcknuckle, 0.0}, {"printlos", command_printlos, 0.0}, }; - const int CommunicationCommandSize = sizeof (CommunicationCommands) / sizeof (CommArray_s); CommArray_s NewServerCommands[] = { @@ -187,7 +179,6 @@ {"fire", command_fire, 1.0}, {"fire_stop", command_fire_stop, 0.0}, }; - const int NewServerCommandSize = sizeof (NewServerCommands) / sizeof (CommArray_s); /* @@ -203,10 +194,6 @@ {"dump", command_dump, 0.0}, {"dumpbelow", command_dumpbelow, 0.0}, {"dumpfriendlyobjects", command_dumpfriendlyobjects, 0.0}, - {"dumpallarchetypes", command_dumpallarchetypes, 0.0}, - {"dumpallmaps", command_dumpallmaps, 0.0}, - {"dumpallobjects", command_dumpallobjects, 0.0}, - {"dumpmap", command_dumpmap, 0.0}, {"forget_spell", command_forget_spell, 0.0}, {"free", command_free, 0.0}, {"freeze", command_freeze, 0.0}, @@ -219,7 +206,6 @@ #ifdef DEBUG_MALLOC_LEVEL {"verify", command_malloc_verify, 0.0}, #endif - {"players", command_players, 0.0}, {"plugin", command_loadplugin, 0.0}, {"pluglist", command_listplugins, 0.0}, {"plugout", command_unloadplugin, 0.0}, @@ -227,7 +213,6 @@ {"nowiz", command_nowiz, 0.0}, {"patch", command_patch, 0.0}, {"remove", command_remove, 0.0}, - {"reset", command_reset, 0.0}, {"set_god", command_setgod, 0.0}, {"shutdown", command_shutdown, 0.0}, {"stack_clear", command_stack_clear, 0.0}, @@ -235,11 +220,8 @@ {"stack_pop", command_stack_pop, 0.0}, {"stack_push", command_stack_push, 0.0}, {"stats", command_stats, 0.0}, - {"style_info", command_style_map_info, 0.0}, /* Costly command, so make it wiz only */ {"summon", command_summon, 0.0}, - {"teleport", command_teleport, 0.0}, - {"wizcast", command_wizcast, 0.0}, - {"overlay_save", command_save_overlay, 0.0}, + //{"overlay_save", command_save_overlay, 0.0}, /* {"possess", command_possess, 0.0}, */ {"mon_aggr", command_mon_aggr, 0.0}, @@ -252,29 +234,22 @@ CommArray_s Socket_Commands[] = { {"hiscore", command_hiscore, 0.0}, {"logs", command_logs, 0.0}, - {"maps", command_maps, 0.0}, {"motd", command_motd, 0.0}, - {"players", command_players, 0.0}, {"version", command_version, 0.0}, }; - const int Socket_CommandsSize = sizeof (Socket_Commands) / sizeof (CommArray_s); - /* Socket commands - these should really do nothing more than output things * to the various players/sockets. */ CommArray_s Socket2_Commands[] = { }; - const int Socket2_CommandsSize = sizeof (Socket2_Commands) / sizeof (CommArray_s); - - static int compare_A (const void *a, const void *b) { - return strcmp (((CommArray_s *) a)->name, ((CommArray_s *) b)->name); + return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name); } void @@ -288,43 +263,3 @@ qsort (Socket2_Commands, Socket2_CommandsSize, sizeof (CommArray_s), compare_A); } -#ifndef tolower -# define tolower(C) (((C) >= 'A' && (C) <= 'Z')? (C) - 'A' + 'a': (C)) -#endif - - -CommFunc -find_oldsocket_command (char *cmd) -{ - CommArray_s *asp, dummy; - char *cp; - - for (cp = cmd; *cp; cp++) - { - *cp = tolower (*cp); - } - - dummy.name = cmd; - asp = (CommArray_s *) bsearch ((void *) &dummy, (void *) Socket_Commands, Socket_CommandsSize, sizeof (CommArray_s), compare_A); - if (asp) - return asp->func; - return NULL; -} - -CommFunc -find_oldsocket_command2 (char *cmd) -{ - CommArray_s *asp, dummy; - char *cp; - - for (cp = cmd; *cp; cp++) - { - *cp = tolower (*cp); - } - - dummy.name = cmd; - asp = (CommArray_s *) bsearch ((void *) &dummy, (void *) Socket2_Commands, Socket2_CommandsSize, sizeof (CommArray_s), compare_A); - if (asp) - return asp->func; - return NULL; -}