--- deliantra/server/server/commands.C 2007/03/02 11:07:59 1.35 +++ deliantra/server/server/commands.C 2010/04/10 04:54:09 1.66 @@ -1,35 +1,29 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002 Mark Wedel & Crossfire Development Team + * Copyright (©) 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. + * Deliantra is free software: you can redistribute it and/or modify it under + * the terms of the Affero GNU General Public License as published by the + * Free Software Foundation, either version 3 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 + * 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 + * You should have received a copy of the Affero GNU General Public License + * and the GNU General Public License along with this program. If not, see + * . + * + * The authors can be reached via e-mail to */ -#include - +/* This file deals with administrative commands from the client. */ #include -#include #include /* Added times to all the commands. However, this was quickly done, @@ -37,144 +31,104 @@ * take 0 time. */ -/* - * Normal game commands - */ -CommArray_s Commands[] = { - {"party", command_party, 0.0}, - {"gsay", command_gsay, 1.0}, - - {"apply", command_apply, 1.0}, /* should be variable */ - {"body", command_body, 0.0}, - {"cast", command_cast, 0.2}, /* Is this right? */ - {"disarm", command_disarm, 1.0}, - {"dm", command_dm, 0.0}, - {"dmhide", command_dmhide, 0.0}, /* Like dm, but don't tell a dm arrived, hide player */ - {"drop", command_drop, 1.0}, - {"dropall", command_dropall, 1.0}, - {"examine", command_examine, 0.5}, - {"fix_me", command_fix_me, 0.0}, - {"get", command_take, 1.0}, - {"help", command_help, 0.0}, - {"hiscore", command_hiscore, 0.0}, - {"inventory", command_inventory, 0.0}, - {"invoke", command_invoke, 1.0}, - {"killpets", command_kill_pets, 0.0}, - {"logs", command_logs, 0.0}, - {"mapinfo", command_mapinfo, 0.0}, - {"mark", command_mark, 0.0}, - {"motd", command_motd, 0.0}, - {"pickup", command_pickup, 1.0}, - {"prepare", command_prepare, 1.0}, - {"resistances", command_resistances, 0.0}, - {"rotateshoottype", command_rotateshoottype, 0.0}, - {"skills", command_skills, 0.0}, /* shows player list of skills */ - {"use_skill", command_uskill, 1.0}, - {"ready_skill", command_rskill, 1.0}, - {"search", command_search, 1.0}, - {"search-items", command_search_items, 0.0}, - {"showpets", command_showpets, 1.0}, - {"statistics", command_statistics, 0.0}, - {"take", command_take, 1.0}, - {"throw", command_throw, 1.0}, - {"time", command_time, 0.0}, - {"weather", command_weather, 0.0}, - {"whereabouts", command_whereabouts, 0.0}, - {"whereami", command_whereami, 0.0}, - {"title", command_title, 0.0}, - {"bowmode", command_bowmode, 0.0}, - {"version", command_version, 0.0}, - - {"stay", command_stay, 1.0}, /* 1.0 because it is used when using a - * skill on yourself */ - {"north", command_north, 1.0}, - {"east", command_east, 1.0}, - {"south", command_south, 1.0}, - {"west", command_west, 1.0}, - {"northeast", command_northeast, 1.0}, - {"southeast", command_southeast, 1.0}, - {"southwest", command_southwest, 1.0}, - {"northwest", command_northwest, 1.0}, -}; -const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s); +typedef int (*CommFunc)(object *op, char *params); -CommArray_s CommunicationCommands[] = { - {"printlos", command_printlos, 0.0}, +struct CommArray_s { /* global list's structure */ + const char *name; + CommFunc func; + float time; /* How long it takes to execute this command */ }; -const int CommunicationCommandSize = sizeof (CommunicationCommands) / sizeof (CommArray_s); -CommArray_s NewServerCommands[] = { - {"run", command_run, 1.0}, - {"run_stop", command_run_stop, 0.0}, - {"fire", command_fire, 1.0}, +/* + * Normal game commands + */ +static CommArray_s Commands[] = { + {"party", command_party, 1.0}, + {"gsay", command_gsay, 1.0}, + + {"apply", command_apply, 1.0}, /* should be variable */ + {"cast", command_cast, 1.0}, /* Is this right? */ + {"dm", command_dm, 0.0}, + {"dmhide", command_dmhide, 0.0}, /* Like dm, but don't tell a dm arrived, hide player */ + {"drop", command_drop, 1.0}, + {"dropall", command_dropall, 0.5 / TICK}, + {"examine", command_examine, 0.5 / TICK}, + {"fix_me", command_fix_me, 0.0}, + {"get", command_take, 1.0}, + {"invoke", command_invoke, 1.0}, + {"killpets", command_kill_pets, 1.0}, + {"lock", command_lock, 1.0}, /* locks items in inventory with command line or macro */ + {"pickup", command_pickup, 1.0}, + {"prepare", command_prepare, 1.0}, + {"resistances", command_resistances, 1.0}, + {"rotateshoottype", command_rotateshoottype, 1.0}, + {"skills", command_skills, 0.5 / TICK}, /* shows player list of skills */ + {"unlock", command_unlock, 1.0}, /* unlock items in inventory with command line or in macro */ + {"use_skill", command_uskill, 1.0}, + {"ready_skill", command_rskill, 1.0}, + {"search-items", command_search_items, 1.0}, + {"showpets", command_showpets, 1.0}, + {"statistics", command_statistics, 1.0}, + {"take", command_take, 1.0}, + {"throw", command_throw, 1.0}, + {"time", command_time, 0.24 / TICK}, + {"title", command_title, 0.5 / TICK}, + {"bowmode", command_bowmode, 1.0}, + {"version", command_version, 1.0}, + + // movement commands all do their own speed management + {"stay", command_stay, 0.0}, + {"north", command_north, 0.0}, + {"east", command_east, 0.0}, + {"south", command_south, 0.0}, + {"west", command_west, 0.0}, + {"northeast", command_northeast, 0.0}, + {"southeast", command_southeast, 0.0}, + {"southwest", command_southwest, 0.0}, + {"northwest", command_northwest, 0.0}, + + {"mark" , command_mark , 0.0}, + {"run" , command_run , 0.0}, + {"run_stop" , command_run_stop , 0.0}, + {"fire" , command_fire , 0.0}, {"fire_stop", command_fire_stop, 0.0}, }; -const int NewServerCommandSize = sizeof (NewServerCommands) / sizeof (CommArray_s); +static const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s); /* * Wizard commands (for both) */ -CommArray_s WizCommands[] = { - {"abil", command_abil, 0.0}, - {"addexp", command_addexp, 0.0}, - {"arrest", command_arrest, 0.0}, - {"banish", command_banish, 0.0}, - {"create", command_create, 0.0}, - {"debug", command_debug, 0.0}, - {"dump", command_dump, 0.0}, +static CommArray_s WizCommands[] = { + {"abil", command_abil, 0.0}, + {"addexp", command_addexp, 0.0}, + {"arrest", command_arrest, 0.0}, + {"create", command_create, 0.0}, + {"debug", command_debug, 0.0}, + {"dump", command_dump, 0.0}, {"dumpbelow", command_dumpbelow, 0.0}, - {"dumpfriendlyobjects", command_dumpfriendlyobjects, 0.0}, {"forget_spell", command_forget_spell, 0.0}, - {"free", command_free, 0.0}, - {"freeze", command_freeze, 0.0}, - {"hide", command_hide, 0.0}, + {"free", command_free, 0.0}, + {"freeze", command_freeze, 0.0}, + {"hide", command_hide, 0.0}, {"insert_into", command_insert_into, 0.0}, + {"inventory", command_inventory, 0.0}, {"invisible", command_invisible, 0.0}, - {"kick", command_kick, 0.0}, {"learn_special_prayer", command_learn_special_prayer, 0.0}, {"learn_spell", command_learn_spell, 0.0}, -#ifdef DEBUG_MALLOC_LEVEL - {"verify", command_malloc_verify, 0.0}, -#endif - {"plugin", command_loadplugin, 0.0}, - {"pluglist", command_listplugins, 0.0}, - {"plugout", command_unloadplugin, 0.0}, - {"nodm", command_nowiz, 0.0}, - {"nowiz", command_nowiz, 0.0}, - {"patch", command_patch, 0.0}, - {"remove", command_remove, 0.0}, - {"set_god", command_setgod, 0.0}, - {"shutdown", command_shutdown, 0.0}, + {"nodm", command_nowiz, 0.0}, + {"nowiz", command_nowiz, 0.0}, + {"patch", command_patch, 0.0}, + {"remove", command_remove, 0.0}, + {"set_god", command_setgod, 0.0}, {"stack_clear", command_stack_clear, 0.0}, - {"stack_list", command_stack_list, 0.0}, - {"stack_pop", command_stack_pop, 0.0}, - {"stack_push", command_stack_push, 0.0}, - {"stats", command_stats, 0.0}, - {"summon", command_summon, 0.0}, + {"stack_list", command_stack_list, 0.0}, + {"stack_pop", command_stack_pop, 0.0}, + {"stack_push", command_stack_push, 0.0}, + {"stats", command_stats, 0.0}, + {"summon", command_summon, 0.0}, //{"overlay_save", command_save_overlay, 0.0}, - -/* {"possess", command_possess, 0.0}, */ - {"mon_aggr", command_mon_aggr, 0.0}, }; -const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s); - -/* Socket commands - these should really do nothing more than output things - * to the various players/sockets. - */ -CommArray_s Socket_Commands[] = { - {"hiscore", command_hiscore, 0.0}, - {"logs", command_logs, 0.0}, - {"motd", command_motd, 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 const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s); static int compare_A (const void *a, const void *b) @@ -182,14 +136,67 @@ return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name); } +static struct init_commands +{ + init_commands () + { + qsort (Commands, CommandsSize, sizeof (CommArray_s), compare_A); + qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A); + } +} init_commands; + +static CommArray_s * +find_command_element (char *cmd, CommArray_s *commarray, int commsize) +{ + CommArray_s *asp, dummy; + + dummy.name = cmd; + asp = (CommArray_s *)bsearch ((void *)&dummy, (void *)commarray, commsize, sizeof (CommArray_s), compare_A); + return asp; +} + +/* This function is called from the new client/server code. + * pl is the player who is issuing the command, command is the + * command. + */ void -init_commands (void) +execute_newserver_command (object *pl, char *command) { - qsort (Commands, CommandsSize, sizeof (CommArray_s), compare_A); - qsort (CommunicationCommands, CommunicationCommandSize, sizeof (CommArray_s), compare_A); - qsort (NewServerCommands, NewServerCommandSize, sizeof (CommArray_s), compare_A); - qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A); - qsort (Socket_Commands, Socket_CommandsSize, sizeof (CommArray_s), compare_A); - qsort (Socket2_Commands, Socket2_CommandsSize, sizeof (CommArray_s), compare_A); + CommArray_s *csp; + char *cp; + + /* + * remove trailing spaces from command + */ + cp = command + strlen (command) - 1; + while ((cp >= command) && (*cp == ' ')) + { + *cp = '\0'; + cp--; + } + + cp = strchr (command, ' '); + if (cp) + { + *(cp++) = '\0'; + while (*cp == ' ') + cp++; + } + + if (!INVOKE_PLAYER (COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp))) + { + csp = find_command_element (command, Commands, CommandsSize); + + if (!csp && QUERY_FLAG (pl, FLAG_WIZ)) + csp = find_command_element (command, WizCommands, WizCommandsSize); + + if (csp) + { + pl->speed_left -= csp->time; + csp->func (pl, cp); + } + else if (!INVOKE_PLAYER (UNKNOWN_COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp))) + pl->failmsgf ("'%s' is not a valid command.", command); + } }