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.11 by root, Thu Sep 14 22:34:03 2006 UTC vs.
Revision 1.20 by root, Sat Dec 30 10:16:11 2006 UTC

… …
23 23
24/* 24/*
25 * Command parser 25 * Command parser
26 */ 26 */
27 27
28#include <cctype>
29
28#include <global.h> 30#include <global.h>
29#include <commands.h> 31#include <commands.h>
30#ifndef __CEXTRACT__
31# include <sproto.h> 32#include <sproto.h>
32#endif
33#include <ctype.h>
34 33
35/* Added times to all the commands. However, this was quickly done, 34/* Added times to all the commands. However, this was quickly done,
36 * and probably needs more refinements. All socket and DM commands 35 * and probably needs more refinements. All socket and DM commands
37 * take 0 time. 36 * take 0 time.
38 */ 37 */
… …
67 {"inventory", command_inventory, 0.0}, 66 {"inventory", command_inventory, 0.0},
68 {"invoke", command_invoke, 1.0}, 67 {"invoke", command_invoke, 1.0},
69 {"killpets", command_kill_pets, 0.0}, 68 {"killpets", command_kill_pets, 0.0},
70 {"listen", command_listen, 0.0}, 69 {"listen", command_listen, 0.0},
71 {"logs", command_logs, 0.0}, 70 {"logs", command_logs, 0.0},
72 {"maps", command_maps, 0.0},
73 {"mapinfo", command_mapinfo, 0.0}, 71 {"mapinfo", command_mapinfo, 0.0},
74 {"mark", command_mark, 0.0}, 72 {"mark", command_mark, 0.0},
75 {"motd", command_motd, 0.0}, 73 {"motd", command_motd, 0.0},
76 {"output-sync", command_output_sync, 0.0}, 74 {"output-sync", command_output_sync, 0.0},
77 {"output-count", command_output_count, 0.0}, 75 {"output-count", command_output_count, 0.0},
… …
99 {"usekeys", command_usekeys, 0.0}, 97 {"usekeys", command_usekeys, 0.0},
100 {"bowmode", command_bowmode, 0.0}, 98 {"bowmode", command_bowmode, 0.0},
101 {"petmode", command_petmode, 0.0}, 99 {"petmode", command_petmode, 0.0},
102 {"version", command_version, 0.0}, 100 {"version", command_version, 0.0},
103 {"wimpy", command_wimpy, 0.0}, 101 {"wimpy", command_wimpy, 0.0},
104 {"who", command_who, 0.0},
105 {"afk", command_afk, 0.0}, 102 {"afk", command_afk, 0.0},
106 103
107 {"stay", command_stay, 1.0}, /* 1.0 because it is used when using a 104 {"stay", command_stay, 1.0}, /* 1.0 because it is used when using a
108 * skill on yourself */ 105 * skill on yourself */
109 {"north", command_north, 1.0}, 106 {"north", command_north, 1.0},
… …
113 {"northeast", command_northeast, 1.0}, 110 {"northeast", command_northeast, 1.0},
114 {"southeast", command_southeast, 1.0}, 111 {"southeast", command_southeast, 1.0},
115 {"southwest", command_southwest, 1.0}, 112 {"southwest", command_southwest, 1.0},
116 {"northwest", command_northwest, 1.0}, 113 {"northwest", command_northwest, 1.0},
117}; 114};
118
119const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s); 115const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s);
120 116
121CommArray_s CommunicationCommands[] = { 117CommArray_s CommunicationCommands[] = {
122 /* begin emotions */ 118 /* begin emotions */
123 {"me", command_me, 0.1} 119 {"me", command_me, 0.1},
124 ,
125 {"nod", command_nod, 0.0} 120 {"nod", command_nod, 0.0},
126 ,
127 {"dance", command_dance, 0.0} 121 {"dance", command_dance, 0.0},
128 ,
129 {"kiss", command_kiss, 0.0} 122 {"kiss", command_kiss, 0.0},
130 ,
131 {"bounce", command_bounce, 0.0} 123 {"bounce", command_bounce, 0.0},
132 ,
133 {"smile", command_smile, 0.0} 124 {"smile", command_smile, 0.0},
134 ,
135 {"cackle", command_cackle, 0.0} 125 {"cackle", command_cackle, 0.0},
136 ,
137 {"laugh", command_laugh, 0.0} 126 {"laugh", command_laugh, 0.0},
138 ,
139 {"giggle", command_giggle, 0.0} 127 {"giggle", command_giggle, 0.0},
140 ,
141 {"shake", command_shake, 0.0} 128 {"shake", command_shake, 0.0},
142 ,
143 {"puke", command_puke, 0.0} 129 {"puke", command_puke, 0.0},
144 ,
145 {"growl", command_growl, 0.0} 130 {"growl", command_growl, 0.0},
146 ,
147 {"scream", command_scream, 0.0} 131 {"scream", command_scream, 0.0},
148 ,
149 {"sigh", command_sigh, 0.0} 132 {"sigh", command_sigh, 0.0},
150 ,
151 {"sulk", command_sulk, 0.0} 133 {"sulk", command_sulk, 0.0},
152 ,
153 {"hug", command_hug, 0.0} 134 {"hug", command_hug, 0.0},
154 ,
155 {"cry", command_cry, 0.0} 135 {"cry", command_cry, 0.0},
156 ,
157 {"poke", command_poke, 0.0} 136 {"poke", command_poke, 0.0},
158 ,
159 {"accuse", command_accuse, 0.0} 137 {"accuse", command_accuse, 0.0},
160 ,
161 {"grin", command_grin, 0.0} 138 {"grin", command_grin, 0.0},
162 ,
163 {"bow", command_bow, 0.0} 139 {"bow", command_bow, 0.0},
164 ,
165 {"clap", command_clap, 0.0} 140 {"clap", command_clap, 0.0},
166 ,
167 {"blush", command_blush, 0.0} 141 {"blush", command_blush, 0.0},
168 ,
169 {"burp", command_burp, 0.0} 142 {"burp", command_burp, 0.0},
170 ,
171 {"chuckle", command_chuckle, 0.0} 143 {"chuckle", command_chuckle, 0.0},
172 ,
173 {"cough", command_cough, 0.0} 144 {"cough", command_cough, 0.0},
174 ,
175 {"flip", command_flip, 0.0} 145 {"flip", command_flip, 0.0},
176 ,
177 {"frown", command_frown, 0.0} 146 {"frown", command_frown, 0.0},
178 ,
179 {"gasp", command_gasp, 0.0} 147 {"gasp", command_gasp, 0.0},
180 ,
181 {"glare", command_glare, 0.0} 148 {"glare", command_glare, 0.0},
182 ,
183 {"groan", command_groan, 0.0} 149 {"groan", command_groan, 0.0},
184 ,
185 {"hiccup", command_hiccup, 0.0} 150 {"hiccup", command_hiccup, 0.0},
186 ,
187 {"lick", command_lick, 0.0} 151 {"lick", command_lick, 0.0},
188 ,
189 {"pout", command_pout, 0.0} 152 {"pout", command_pout, 0.0},
190 ,
191 {"shiver", command_shiver, 0.0} 153 {"shiver", command_shiver, 0.0},
192 ,
193 {"shrug", command_shrug, 0.0} 154 {"shrug", command_shrug, 0.0},
194 ,
195 {"slap", command_slap, 0.0} 155 {"slap", command_slap, 0.0},
196 ,
197 {"smirk", command_smirk, 0.0} 156 {"smirk", command_smirk, 0.0},
198 ,
199 {"snap", command_snap, 0.0} 157 {"snap", command_snap, 0.0},
200 ,
201 {"sneeze", command_sneeze, 0.0} 158 {"sneeze", command_sneeze, 0.0},
202 ,
203 {"snicker", command_snicker, 0.0} 159 {"snicker", command_snicker, 0.0},
204 ,
205 {"sniff", command_sniff, 0.0} 160 {"sniff", command_sniff, 0.0},
206 ,
207 {"snore", command_snore, 0.0} 161 {"snore", command_snore, 0.0},
208 ,
209 {"spit", command_spit, 0.0} 162 {"spit", command_spit, 0.0},
210 ,
211 {"strut", command_strut, 0.0} 163 {"strut", command_strut, 0.0},
212 ,
213 {"thank", command_thank, 0.0} 164 {"thank", command_thank, 0.0},
214 ,
215 {"twiddle", command_twiddle, 0.0} 165 {"twiddle", command_twiddle, 0.0},
216 ,
217 {"wave", command_wave, 0.0} 166 {"wave", command_wave, 0.0},
218 ,
219 {"whistle", command_whistle, 0.0} 167 {"whistle", command_whistle, 0.0},
220 ,
221 {"wink", command_wink, 0.0} 168 {"wink", command_wink, 0.0},
222 ,
223 {"yawn", command_yawn, 0.0} 169 {"yawn", command_yawn, 0.0},
224 ,
225 {"beg", command_beg, 0.0} 170 {"beg", command_beg, 0.0},
226 ,
227 {"bleed", command_bleed, 0.0} 171 {"bleed", command_bleed, 0.0},
228 ,
229 {"cringe", command_cringe, 0.0} 172 {"cringe", command_cringe, 0.0},
230 ,
231 {"think", command_think, 0.0} 173 {"think", command_think, 0.0},
232 ,
233 {"cointoss", command_cointoss, 0.0} 174 {"cointoss", command_cointoss, 0.0},
234 ,
235 {"orcknuckle", command_orcknuckle, 0.0} 175 {"orcknuckle", command_orcknuckle, 0.0},
236 ,
237 {"printlos", command_printlos, 0.0} 176 {"printlos", command_printlos, 0.0},
238 ,
239}; 177};
240
241const int CommunicationCommandSize = sizeof (CommunicationCommands) / sizeof (CommArray_s); 178const int CommunicationCommandSize = sizeof (CommunicationCommands) / sizeof (CommArray_s);
242 179
243CommArray_s NewServerCommands[] = { 180CommArray_s NewServerCommands[] = {
244 {"run", command_run, 1.0} 181 {"run", command_run, 1.0},
245 ,
246 {"run_stop", command_run_stop, 0.0} 182 {"run_stop", command_run_stop, 0.0},
247 ,
248 {"fire", command_fire, 1.0} 183 {"fire", command_fire, 1.0},
249 ,
250 {"fire_stop", command_fire_stop, 0.0} 184 {"fire_stop", command_fire_stop, 0.0},
251}; 185};
252
253const int NewServerCommandSize = sizeof (NewServerCommands) / sizeof (CommArray_s); 186const int NewServerCommandSize = sizeof (NewServerCommands) / sizeof (CommArray_s);
254 187
255/* 188/*
256 * Wizard commands (for both) 189 * Wizard commands (for both)
257 */ 190 */
258CommArray_s WizCommands[] = { 191CommArray_s WizCommands[] = {
259 {"abil", command_abil, 0.0} 192 {"abil", command_abil, 0.0},
260 ,
261 {"addexp", command_addexp, 0.0} 193 {"addexp", command_addexp, 0.0},
262 ,
263 {"arrest", command_arrest, 0.0} 194 {"arrest", command_arrest, 0.0},
264 ,
265 {"banish", command_banish, 0.0} 195 {"banish", command_banish, 0.0},
266 ,
267 {"create", command_create, 0.0} 196 {"create", command_create, 0.0},
268 ,
269 {"debug", command_debug, 0.0} 197 {"debug", command_debug, 0.0},
270 ,
271 {"dump", command_dump, 0.0} 198 {"dump", command_dump, 0.0},
272 ,
273 {"dumpbelow", command_dumpbelow, 0.0} 199 {"dumpbelow", command_dumpbelow, 0.0},
274 ,
275 {"dumpfriendlyobjects", command_dumpfriendlyobjects, 0.0} 200 {"dumpfriendlyobjects", command_dumpfriendlyobjects, 0.0},
276 ,
277 {"dumpallarchetypes", command_dumpallarchetypes, 0.0}
278 ,
279 {"dumpallmaps", command_dumpallmaps, 0.0}
280 ,
281 {"dumpallobjects", command_dumpallobjects, 0.0}
282 ,
283 {"dumpmap", command_dumpmap, 0.0}
284 ,
285 {"forget_spell", command_forget_spell, 0.0} 201 {"forget_spell", command_forget_spell, 0.0},
286 ,
287 {"free", command_free, 0.0} 202 {"free", command_free, 0.0},
288 ,
289 {"freeze", command_freeze, 0.0} 203 {"freeze", command_freeze, 0.0},
290 ,
291 {"goto", command_goto, 0.0}
292 ,
293 {"hide", command_hide, 0.0} 204 {"hide", command_hide, 0.0},
294 ,
295 {"insert_into", command_insert_into, 0.0} 205 {"insert_into", command_insert_into, 0.0},
296 ,
297 {"invisible", command_invisible, 0.0} 206 {"invisible", command_invisible, 0.0},
298 ,
299 {"kick", command_kick, 0.0} 207 {"kick", command_kick, 0.0},
300 ,
301 {"learn_special_prayer", command_learn_special_prayer, 0.0} 208 {"learn_special_prayer", command_learn_special_prayer, 0.0},
302 ,
303 {"learn_spell", command_learn_spell, 0.0} 209 {"learn_spell", command_learn_spell, 0.0},
304 ,
305#ifdef DEBUG_MALLOC_LEVEL 210#ifdef DEBUG_MALLOC_LEVEL
306 {"verify", command_malloc_verify, 0.0} 211 {"verify", command_malloc_verify, 0.0},
307 ,
308#endif 212#endif
309 {"players", command_players, 0.0} 213 {"players", command_players, 0.0},
310 ,
311 {"plugin", command_loadplugin, 0.0} 214 {"plugin", command_loadplugin, 0.0},
312 ,
313 {"pluglist", command_listplugins, 0.0} 215 {"pluglist", command_listplugins, 0.0},
314 ,
315 {"plugout", command_unloadplugin, 0.0} 216 {"plugout", command_unloadplugin, 0.0},
316 ,
317 {"nodm", command_nowiz, 0.0} 217 {"nodm", command_nowiz, 0.0},
318 ,
319 {"nowiz", command_nowiz, 0.0} 218 {"nowiz", command_nowiz, 0.0},
320 ,
321 {"patch", command_patch, 0.0} 219 {"patch", command_patch, 0.0},
322 ,
323 {"remove", command_remove, 0.0} 220 {"remove", command_remove, 0.0},
324 ,
325 {"reset", command_reset, 0.0}
326 ,
327 {"set_god", command_setgod, 0.0} 221 {"set_god", command_setgod, 0.0},
328 ,
329 {"shutdown", command_shutdown, 0.0} 222 {"shutdown", command_shutdown, 0.0},
330 ,
331 {"stack_clear", command_stack_clear, 0.0} 223 {"stack_clear", command_stack_clear, 0.0},
332 ,
333 {"stack_list", command_stack_list, 0.0} 224 {"stack_list", command_stack_list, 0.0},
334 ,
335 {"stack_pop", command_stack_pop, 0.0} 225 {"stack_pop", command_stack_pop, 0.0},
336 ,
337 {"stack_push", command_stack_push, 0.0} 226 {"stack_push", command_stack_push, 0.0},
338 ,
339 {"stats", command_stats, 0.0} 227 {"stats", command_stats, 0.0},
340 ,
341 {"style_info", command_style_map_info, 0.0}
342 , /* Costly command, so make it wiz only */
343 {"summon", command_summon, 0.0} 228 {"summon", command_summon, 0.0},
344 ,
345 {"teleport", command_teleport, 0.0} 229 {"teleport", command_teleport, 0.0},
346 ,
347 {"wizpass", command_wizpass, 0.0}
348 ,
349 {"wizcast", command_wizcast, 0.0}
350 ,
351 {"overlay_save", command_save_overlay, 0.0} 230 //{"overlay_save", command_save_overlay, 0.0},
352 ,
353 231
354/* {"possess", command_possess, 0.0}, */ 232/* {"possess", command_possess, 0.0}, */
355 {"mon_aggr", command_mon_aggr, 0.0} 233 {"mon_aggr", command_mon_aggr, 0.0},
356 ,
357 {"loadtest", command_loadtest, 0.0}
358 ,
359}; 234};
360const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s); 235const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s);
361 236
362/* Socket commands - these should really do nothing more than output things 237/* Socket commands - these should really do nothing more than output things
363 * to the various players/sockets. 238 * to the various players/sockets.
364 */ 239 */
365CommArray_s Socket_Commands[] = { 240CommArray_s Socket_Commands[] = {
366 {"hiscore", command_hiscore, 0.0} 241 {"hiscore", command_hiscore, 0.0},
367 ,
368 {"logs", command_logs, 0.0} 242 {"logs", command_logs, 0.0},
369 ,
370 {"maps", command_maps, 0.0}
371 ,
372 {"motd", command_motd, 0.0} 243 {"motd", command_motd, 0.0},
373 ,
374 {"players", command_players, 0.0} 244 {"players", command_players, 0.0},
375 ,
376 {"version", command_version, 0.0} 245 {"version", command_version, 0.0},
377 ,
378 {"who", command_who, 0.0}
379 ,
380}; 246};
381
382const int Socket_CommandsSize = sizeof (Socket_Commands) / sizeof (CommArray_s); 247const int Socket_CommandsSize = sizeof (Socket_Commands) / sizeof (CommArray_s);
383
384 248
385/* Socket commands - these should really do nothing more than output things 249/* Socket commands - these should really do nothing more than output things
386 * to the various players/sockets. 250 * to the various players/sockets.
387 */ 251 */
388CommArray_s Socket2_Commands[] = { 252CommArray_s Socket2_Commands[] = {
389}; 253};
390
391const int Socket2_CommandsSize = sizeof (Socket2_Commands) / sizeof (CommArray_s); 254const int Socket2_CommandsSize = sizeof (Socket2_Commands) / sizeof (CommArray_s);
392
393
394 255
395static int 256static int
396compare_A (const void *a, const void *b) 257compare_A (const void *a, const void *b)
397{ 258{
398 return strcmp (((CommArray_s *) a)->name, ((CommArray_s *) b)->name); 259 return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name);
399} 260}
400 261
401void 262void
402init_commands (void) 263init_commands (void)
403{ 264{
… …
407 qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A); 268 qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A);
408 qsort (Socket_Commands, Socket_CommandsSize, sizeof (CommArray_s), compare_A); 269 qsort (Socket_Commands, Socket_CommandsSize, sizeof (CommArray_s), compare_A);
409 qsort (Socket2_Commands, Socket2_CommandsSize, sizeof (CommArray_s), compare_A); 270 qsort (Socket2_Commands, Socket2_CommandsSize, sizeof (CommArray_s), compare_A);
410} 271}
411 272
412#ifndef tolower
413# define tolower(C) (((C) >= 'A' && (C) <= 'Z')? (C) - 'A' + 'a': (C))
414#endif
415
416
417CommFunc
418find_oldsocket_command (char *cmd)
419{
420 CommArray_s *asp, dummy;
421 char *cp;
422
423 for (cp = cmd; *cp; cp++)
424 {
425 *cp = tolower (*cp);
426 }
427
428 dummy.name = cmd;
429 asp = (CommArray_s *) bsearch ((void *) &dummy, (void *) Socket_Commands, Socket_CommandsSize, sizeof (CommArray_s), compare_A);
430 if (asp)
431 return asp->func;
432 return NULL;
433}
434
435CommFunc
436find_oldsocket_command2 (char *cmd)
437{
438 CommArray_s *asp, dummy;
439 char *cp;
440
441 for (cp = cmd; *cp; cp++)
442 {
443 *cp = tolower (*cp);
444 }
445
446 dummy.name = cmd;
447 asp = (CommArray_s *) bsearch ((void *) &dummy, (void *) Socket2_Commands, Socket2_CommandsSize, sizeof (CommArray_s), compare_A);
448 if (asp)
449 return asp->func;
450 return NULL;
451}

Diff Legend

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