ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/commands.C
(Generate patch)

Comparing deliantra/server/server/commands.C (file contents):
Revision 1.54 by root, Fri Aug 29 02:12:25 2008 UTC vs.
Revision 1.69 by root, Sat Apr 23 04:56:55 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* 25/* This file deals with administrative commands from the client. */
25 * Command parser
26 */
27
28#include <cctype>
29
30#include <global.h> 26#include <global.h>
31#include <commands.h>
32#include <sproto.h> 27#include <sproto.h>
33 28
34/* Added times to all the commands. However, this was quickly done, 29/* Added times to all the commands. However, this was quickly done,
35 * and probably needs more refinements. All socket and DM commands 30 * and probably needs more refinements. All socket and DM commands
36 * take 0 time. 31 * take 0 time.
37 */ 32 */
38 33
34typedef int (*CommFunc)(object *op, char *params);
35
36struct CommArray_s { /* global list's structure */
37 const char *name;
38 CommFunc func;
39 float time; /* How long it takes to execute this command */
40};
41
39/* 42/*
40 * Normal game commands 43 * Normal game commands
41 */ 44 */
42CommArray_s Commands[] = { 45static CommArray_s Commands[] = {
43 {"party", command_party, 1.0}, 46 {"party", command_party, 1.0},
44 {"gsay", command_gsay, 1.0}, 47 {"gsay", command_gsay, 1.0},
45 48
46 {"apply", command_apply, 1.0}, /* should be variable */ 49 {"apply", command_apply, 1.0}, /* should be variable */
47 {"cast", command_cast, 1.0}, /* Is this right? */ 50 {"cast", command_cast, 1.0}, /* Is this right? */
48 {"disarm", command_disarm, 1.0},
49 {"dm", command_dm, 0.0}, 51 {"dm", command_dm, 0.0},
50 {"dmhide", command_dmhide, 0.0}, /* Like dm, but don't tell a dm arrived, hide player */ 52 {"dmhide", command_dmhide, 0.0}, /* Like dm, but don't tell a dm arrived, hide player */
51 {"drop", command_drop, 1.0}, 53 {"drop", command_drop, 1.0},
52 {"dropall", command_dropall, 0.5 / TICK}, 54 {"dropall", command_dropall, 0.5 / TICK},
53 {"examine", command_examine, 0.5 / TICK}, 55 {"examine", command_examine, 0.5 / TICK},
54 {"fix_me", command_fix_me, 0.0}, 56 {"fix_me", command_fix_me, 0.0},
55 {"get", command_take, 1.0}, 57 {"get", command_take, 1.0},
56 {"invoke", command_invoke, 1.0}, 58 {"invoke", command_invoke, 1.0},
57 {"killpets", command_kill_pets, 1.0}, 59 {"killpets", command_kill_pets, 1.0},
58 {"motd", command_motd, 0.5 / TICK}, 60 {"lock", command_lock, 1.0}, /* locks items in inventory with command line or macro */
59 {"pickup", command_pickup, 1.0}, 61 {"pickup", command_pickup, 1.0},
60 {"prepare", command_prepare, 1.0}, 62 {"prepare", command_prepare, 1.0},
61 {"resistances", command_resistances, 1.0}, 63 {"resistances", command_resistances, 1.0},
62 {"rotateshoottype", command_rotateshoottype, 1.0}, 64 {"rotateshoottype", command_rotateshoottype, 1.0},
63 {"skills", command_skills, 0.5 / TICK}, /* shows player list of skills */ 65 {"skills", command_skills, 0.5 / TICK}, /* shows player list of skills */
66 {"unlock", command_unlock, 1.0}, /* unlock items in inventory with command line or in macro */
64 {"use_skill", command_uskill, 1.0}, 67 {"use_skill", command_uskill, 1.0},
65 {"ready_skill", command_rskill, 1.0}, 68 {"ready_skill", command_rskill, 1.0},
66 {"search", command_search, 1.0},
67 {"search-items", command_search_items, 1.0}, 69 {"search-items", command_search_items, 1.0},
68 {"showpets", command_showpets, 1.0}, 70 {"showpets", command_showpets, 1.0},
69 {"statistics", command_statistics, 1.0}, 71 {"statistics", command_statistics, 1.0},
70 {"take", command_take, 1.0}, 72 {"take", command_take, 1.0},
71 {"throw", command_throw, 1.0}, 73 {"throw", command_throw, 1.0},
82 {"west", command_west, 0.0}, 84 {"west", command_west, 0.0},
83 {"northeast", command_northeast, 0.0}, 85 {"northeast", command_northeast, 0.0},
84 {"southeast", command_southeast, 0.0}, 86 {"southeast", command_southeast, 0.0},
85 {"southwest", command_southwest, 0.0}, 87 {"southwest", command_southwest, 0.0},
86 {"northwest", command_northwest, 0.0}, 88 {"northwest", command_northwest, 0.0},
89
90 {"mark" , command_mark , 0.0},
91 {"run" , command_run , 0.0},
92 {"run_stop" , command_run_stop , 0.0},
93 {"fire" , command_fire , 0.0},
94 {"fire_stop", command_fire_stop, 0.0},
87}; 95};
88const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s); 96static const int CommandsSize = array_length (Commands);
89
90CommArray_s CommunicationCommands[] = {
91 {"printlos", command_printlos, 0.0},
92};
93const int CommunicationCommandSize = sizeof (CommunicationCommands) / sizeof (CommArray_s);
94 97
95/* 98/*
96 * Wizard commands (for both) 99 * Wizard commands (for both)
97 */ 100 */
98CommArray_s WizCommands[] = { 101static CommArray_s WizCommands[] = {
99 {"abil", command_abil, 0.0}, 102 {"abil", command_abil, 0.0},
100 {"addexp", command_addexp, 0.0}, 103 {"addexp", command_addexp, 0.0},
101 {"arrest", command_arrest, 0.0}, 104 {"arrest", command_arrest, 0.0},
102 {"create", command_create, 0.0}, 105 {"create", command_create, 0.0},
103 {"debug", command_debug, 0.0}, 106 {"debug", command_debug, 0.0},
104 {"dump", command_dump, 0.0}, 107 {"dump", command_dump, 0.0},
105 {"dumpbelow", command_dumpbelow, 0.0}, 108 {"dumpbelow", command_dumpbelow, 0.0},
106 {"dumpfriendlyobjects", command_dumpfriendlyobjects, 0.0},
107 {"forget_spell", command_forget_spell, 0.0}, 109 {"forget_spell", command_forget_spell, 0.0},
108 {"free", command_free, 0.0}, 110 {"free", command_free, 0.0},
109 {"freeze", command_freeze, 0.0}, 111 {"freeze", command_freeze, 0.0},
110 {"hide", command_hide, 0.0}, 112 {"hide", command_hide, 0.0},
111 {"insert_into", command_insert_into, 0.0}, 113 {"insert_into", command_insert_into, 0.0},
124 {"stack_push", command_stack_push, 0.0}, 126 {"stack_push", command_stack_push, 0.0},
125 {"stats", command_stats, 0.0}, 127 {"stats", command_stats, 0.0},
126 {"summon", command_summon, 0.0}, 128 {"summon", command_summon, 0.0},
127 //{"overlay_save", command_save_overlay, 0.0}, 129 //{"overlay_save", command_save_overlay, 0.0},
128}; 130};
129const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s); 131static const int WizCommandsSize = array_length (WizCommands);
130 132
131static int 133static int
132compare_A (const void *a, const void *b) 134compare_A (const void *a, const void *b)
133{ 135{
134 return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name); 136 return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name);
135} 137}
136 138
139static struct init_commands
140{
141 init_commands ()
142 {
143 qsort (Commands, CommandsSize, sizeof (CommArray_s), compare_A);
144 qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A);
145 }
146} init_commands;
147
148static CommArray_s *
149find_command_element (char *cmd, CommArray_s *commarray, int commsize)
150{
151 CommArray_s *asp, dummy;
152
153 dummy.name = cmd;
154 asp = (CommArray_s *)bsearch ((void *)&dummy, (void *)commarray, commsize, sizeof (CommArray_s), compare_A);
155 return asp;
156}
157
158/* This function is called from the new client/server code.
159 * pl is the player who is issuing the command, command is the
160 * command.
161 */
137void 162void
138init_commands (void) 163execute_newserver_command (object *pl, char *command)
139{ 164{
140 qsort (Commands, CommandsSize, sizeof (CommArray_s), compare_A); 165 CommArray_s *csp;
141 qsort (CommunicationCommands, CommunicationCommandSize, sizeof (CommArray_s), compare_A); 166 char *cp;
142 qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A); 167
168 /*
169 * remove trailing spaces from command
170 */
171 cp = command + strlen (command) - 1;
172 while ((cp >= command) && (*cp == ' '))
173 {
174 *cp = '\0';
175 cp--;
176 }
177
178 cp = strchr (command, ' ');
179 if (cp)
180 {
181 *(cp++) = '\0';
182 while (*cp == ' ')
183 cp++;
184 }
185
186 if (!INVOKE_PLAYER (COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp)))
187 {
188 csp = find_command_element (command, Commands, CommandsSize);
189
190 if (!csp && pl->flag [FLAG_WIZ])
191 csp = find_command_element (command, WizCommands, WizCommandsSize);
192
193 if (csp)
194 {
195 pl->speed_left -= csp->time;
196 csp->func (pl, cp);
197 }
198 else if (!INVOKE_PLAYER (UNKNOWN_COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp)))
199 pl->failmsgf ("'%s' is not a valid command.", command);
200 }
143} 201}
144 202

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines