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.64 by root, Mon Apr 5 03:22:26 2010 UTC vs.
Revision 1.65 by root, Tue Apr 6 22:59:28 2010 UTC

… …
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25/* 25/* This file deals with administrative commands from the client. */
26 * Command parser
27 */
28
29#include <cctype>
30
31#include <global.h> 26#include <global.h>
32#include <commands.h>
33#include <sproto.h> 27#include <sproto.h>
34 28
35/* Added times to all the commands. However, this was quickly done, 29/* Added times to all the commands. However, this was quickly done,
36 * and probably needs more refinements. All socket and DM commands 30 * and probably needs more refinements. All socket and DM commands
37 * take 0 time. 31 * take 0 time.
38 */ 32 */
39 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
40/* 42/*
41 * Normal game commands 43 * Normal game commands
42 */ 44 */
43CommArray_s Commands[] = { 45static CommArray_s Commands[] = {
44 {"party", command_party, 1.0}, 46 {"party", command_party, 1.0},
45 {"gsay", command_gsay, 1.0}, 47 {"gsay", command_gsay, 1.0},
46 48
47 {"apply", command_apply, 1.0}, /* should be variable */ 49 {"apply", command_apply, 1.0}, /* should be variable */
48 {"cast", command_cast, 1.0}, /* Is this right? */ 50 {"cast", command_cast, 1.0}, /* Is this right? */
… …
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},
87 89
88 {"mark" , command_mark , 0.0}, 90 {"mark" , command_mark , 0.0},
89 {"run" , command_run , 1.0}, 91 {"run" , command_run , 0.0},
90 {"run_stop" , command_run_stop , 0.0}, 92 {"run_stop" , command_run_stop , 0.0},
91 {"fire" , command_fire , 1.0}, 93 {"fire" , command_fire , 0.0},
92 {"fire_stop", command_fire_stop, 0.0}, 94 {"fire_stop", command_fire_stop, 0.0},
93}; 95};
94const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s); 96static const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s);
95 97
96/* 98/*
97 * Wizard commands (for both) 99 * Wizard commands (for both)
98 */ 100 */
99CommArray_s WizCommands[] = { 101static CommArray_s WizCommands[] = {
100 {"abil", command_abil, 0.0}, 102 {"abil", command_abil, 0.0},
101 {"addexp", command_addexp, 0.0}, 103 {"addexp", command_addexp, 0.0},
102 {"arrest", command_arrest, 0.0}, 104 {"arrest", command_arrest, 0.0},
103 {"create", command_create, 0.0}, 105 {"create", command_create, 0.0},
104 {"debug", command_debug, 0.0}, 106 {"debug", command_debug, 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 = sizeof (WizCommands) / sizeof (CommArray_s);
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 () 163execute_newserver_command (object *pl, char *command)
139{ 164{
140 qsort (Commands, CommandsSize, sizeof (CommArray_s), compare_A); 165 CommArray_s *csp;
141 qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A); 166 char *cp;
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 && QUERY_FLAG (pl, 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->failmsg (format ("'%s' is not a valid command.", command));
200 }
142} 201}
143 202

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines