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.16 by root, Tue Nov 7 16:30:55 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},
112 {"northeast", command_northeast, 1.0}, 110 {"northeast", command_northeast, 1.0},
113 {"southeast", command_southeast, 1.0}, 111 {"southeast", command_southeast, 1.0},
114 {"southwest", command_southwest, 1.0}, 112 {"southwest", command_southwest, 1.0},
115 {"northwest", command_northwest, 1.0}, 113 {"northwest", command_northwest, 1.0},
116}; 114};
117
118const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s); 115const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s);
119 116
120CommArray_s CommunicationCommands[] = { 117CommArray_s CommunicationCommands[] = {
121 /* begin emotions */ 118 /* begin emotions */
122 {"me", command_me, 0.1}, 119 {"me", command_me, 0.1},
176 {"think", command_think, 0.0}, 173 {"think", command_think, 0.0},
177 {"cointoss", command_cointoss, 0.0}, 174 {"cointoss", command_cointoss, 0.0},
178 {"orcknuckle", command_orcknuckle, 0.0}, 175 {"orcknuckle", command_orcknuckle, 0.0},
179 {"printlos", command_printlos, 0.0}, 176 {"printlos", command_printlos, 0.0},
180}; 177};
181
182const int CommunicationCommandSize = sizeof (CommunicationCommands) / sizeof (CommArray_s); 178const int CommunicationCommandSize = sizeof (CommunicationCommands) / sizeof (CommArray_s);
183 179
184CommArray_s NewServerCommands[] = { 180CommArray_s NewServerCommands[] = {
185 {"run", command_run, 1.0}, 181 {"run", command_run, 1.0},
186 {"run_stop", command_run_stop, 0.0}, 182 {"run_stop", command_run_stop, 0.0},
187 {"fire", command_fire, 1.0}, 183 {"fire", command_fire, 1.0},
188 {"fire_stop", command_fire_stop, 0.0}, 184 {"fire_stop", command_fire_stop, 0.0},
189}; 185};
190
191const int NewServerCommandSize = sizeof (NewServerCommands) / sizeof (CommArray_s); 186const int NewServerCommandSize = sizeof (NewServerCommands) / sizeof (CommArray_s);
192 187
193/* 188/*
194 * Wizard commands (for both) 189 * Wizard commands (for both)
195 */ 190 */
201 {"create", command_create, 0.0}, 196 {"create", command_create, 0.0},
202 {"debug", command_debug, 0.0}, 197 {"debug", command_debug, 0.0},
203 {"dump", command_dump, 0.0}, 198 {"dump", command_dump, 0.0},
204 {"dumpbelow", command_dumpbelow, 0.0}, 199 {"dumpbelow", command_dumpbelow, 0.0},
205 {"dumpfriendlyobjects", command_dumpfriendlyobjects, 0.0}, 200 {"dumpfriendlyobjects", command_dumpfriendlyobjects, 0.0},
206 {"dumpallmaps", command_dumpallmaps, 0.0},
207 {"dumpmap", command_dumpmap, 0.0},
208 {"forget_spell", command_forget_spell, 0.0}, 201 {"forget_spell", command_forget_spell, 0.0},
209 {"free", command_free, 0.0}, 202 {"free", command_free, 0.0},
210 {"freeze", command_freeze, 0.0}, 203 {"freeze", command_freeze, 0.0},
211 {"hide", command_hide, 0.0}, 204 {"hide", command_hide, 0.0},
212 {"insert_into", command_insert_into, 0.0}, 205 {"insert_into", command_insert_into, 0.0},
223 {"plugout", command_unloadplugin, 0.0}, 216 {"plugout", command_unloadplugin, 0.0},
224 {"nodm", command_nowiz, 0.0}, 217 {"nodm", command_nowiz, 0.0},
225 {"nowiz", command_nowiz, 0.0}, 218 {"nowiz", command_nowiz, 0.0},
226 {"patch", command_patch, 0.0}, 219 {"patch", command_patch, 0.0},
227 {"remove", command_remove, 0.0}, 220 {"remove", command_remove, 0.0},
228 {"reset", command_reset, 0.0},
229 {"set_god", command_setgod, 0.0}, 221 {"set_god", command_setgod, 0.0},
230 {"shutdown", command_shutdown, 0.0}, 222 {"shutdown", command_shutdown, 0.0},
231 {"stack_clear", command_stack_clear, 0.0}, 223 {"stack_clear", command_stack_clear, 0.0},
232 {"stack_list", command_stack_list, 0.0}, 224 {"stack_list", command_stack_list, 0.0},
233 {"stack_pop", command_stack_pop, 0.0}, 225 {"stack_pop", command_stack_pop, 0.0},
234 {"stack_push", command_stack_push, 0.0}, 226 {"stack_push", command_stack_push, 0.0},
235 {"stats", command_stats, 0.0}, 227 {"stats", command_stats, 0.0},
236 {"style_info", command_style_map_info, 0.0}, /* Costly command, so make it wiz only */
237 {"summon", command_summon, 0.0}, 228 {"summon", command_summon, 0.0},
238 {"teleport", command_teleport, 0.0}, 229 {"teleport", command_teleport, 0.0},
239 {"overlay_save", command_save_overlay, 0.0}, 230 //{"overlay_save", command_save_overlay, 0.0},
240 231
241/* {"possess", command_possess, 0.0}, */ 232/* {"possess", command_possess, 0.0}, */
242 {"mon_aggr", command_mon_aggr, 0.0}, 233 {"mon_aggr", command_mon_aggr, 0.0},
243}; 234};
244const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s); 235const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s);
247 * to the various players/sockets. 238 * to the various players/sockets.
248 */ 239 */
249CommArray_s Socket_Commands[] = { 240CommArray_s Socket_Commands[] = {
250 {"hiscore", command_hiscore, 0.0}, 241 {"hiscore", command_hiscore, 0.0},
251 {"logs", command_logs, 0.0}, 242 {"logs", command_logs, 0.0},
252 {"maps", command_maps, 0.0},
253 {"motd", command_motd, 0.0}, 243 {"motd", command_motd, 0.0},
254 {"players", command_players, 0.0}, 244 {"players", command_players, 0.0},
255 {"version", command_version, 0.0}, 245 {"version", command_version, 0.0},
256}; 246};
257
258const int Socket_CommandsSize = sizeof (Socket_Commands) / sizeof (CommArray_s); 247const int Socket_CommandsSize = sizeof (Socket_Commands) / sizeof (CommArray_s);
259
260 248
261/* Socket commands - these should really do nothing more than output things 249/* Socket commands - these should really do nothing more than output things
262 * to the various players/sockets. 250 * to the various players/sockets.
263 */ 251 */
264CommArray_s Socket2_Commands[] = { 252CommArray_s Socket2_Commands[] = {
265}; 253};
266
267const int Socket2_CommandsSize = sizeof (Socket2_Commands) / sizeof (CommArray_s); 254const int Socket2_CommandsSize = sizeof (Socket2_Commands) / sizeof (CommArray_s);
268
269
270 255
271static int 256static int
272compare_A (const void *a, const void *b) 257compare_A (const void *a, const void *b)
273{ 258{
274 return strcmp (((CommArray_s *) a)->name, ((CommArray_s *) b)->name); 259 return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name);
275} 260}
276 261
277void 262void
278init_commands (void) 263init_commands (void)
279{ 264{
283 qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A); 268 qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A);
284 qsort (Socket_Commands, Socket_CommandsSize, sizeof (CommArray_s), compare_A); 269 qsort (Socket_Commands, Socket_CommandsSize, sizeof (CommArray_s), compare_A);
285 qsort (Socket2_Commands, Socket2_CommandsSize, sizeof (CommArray_s), compare_A); 270 qsort (Socket2_Commands, Socket2_CommandsSize, sizeof (CommArray_s), compare_A);
286} 271}
287 272
288#ifndef tolower
289# define tolower(C) (((C) >= 'A' && (C) <= 'Z')? (C) - 'A' + 'a': (C))
290#endif
291
292
293CommFunc
294find_oldsocket_command (char *cmd)
295{
296 CommArray_s *asp, dummy;
297 char *cp;
298
299 for (cp = cmd; *cp; cp++)
300 {
301 *cp = tolower (*cp);
302 }
303
304 dummy.name = cmd;
305 asp = (CommArray_s *) bsearch ((void *) &dummy, (void *) Socket_Commands, Socket_CommandsSize, sizeof (CommArray_s), compare_A);
306 if (asp)
307 return asp->func;
308 return NULL;
309}
310
311CommFunc
312find_oldsocket_command2 (char *cmd)
313{
314 CommArray_s *asp, dummy;
315 char *cp;
316
317 for (cp = cmd; *cp; cp++)
318 {
319 *cp = tolower (*cp);
320 }
321
322 dummy.name = cmd;
323 asp = (CommArray_s *) bsearch ((void *) &dummy, (void *) Socket2_Commands, Socket2_CommandsSize, sizeof (CommArray_s), compare_A);
324 if (asp)
325 return asp->func;
326 return NULL;
327}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines