--- deliantra/server/server/commands.C 2006/09/14 22:34:03 1.11 +++ deliantra/server/server/commands.C 2006/11/07 16:30:55 1.16 @@ -101,7 +101,6 @@ {"petmode", command_petmode, 0.0}, {"version", command_version, 0.0}, {"wimpy", command_wimpy, 0.0}, - {"who", command_who, 0.0}, {"afk", command_afk, 0.0}, {"stay", command_stay, 1.0}, /* 1.0 because it is used when using a @@ -120,134 +119,73 @@ CommArray_s CommunicationCommands[] = { /* begin emotions */ - {"me", command_me, 0.1} - , - {"nod", command_nod, 0.0} - , - {"dance", command_dance, 0.0} - , - {"kiss", command_kiss, 0.0} - , - {"bounce", command_bounce, 0.0} - , - {"smile", command_smile, 0.0} - , - {"cackle", command_cackle, 0.0} - , - {"laugh", command_laugh, 0.0} - , - {"giggle", command_giggle, 0.0} - , - {"shake", command_shake, 0.0} - , - {"puke", command_puke, 0.0} - , - {"growl", command_growl, 0.0} - , - {"scream", command_scream, 0.0} - , - {"sigh", command_sigh, 0.0} - , - {"sulk", command_sulk, 0.0} - , - {"hug", command_hug, 0.0} - , - {"cry", command_cry, 0.0} - , - {"poke", command_poke, 0.0} - , - {"accuse", command_accuse, 0.0} - , - {"grin", command_grin, 0.0} - , - {"bow", command_bow, 0.0} - , - {"clap", command_clap, 0.0} - , - {"blush", command_blush, 0.0} - , - {"burp", command_burp, 0.0} - , - {"chuckle", command_chuckle, 0.0} - , - {"cough", command_cough, 0.0} - , - {"flip", command_flip, 0.0} - , - {"frown", command_frown, 0.0} - , - {"gasp", command_gasp, 0.0} - , - {"glare", command_glare, 0.0} - , - {"groan", command_groan, 0.0} - , - {"hiccup", command_hiccup, 0.0} - , - {"lick", command_lick, 0.0} - , - {"pout", command_pout, 0.0} - , - {"shiver", command_shiver, 0.0} - , - {"shrug", command_shrug, 0.0} - , - {"slap", command_slap, 0.0} - , - {"smirk", command_smirk, 0.0} - , - {"snap", command_snap, 0.0} - , - {"sneeze", command_sneeze, 0.0} - , - {"snicker", command_snicker, 0.0} - , - {"sniff", command_sniff, 0.0} - , - {"snore", command_snore, 0.0} - , - {"spit", command_spit, 0.0} - , - {"strut", command_strut, 0.0} - , - {"thank", command_thank, 0.0} - , - {"twiddle", command_twiddle, 0.0} - , - {"wave", command_wave, 0.0} - , - {"whistle", command_whistle, 0.0} - , - {"wink", command_wink, 0.0} - , - {"yawn", command_yawn, 0.0} - , - {"beg", command_beg, 0.0} - , - {"bleed", command_bleed, 0.0} - , - {"cringe", command_cringe, 0.0} - , - {"think", command_think, 0.0} - , - {"cointoss", command_cointoss, 0.0} - , - {"orcknuckle", command_orcknuckle, 0.0} - , - {"printlos", command_printlos, 0.0} - , + {"me", command_me, 0.1}, + {"nod", command_nod, 0.0}, + {"dance", command_dance, 0.0}, + {"kiss", command_kiss, 0.0}, + {"bounce", command_bounce, 0.0}, + {"smile", command_smile, 0.0}, + {"cackle", command_cackle, 0.0}, + {"laugh", command_laugh, 0.0}, + {"giggle", command_giggle, 0.0}, + {"shake", command_shake, 0.0}, + {"puke", command_puke, 0.0}, + {"growl", command_growl, 0.0}, + {"scream", command_scream, 0.0}, + {"sigh", command_sigh, 0.0}, + {"sulk", command_sulk, 0.0}, + {"hug", command_hug, 0.0}, + {"cry", command_cry, 0.0}, + {"poke", command_poke, 0.0}, + {"accuse", command_accuse, 0.0}, + {"grin", command_grin, 0.0}, + {"bow", command_bow, 0.0}, + {"clap", command_clap, 0.0}, + {"blush", command_blush, 0.0}, + {"burp", command_burp, 0.0}, + {"chuckle", command_chuckle, 0.0}, + {"cough", command_cough, 0.0}, + {"flip", command_flip, 0.0}, + {"frown", command_frown, 0.0}, + {"gasp", command_gasp, 0.0}, + {"glare", command_glare, 0.0}, + {"groan", command_groan, 0.0}, + {"hiccup", command_hiccup, 0.0}, + {"lick", command_lick, 0.0}, + {"pout", command_pout, 0.0}, + {"shiver", command_shiver, 0.0}, + {"shrug", command_shrug, 0.0}, + {"slap", command_slap, 0.0}, + {"smirk", command_smirk, 0.0}, + {"snap", command_snap, 0.0}, + {"sneeze", command_sneeze, 0.0}, + {"snicker", command_snicker, 0.0}, + {"sniff", command_sniff, 0.0}, + {"snore", command_snore, 0.0}, + {"spit", command_spit, 0.0}, + {"strut", command_strut, 0.0}, + {"thank", command_thank, 0.0}, + {"twiddle", command_twiddle, 0.0}, + {"wave", command_wave, 0.0}, + {"whistle", command_whistle, 0.0}, + {"wink", command_wink, 0.0}, + {"yawn", command_yawn, 0.0}, + {"beg", command_beg, 0.0}, + {"bleed", command_bleed, 0.0}, + {"cringe", command_cringe, 0.0}, + {"think", command_think, 0.0}, + {"cointoss", command_cointoss, 0.0}, + {"orcknuckle", command_orcknuckle, 0.0}, + {"printlos", command_printlos, 0.0}, }; const int CommunicationCommandSize = sizeof (CommunicationCommands) / sizeof (CommArray_s); CommArray_s NewServerCommands[] = { - {"run", command_run, 1.0} - , - {"run_stop", command_run_stop, 0.0} - , - {"fire", command_fire, 1.0} - , - {"fire_stop", command_fire_stop, 0.0} + {"run", command_run, 1.0}, + {"run_stop", command_run_stop, 0.0}, + {"fire", command_fire, 1.0}, + {"fire_stop", command_fire_stop, 0.0}, }; const int NewServerCommandSize = sizeof (NewServerCommands) / sizeof (CommArray_s); @@ -256,106 +194,52 @@ * Wizard commands (for both) */ CommArray_s WizCommands[] = { - {"abil", command_abil, 0.0} - , - {"addexp", command_addexp, 0.0} - , - {"arrest", command_arrest, 0.0} - , - {"banish", command_banish, 0.0} - , - {"create", command_create, 0.0} - , - {"debug", command_debug, 0.0} - , - {"dump", command_dump, 0.0} - , - {"dumpbelow", command_dumpbelow, 0.0} - , - {"dumpfriendlyobjects", command_dumpfriendlyobjects, 0.0} - , - {"dumpallarchetypes", command_dumpallarchetypes, 0.0} - , - {"dumpallmaps", command_dumpallmaps, 0.0} - , - {"dumpallobjects", command_dumpallobjects, 0.0} - , - {"dumpmap", command_dumpmap, 0.0} - , - {"forget_spell", command_forget_spell, 0.0} - , - {"free", command_free, 0.0} - , - {"freeze", command_freeze, 0.0} - , - {"goto", command_goto, 0.0} - , - {"hide", command_hide, 0.0} - , - {"insert_into", command_insert_into, 0.0} - , - {"invisible", command_invisible, 0.0} - , - {"kick", command_kick, 0.0} - , - {"learn_special_prayer", command_learn_special_prayer, 0.0} - , - {"learn_spell", command_learn_spell, 0.0} - , + {"abil", command_abil, 0.0}, + {"addexp", command_addexp, 0.0}, + {"arrest", command_arrest, 0.0}, + {"banish", command_banish, 0.0}, + {"create", command_create, 0.0}, + {"debug", command_debug, 0.0}, + {"dump", command_dump, 0.0}, + {"dumpbelow", command_dumpbelow, 0.0}, + {"dumpfriendlyobjects", command_dumpfriendlyobjects, 0.0}, + {"dumpallmaps", command_dumpallmaps, 0.0}, + {"dumpmap", command_dumpmap, 0.0}, + {"forget_spell", command_forget_spell, 0.0}, + {"free", command_free, 0.0}, + {"freeze", command_freeze, 0.0}, + {"hide", command_hide, 0.0}, + {"insert_into", command_insert_into, 0.0}, + {"invisible", command_invisible, 0.0}, + {"kick", command_kick, 0.0}, + {"learn_special_prayer", command_learn_special_prayer, 0.0}, + {"learn_spell", command_learn_spell, 0.0}, #ifdef DEBUG_MALLOC_LEVEL - {"verify", command_malloc_verify, 0.0} - , + {"verify", command_malloc_verify, 0.0}, #endif - {"players", command_players, 0.0} - , - {"plugin", command_loadplugin, 0.0} - , - {"pluglist", command_listplugins, 0.0} - , - {"plugout", command_unloadplugin, 0.0} - , - {"nodm", command_nowiz, 0.0} - , - {"nowiz", command_nowiz, 0.0} - , - {"patch", command_patch, 0.0} - , - {"remove", command_remove, 0.0} - , - {"reset", command_reset, 0.0} - , - {"set_god", command_setgod, 0.0} - , - {"shutdown", command_shutdown, 0.0} - , - {"stack_clear", command_stack_clear, 0.0} - , - {"stack_list", command_stack_list, 0.0} - , - {"stack_pop", command_stack_pop, 0.0} - , - {"stack_push", command_stack_push, 0.0} - , - {"stats", command_stats, 0.0} - , - {"style_info", command_style_map_info, 0.0} - , /* Costly command, so make it wiz only */ - {"summon", command_summon, 0.0} - , - {"teleport", command_teleport, 0.0} - , - {"wizpass", command_wizpass, 0.0} - , - {"wizcast", command_wizcast, 0.0} - , - {"overlay_save", command_save_overlay, 0.0} - , + {"players", command_players, 0.0}, + {"plugin", command_loadplugin, 0.0}, + {"pluglist", command_listplugins, 0.0}, + {"plugout", command_unloadplugin, 0.0}, + {"nodm", command_nowiz, 0.0}, + {"nowiz", command_nowiz, 0.0}, + {"patch", command_patch, 0.0}, + {"remove", command_remove, 0.0}, + {"reset", command_reset, 0.0}, + {"set_god", command_setgod, 0.0}, + {"shutdown", command_shutdown, 0.0}, + {"stack_clear", command_stack_clear, 0.0}, + {"stack_list", command_stack_list, 0.0}, + {"stack_pop", command_stack_pop, 0.0}, + {"stack_push", command_stack_push, 0.0}, + {"stats", command_stats, 0.0}, + {"style_info", command_style_map_info, 0.0}, /* Costly command, so make it wiz only */ + {"summon", command_summon, 0.0}, + {"teleport", command_teleport, 0.0}, + {"overlay_save", command_save_overlay, 0.0}, /* {"possess", command_possess, 0.0}, */ - {"mon_aggr", command_mon_aggr, 0.0} - , - {"loadtest", command_loadtest, 0.0} - , + {"mon_aggr", command_mon_aggr, 0.0}, }; const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s); @@ -363,20 +247,12 @@ * to the various players/sockets. */ CommArray_s Socket_Commands[] = { - {"hiscore", command_hiscore, 0.0} - , - {"logs", command_logs, 0.0} - , - {"maps", command_maps, 0.0} - , - {"motd", command_motd, 0.0} - , - {"players", command_players, 0.0} - , - {"version", command_version, 0.0} - , - {"who", command_who, 0.0} - , + {"hiscore", command_hiscore, 0.0}, + {"logs", command_logs, 0.0}, + {"maps", command_maps, 0.0}, + {"motd", command_motd, 0.0}, + {"players", command_players, 0.0}, + {"version", command_version, 0.0}, }; const int Socket_CommandsSize = sizeof (Socket_Commands) / sizeof (CommArray_s);