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.12 by root, Fri Sep 29 19:28:43 2006 UTC vs.
Revision 1.19 by root, Thu Dec 14 22:45:41 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 */
… …
112 {"northeast", command_northeast, 1.0}, 111 {"northeast", command_northeast, 1.0},
113 {"southeast", command_southeast, 1.0}, 112 {"southeast", command_southeast, 1.0},
114 {"southwest", command_southwest, 1.0}, 113 {"southwest", command_southwest, 1.0},
115 {"northwest", command_northwest, 1.0}, 114 {"northwest", command_northwest, 1.0},
116}; 115};
117
118const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s); 116const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s);
119 117
120CommArray_s CommunicationCommands[] = { 118CommArray_s CommunicationCommands[] = {
121 /* begin emotions */ 119 /* begin emotions */
122 {"me", command_me, 0.1}, 120 {"me", command_me, 0.1},
… …
176 {"think", command_think, 0.0}, 174 {"think", command_think, 0.0},
177 {"cointoss", command_cointoss, 0.0}, 175 {"cointoss", command_cointoss, 0.0},
178 {"orcknuckle", command_orcknuckle, 0.0}, 176 {"orcknuckle", command_orcknuckle, 0.0},
179 {"printlos", command_printlos, 0.0}, 177 {"printlos", command_printlos, 0.0},
180}; 178};
181
182const int CommunicationCommandSize = sizeof (CommunicationCommands) / sizeof (CommArray_s); 179const int CommunicationCommandSize = sizeof (CommunicationCommands) / sizeof (CommArray_s);
183 180
184CommArray_s NewServerCommands[] = { 181CommArray_s NewServerCommands[] = {
185 {"run", command_run, 1.0}, 182 {"run", command_run, 1.0},
186 {"run_stop", command_run_stop, 0.0}, 183 {"run_stop", command_run_stop, 0.0},
187 {"fire", command_fire, 1.0}, 184 {"fire", command_fire, 1.0},
188 {"fire_stop", command_fire_stop, 0.0}, 185 {"fire_stop", command_fire_stop, 0.0},
189}; 186};
190
191const int NewServerCommandSize = sizeof (NewServerCommands) / sizeof (CommArray_s); 187const int NewServerCommandSize = sizeof (NewServerCommands) / sizeof (CommArray_s);
192 188
193/* 189/*
194 * Wizard commands (for both) 190 * Wizard commands (for both)
195 */ 191 */
… …
201 {"create", command_create, 0.0}, 197 {"create", command_create, 0.0},
202 {"debug", command_debug, 0.0}, 198 {"debug", command_debug, 0.0},
203 {"dump", command_dump, 0.0}, 199 {"dump", command_dump, 0.0},
204 {"dumpbelow", command_dumpbelow, 0.0}, 200 {"dumpbelow", command_dumpbelow, 0.0},
205 {"dumpfriendlyobjects", command_dumpfriendlyobjects, 0.0}, 201 {"dumpfriendlyobjects", command_dumpfriendlyobjects, 0.0},
206 {"dumpallarchetypes", command_dumpallarchetypes, 0.0},
207 {"dumpallmaps", command_dumpallmaps, 0.0}, 202 {"dumpallmaps", command_dumpallmaps, 0.0},
208 {"dumpallobjects", command_dumpallobjects, 0.0},
209 {"dumpmap", command_dumpmap, 0.0}, 203 {"dumpmap", command_dumpmap, 0.0},
210 {"forget_spell", command_forget_spell, 0.0}, 204 {"forget_spell", command_forget_spell, 0.0},
211 {"free", command_free, 0.0}, 205 {"free", command_free, 0.0},
212 {"freeze", command_freeze, 0.0}, 206 {"freeze", command_freeze, 0.0},
213 {"goto", command_goto, 0.0},
214 {"hide", command_hide, 0.0}, 207 {"hide", command_hide, 0.0},
215 {"insert_into", command_insert_into, 0.0}, 208 {"insert_into", command_insert_into, 0.0},
216 {"invisible", command_invisible, 0.0}, 209 {"invisible", command_invisible, 0.0},
217 {"kick", command_kick, 0.0}, 210 {"kick", command_kick, 0.0},
218 {"learn_special_prayer", command_learn_special_prayer, 0.0}, 211 {"learn_special_prayer", command_learn_special_prayer, 0.0},
… …
237 {"stack_push", command_stack_push, 0.0}, 230 {"stack_push", command_stack_push, 0.0},
238 {"stats", command_stats, 0.0}, 231 {"stats", command_stats, 0.0},
239 {"style_info", command_style_map_info, 0.0}, /* Costly command, so make it wiz only */ 232 {"style_info", command_style_map_info, 0.0}, /* Costly command, so make it wiz only */
240 {"summon", command_summon, 0.0}, 233 {"summon", command_summon, 0.0},
241 {"teleport", command_teleport, 0.0}, 234 {"teleport", command_teleport, 0.0},
242 {"wizpass", command_wizpass, 0.0},
243 {"wizcast", command_wizcast, 0.0},
244 {"overlay_save", command_save_overlay, 0.0}, 235 {"overlay_save", command_save_overlay, 0.0},
245 236
246/* {"possess", command_possess, 0.0}, */ 237/* {"possess", command_possess, 0.0}, */
247 {"mon_aggr", command_mon_aggr, 0.0}, 238 {"mon_aggr", command_mon_aggr, 0.0},
248 {"loadtest", command_loadtest, 0.0},
249}; 239};
250const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s); 240const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s);
251 241
252/* Socket commands - these should really do nothing more than output things 242/* Socket commands - these should really do nothing more than output things
253 * to the various players/sockets. 243 * to the various players/sockets.
… …
258 {"maps", command_maps, 0.0}, 248 {"maps", command_maps, 0.0},
259 {"motd", command_motd, 0.0}, 249 {"motd", command_motd, 0.0},
260 {"players", command_players, 0.0}, 250 {"players", command_players, 0.0},
261 {"version", command_version, 0.0}, 251 {"version", command_version, 0.0},
262}; 252};
263
264const int Socket_CommandsSize = sizeof (Socket_Commands) / sizeof (CommArray_s); 253const int Socket_CommandsSize = sizeof (Socket_Commands) / sizeof (CommArray_s);
265
266 254
267/* Socket commands - these should really do nothing more than output things 255/* Socket commands - these should really do nothing more than output things
268 * to the various players/sockets. 256 * to the various players/sockets.
269 */ 257 */
270CommArray_s Socket2_Commands[] = { 258CommArray_s Socket2_Commands[] = {
271}; 259};
272
273const int Socket2_CommandsSize = sizeof (Socket2_Commands) / sizeof (CommArray_s); 260const int Socket2_CommandsSize = sizeof (Socket2_Commands) / sizeof (CommArray_s);
274
275
276 261
277static int 262static int
278compare_A (const void *a, const void *b) 263compare_A (const void *a, const void *b)
279{ 264{
280 return strcmp (((CommArray_s *) a)->name, ((CommArray_s *) b)->name); 265 return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name);
281} 266}
282 267
283void 268void
284init_commands (void) 269init_commands (void)
285{ 270{
… …
289 qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A); 274 qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A);
290 qsort (Socket_Commands, Socket_CommandsSize, sizeof (CommArray_s), compare_A); 275 qsort (Socket_Commands, Socket_CommandsSize, sizeof (CommArray_s), compare_A);
291 qsort (Socket2_Commands, Socket2_CommandsSize, sizeof (CommArray_s), compare_A); 276 qsort (Socket2_Commands, Socket2_CommandsSize, sizeof (CommArray_s), compare_A);
292} 277}
293 278
294#ifndef tolower
295# define tolower(C) (((C) >= 'A' && (C) <= 'Z')? (C) - 'A' + 'a': (C))
296#endif
297
298
299CommFunc
300find_oldsocket_command (char *cmd)
301{
302 CommArray_s *asp, dummy;
303 char *cp;
304
305 for (cp = cmd; *cp; cp++)
306 {
307 *cp = tolower (*cp);
308 }
309
310 dummy.name = cmd;
311 asp = (CommArray_s *) bsearch ((void *) &dummy, (void *) Socket_Commands, Socket_CommandsSize, sizeof (CommArray_s), compare_A);
312 if (asp)
313 return asp->func;
314 return NULL;
315}
316
317CommFunc
318find_oldsocket_command2 (char *cmd)
319{
320 CommArray_s *asp, dummy;
321 char *cp;
322
323 for (cp = cmd; *cp; cp++)
324 {
325 *cp = tolower (*cp);
326 }
327
328 dummy.name = cmd;
329 asp = (CommArray_s *) bsearch ((void *) &dummy, (void *) Socket2_Commands, Socket2_CommandsSize, sizeof (CommArray_s), compare_A);
330 if (asp)
331 return asp->func;
332 return NULL;
333}

Diff Legend

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