ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_misc.C
(Generate patch)

Comparing deliantra/server/server/c_misc.C (file contents):
Revision 1.39 by root, Mon Jan 29 14:46:01 2007 UTC vs.
Revision 1.57 by root, Wed Apr 25 19:19:54 2007 UTC

… …
24 24
25#include <global.h> 25#include <global.h>
26#include <loader.h> 26#include <loader.h>
27#include <sproto.h> 27#include <sproto.h>
28 28
29/* Handles misc. input request - things like hash table, malloc, maps, 29/* Handles misc. input request - things like hash table, malloc, maps, etc */
30 * who, etc.
31 */
32
33/* This command dumps the body information for object *op.
34 * it doesn't care what the params are.
35 * This is mostly meant as a debug command.
36 */
37int
38command_body (object *op, char *params)
39{
40 int i;
41
42 /* Too hard to try and make a header that lines everything up, so just
43 * give a description.
44 */
45 new_draw_info (NDI_UNIQUE, 0, op, "The first column is the name of the body location.");
46 new_draw_info (NDI_UNIQUE, 0, op, "The second column is how many of those locations your body has.");
47 new_draw_info (NDI_UNIQUE, 0, op, "The third column is how many slots in that location are available.");
48 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
49 {
50 /* really debugging - normally body_used should not be set to anything
51 * if body_info isn't also set.
52 */
53 if (op->body_info[i] || op->body_used[i])
54 {
55 new_draw_info_format (NDI_UNIQUE, 0, op, "%-30s %5d %5d", body_locations[i].use_name, op->body_info[i], op->body_used[i]);
56 }
57 }
58 if (!QUERY_FLAG (op, FLAG_USE_ARMOUR))
59 new_draw_info (NDI_UNIQUE, 0, op, "You are not allowed to wear armor");
60 if (!QUERY_FLAG (op, FLAG_USE_WEAPON))
61 new_draw_info (NDI_UNIQUE, 0, op, "You are not allowed to use weapons");
62
63 return 1;
64}
65
66 30
67int 31int
68command_motd (object *op, char *params) 32command_motd (object *op, char *params)
69{ 33{
70 display_motd (op); 34 display_motd (op);
71 return 1; 35 return 1;
72} 36}
73 37
74int
75command_bug (object *op, char *params)
76{
77 char buf[MAX_BUF];
78
79 if (params == NULL)
80 {
81 new_draw_info (NDI_UNIQUE, 0, op, "what bugs?");
82 return 1;
83 }
84 strcpy (buf, op->name);
85 strcat (buf, " bug-reports: ");
86 strncat (buf, ++params, MAX_BUF - strlen (buf));
87 buf[MAX_BUF - 1] = '\0';
88 bug_report (buf);
89 LOG (llevError, "%s\n", buf);
90 new_draw_info (NDI_ALL | NDI_UNIQUE, 1, NULL, buf);
91 new_draw_info (NDI_UNIQUE, 0, op, "OK, thanks!");
92 return 1;
93}
94
95/*
96 * Pretty much identical to current map_info, but on a bigger scale
97 * This function returns the name of the players current region, and
98 * a description of it. It is there merely for flavour text.
99 */
100void
101current_region_info (object *op)
102{
103 if (region *reg = op->region ())
104 new_draw_info_format (NDI_UNIQUE, 0, op, "You are in %s.\n%s", reg->longname, reg->msg);
105}
106
107void
108current_map_info (object *op)
109{
110 maptile *m = op->map;
111
112 if (!m)
113 return;
114
115 new_draw_info_format (NDI_UNIQUE, 0, op, "%s (%s) in %s", &m->name, &m->path, &op->region ()->name);
116
117 if (QUERY_FLAG (op, FLAG_WIZ))
118 new_draw_info_format (NDI_UNIQUE, 0, op,
119 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld",
120 m->players, m->difficulty, m->width, m->height, m->enter_x, m->enter_y, m->timeout);
121
122 if (m->msg)
123 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg);
124}
125
126#ifdef DEBUG_MALLOC_LEVEL 38#ifdef DEBUG_MALLOC_LEVEL
127int 39int
128command_malloc_verify (object *op, char *parms) 40command_malloc_verify (object *op, char *parms)
129{ 41{
130 extern int malloc_verify (void); 42 extern int malloc_verify (void);
131 43
132 if (!malloc_verify ()) 44 if (!malloc_verify ())
133 new_draw_info (NDI_UNIQUE, 0, op, "Heap is corrupted."); 45 new_draw_info (NDI_UNIQUE, 0, op, "Heap is corrupted.");
134 else 46 else
135 new_draw_info (NDI_UNIQUE, 0, op, "Heap checks out OK."); 47 new_draw_info (NDI_UNIQUE, 0, op, "Heap checks out OK.");
136 return 1; 48 return 1;
… …
144 /* 56 /*
145 * reset the counter on the region, then use it to store the number of 57 * reset the counter on the region, then use it to store the number of
146 * players there. 58 * players there.
147 * I don't know how thread-safe this would be, I suspect not very.... 59 * I don't know how thread-safe this would be, I suspect not very....
148 */ 60 */
149 for (region *reg = first_region; reg; reg = reg->next) 61 for_all_regions (rgn)
150 reg->counter = 0; 62 rgn->counter = 0;
151 63
152 for_all_players (pl) 64 for_all_players (pl)
153 if (pl->ob->map) 65 if (pl->ob->map)
154 ++pl->ob->region ()->counter; 66 ++pl->ob->region ()->counter;
155 67
156 /* we only want to print out by places with a 'longname' field... */ 68 /* we only want to print out by places with a 'longname' field... */
157 for (region *reg = first_region; reg; reg = reg->next) 69 for_all_regions (rgn)
158 { 70 {
159 if (reg->longname == NULL && reg->counter > 0) 71 if (!rgn->longname && rgn->counter > 0)
160 { 72 {
161 if (reg->parent) 73 if (rgn->parent)
162 { 74 {
163 reg->parent->counter += reg->counter; 75 rgn->parent->counter += rgn->counter;
164 reg->counter = 0; 76 rgn->counter = 0;
165 } 77 }
166 else /*uh oh, we shouldn't be here. */ 78 else /*uh oh, we shouldn't be here. */
167 LOG (llevError, "command_whereabouts() Region %s with no longname has no parent", &reg->name); 79 LOG (llevError, "command_whereabouts() Region %s with no longname has no parent", &rgn->name);
168 } 80 }
169 } 81 }
170 82
171 new_draw_info_format (NDI_UNIQUE, 0, op, "In the world currently there are:"); 83 new_draw_info_format (NDI_UNIQUE, 0, op, "In the world currently there are:");
172 84
173 for (region *reg = first_region; reg; reg = reg->next) 85 for_all_regions (rgn)
174 if (reg->counter) 86 if (rgn->counter)
175 new_draw_info_format (NDI_UNIQUE, 0, op, "%u players in %s", reg->counter, reg->longname); 87 new_draw_info_format (NDI_UNIQUE, 0, op, "%u players %s", rgn->counter, &rgn->longname);
176 88
177 return 1; 89 return 1;
178} 90}
179 91
180typedef struct 92typedef struct
181{ 93{
182 char namebuf[MAX_BUF]; 94 char namebuf[MAX_BUF];
183 int login_order; 95 int login_order;
184} chars_names; 96} chars_names;
185
186int
187command_afk (object *op, char *params)
188{
189 if ((op->contr->ns->afk = !op->contr->ns->afk))
190 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");
191 else
192 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
193
194 return 1;
195}
196
197int
198command_mapinfo (object *op, char *params)
199{
200 current_map_info (op);
201 return 1;
202}
203
204int
205command_whereami (object *op, char *params)
206{
207 current_region_info (op);
208 return 1;
209}
210 97
211int 98int
212command_time (object *op, char *params) 99command_time (object *op, char *params)
213{ 100{
214 print_tod (op); 101 print_tod (op);
… …
347#endif 234#endif
348 return 1; 235 return 1;
349} 236}
350 237
351int 238int
352command_archs (object *op, char *params)
353{
354 arch_info (op);
355 return 1;
356}
357
358int
359command_hiscore (object *op, char *params) 239command_hiscore (object *op, char *params)
360{ 240{
361 display_high_score (op, op == NULL ? 9999 : 50, params); 241 display_high_score (op, op == NULL ? 9999 : 50, params);
362 return 1; 242 return 1;
363} 243}
… …
370 250
371 if (params == NULL || !sscanf (params, "%d", &i)) 251 if (params == NULL || !sscanf (params, "%d", &i))
372 { 252 {
373 sprintf (buf, "Global debug level is %d.", settings.debug); 253 sprintf (buf, "Global debug level is %d.", settings.debug);
374 new_draw_info (NDI_UNIQUE, 0, op, buf); 254 new_draw_info (NDI_UNIQUE, 0, op, buf);
375 return 1;
376 }
377 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
378 {
379 new_draw_info (NDI_UNIQUE, 0, op, "Privileged command.");
380 return 1; 255 return 1;
381 } 256 }
382 settings.debug = (enum LogLevel) FABS (i); 257 settings.debug = (enum LogLevel) FABS (i);
383 sprintf (buf, "Set debug level to %d.", i); 258 sprintf (buf, "Set debug level to %d.", i);
384 new_draw_info (NDI_UNIQUE, 0, op, buf); 259 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
442 } 317 }
443 else 318 else
444 { 319 {
445 LOG (llevError, "Cannot write bugs file %s: %s\n", BUG_LOG, strerror (errno)); 320 LOG (llevError, "Cannot write bugs file %s: %s\n", BUG_LOG, strerror (errno));
446 } 321 }
447}
448
449int
450command_output_sync (object *op, char *params)
451{
452 int val;
453
454 if (!params)
455 {
456 new_draw_info_format (NDI_UNIQUE, 0, op, "Output sync time is presently %d", op->contr->outputs_sync);
457 return 1;
458 }
459 val = atoi (params);
460 if (val > 0)
461 {
462 op->contr->outputs_sync = val;
463 new_draw_info_format (NDI_UNIQUE, 0, op, "Output sync time now set to %d", op->contr->outputs_sync);
464 }
465 else
466 new_draw_info (NDI_UNIQUE, 0, op, "Invalid value for output_sync.");
467
468 return 1;
469}
470
471int
472command_output_count (object *op, char *params)
473{
474 int val;
475
476 if (!params)
477 {
478 new_draw_info_format (NDI_UNIQUE, 0, op, "Output count is presently %d", op->contr->outputs_count);
479 return 1;
480 }
481 val = atoi (params);
482 if (val > 0)
483 {
484 op->contr->outputs_count = val;
485 new_draw_info_format (NDI_UNIQUE, 0, op, "Output count now set to %d", op->contr->outputs_count);
486 }
487 else
488 new_draw_info (NDI_UNIQUE, 0, op, "Invalid value for output_count.");
489
490 return 1;
491}
492
493int
494command_listen (object *op, char *params)
495{
496 int i;
497
498 if (params == NULL || !sscanf (params, "%d", &i))
499 {
500 new_draw_info_format (NDI_UNIQUE, 0, op, "Set listen to what (presently %d)?", op->contr->listening);
501 return 1;
502 }
503 op->contr->listening = (char) i;
504 new_draw_info_format (NDI_UNIQUE, 0, op, "Your verbose level is now %d.", i);
505 return 1;
506} 322}
507 323
508/* Prints out some useful information for the character. Everything we print 324/* Prints out some useful information for the character. Everything we print
509 * out can be determined by the docs, so we aren't revealing anything extra - 325 * out can be determined by the docs, so we aren't revealing anything extra -
510 * rather, we are making it convenient to find the values. params have 326 * rather, we are making it convenient to find the values. params have
… …
542int 358int
543command_fix_me (object *op, char *params) 359command_fix_me (object *op, char *params)
544{ 360{
545 sum_weight (op); 361 sum_weight (op);
546 op->update_stats (); 362 op->update_stats ();
363 new_draw_info (NDI_UNIQUE, 0, op, "Your character was fixed.");
364
547 return 1; 365 return 1;
548} 366}
549 367
550int 368int
551command_logs (object *op, char *params) 369command_logs (object *op, char *params)
552{ 370{
553 new_draw_info (NDI_UNIQUE, 0, op, "Nobody is currently logging kills."); 371 new_draw_info (NDI_UNIQUE, 0, op, "Nobody is currently logging kills.");
554 372
555 return 1;
556}
557
558int
559command_applymode (object *op, char *params)
560{
561 unapplymode unapply = op->contr->unapply;
562 static const char *const types[] = { "nochoice", "never", "always" };
563
564 if (!params)
565 {
566 new_draw_info_format (NDI_UNIQUE, 0, op, "applymode is set to %s", types[op->contr->unapply]);
567 return 1;
568 }
569
570 if (!strcmp (params, "nochoice"))
571 op->contr->unapply = unapply_nochoice;
572 else if (!strcmp (params, "never"))
573 op->contr->unapply = unapply_never;
574 else if (!strcmp (params, "always"))
575 op->contr->unapply = unapply_always;
576 else
577 {
578 new_draw_info_format (NDI_UNIQUE, 0, op, "applymode: Unknown options %s, valid options are nochoice, never, always", params);
579 return 0;
580 }
581
582 new_draw_info_format (NDI_UNIQUE, 0, op, "Applymode %s set to %s",
583 (unapply == op->contr->unapply ? "" : " now"), types[op->contr->unapply]);
584 return 1; 373 return 1;
585} 374}
586 375
587int 376int
588command_bowmode (object *op, char *params) 377command_bowmode (object *op, char *params)
… …
626 new_draw_info_format (NDI_UNIQUE, 0, op, buf); 415 new_draw_info_format (NDI_UNIQUE, 0, op, buf);
627 return 0; 416 return 0;
628 } 417 }
629 418
630 new_draw_info_format (NDI_UNIQUE, 0, op, "bowmode %s set to %s", (oldtype == op->contr->bowtype ? "" : "now"), types[op->contr->bowtype]); 419 new_draw_info_format (NDI_UNIQUE, 0, op, "bowmode %s set to %s", (oldtype == op->contr->bowtype ? "" : "now"), types[op->contr->bowtype]);
631 return 1;
632}
633
634int
635command_petmode (object *op, char *params)
636{
637 petmode_t oldtype = op->contr->petmode;
638 static const char *const types[] = { "normal", "sad", "defend", "arena" };
639
640 if (!params)
641 {
642 new_draw_info_format (NDI_UNIQUE, 0, op, "petmode is set to %s", types[op->contr->petmode]);
643 return 1;
644 }
645
646 if (!strcmp (params, "normal"))
647 op->contr->petmode = pet_normal;
648 else if (!strcmp (params, "sad"))
649 op->contr->petmode = pet_sad;
650 else if (!strcmp (params, "defend"))
651 op->contr->petmode = pet_defend;
652 else if (!strcmp (params, "arena"))
653 op->contr->petmode = pet_arena;
654 else
655 {
656 new_draw_info_format (NDI_UNIQUE, 0, op,
657 "petmode: Unknown options %s, valid options are normal," "sad (seek and destroy), defend, arena", params);
658 return 0;
659 }
660 new_draw_info_format (NDI_UNIQUE, 0, op, "petmode %s set to %s", (oldtype == op->contr->petmode ? "" : "now"), types[op->contr->petmode]);
661 return 1; 420 return 1;
662} 421}
663 422
664int 423int
665command_showpets (object *op, char *params) 424command_showpets (object *op, char *params)
… …
706 new_draw_info (NDI_UNIQUE, 0, op, "no such pet."); 465 new_draw_info (NDI_UNIQUE, 0, op, "no such pet.");
707 return 0; 466 return 0;
708} 467}
709 468
710int 469int
711command_usekeys (object *op, char *params)
712{
713 usekeytype oldtype = op->contr->usekeys;
714 static const char *const types[] = { "inventory", "keyrings", "containers" };
715
716 if (!params)
717 {
718 new_draw_info_format (NDI_UNIQUE, 0, op, "usekeys is set to %s", types[op->contr->usekeys]);
719 return 1;
720 }
721
722 if (!strcmp (params, "inventory"))
723 op->contr->usekeys = key_inventory;
724 else if (!strcmp (params, "keyrings"))
725 op->contr->usekeys = keyrings;
726 else if (!strcmp (params, "containers"))
727 op->contr->usekeys = containers;
728 else
729 {
730 new_draw_info_format (NDI_UNIQUE, 0, op, "usekeys: Unknown options %s, valid options are inventory, keyrings, containers", params);
731 return 0;
732 }
733 new_draw_info_format (NDI_UNIQUE, 0, op, "usekeys %s set to %s", (oldtype == op->contr->usekeys ? "" : "now"), types[op->contr->usekeys]);
734 return 1;
735}
736
737int
738command_resistances (object *op, char *params) 470command_resistances (object *op, char *params)
739{ 471{
740 int i; 472 int i;
741 473
742 if (!op) 474 if (!op)
… …
778 510
779/* 511/*
780 * Actual commands. 512 * Actual commands.
781 * Those should be in small separate files (c_object.c, c_wiz.c, cmove.c,...) 513 * Those should be in small separate files (c_object.c, c_wiz.c, cmove.c,...)
782 */ 514 */
783
784
785static void
786help_topics (object *op, int what)
787{
788 DIR *dirp;
789 struct dirent *de;
790 char filename[MAX_BUF], line[80];
791 int namelen, linelen = 0;
792
793 switch (what)
794 {
795 case 1:
796 sprintf (filename, "%s/wizhelp", settings.datadir);
797 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
798 break;
799 case 3:
800 sprintf (filename, "%s/mischelp", settings.datadir);
801 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
802 break;
803 default:
804 sprintf (filename, "%s/help", settings.datadir);
805 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
806 break;
807 }
808
809 if (!(dirp = opendir (filename)))
810 return;
811
812 line[0] = '\0';
813 while (de = readdir (dirp))
814 {
815 namelen = strlen (de->d_name);
816 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.'))
817 continue;
818 linelen += namelen + 1;
819 if (linelen > 42)
820 {
821 new_draw_info (NDI_UNIQUE, 0, op, line);
822 sprintf (line, " %s", de->d_name);
823 linelen = namelen + 1;
824 continue;
825 }
826 strcat (line, " ");
827 strcat (line, de->d_name);
828 }
829 new_draw_info (NDI_UNIQUE, 0, op, line);
830 closedir (dirp);
831}
832
833static void
834show_commands (object *op, int what)
835{
836 char line[80];
837 int i, size, namelen, linelen = 0;
838 CommArray_s *ap;
839 extern CommArray_s Commands[], WizCommands[];
840 extern const int CommandsSize, WizCommandsSize;
841
842 switch (what)
843 {
844 case 1:
845 ap = WizCommands;
846 size = WizCommandsSize;
847 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
848 break;
849 case 2:
850 ap = CommunicationCommands;
851 size = CommunicationCommandSize;
852 new_draw_info (NDI_UNIQUE, 0, op, " Communication commands:");
853 break;
854 default:
855 ap = Commands;
856 size = CommandsSize;
857 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
858 break;
859 }
860
861 line[0] = '\0';
862 for (i = 0; i < size; i++)
863 {
864 namelen = strlen (ap[i].name);
865 linelen += namelen + 1;
866 if (linelen > 42)
867 {
868 new_draw_info (NDI_UNIQUE, 0, op, line);
869 sprintf (line, " %s", ap[i].name);
870 linelen = namelen + 1;
871 continue;
872 }
873 strcat (line, " ");
874 strcat (line, ap[i].name);
875 }
876 new_draw_info (NDI_UNIQUE, 0, op, line);
877}
878
879
880int
881command_help (object *op, char *params)
882{
883 struct stat st;
884 FILE *fp;
885 char filename[MAX_BUF], line[MAX_BUF];
886 int len;
887
888 if (op != NULL)
889 clear_win_info (op);
890
891/*
892 * Main help page?
893 */
894 if (!params)
895 {
896 sprintf (filename, "%s/def_help", settings.datadir);
897 if ((fp = fopen (filename, "r")) == NULL)
898 {
899 LOG (llevError, "Cannot open help file %s: %s\n", filename, strerror (errno));
900 return 0;
901 }
902 while (fgets (line, MAX_BUF, fp))
903 {
904 line[MAX_BUF - 1] = '\0';
905 len = strlen (line) - 1;
906 if (line[len] == '\n')
907 line[len] = '\0';
908 new_draw_info (NDI_UNIQUE, 0, op, line);
909 }
910 fclose (fp);
911 return 0;
912 }
913
914 /*
915 * Topics list
916 */
917 if (!strcmp (params, "topics"))
918 {
919 help_topics (op, 3);
920 help_topics (op, 0);
921 if (QUERY_FLAG (op, FLAG_WIZ))
922 help_topics (op, 1);
923 return 0;
924 }
925
926 /*
927 * Commands list
928 */
929 if (!strcmp (params, "commands"))
930 {
931 show_commands (op, 0);
932 show_commands (op, 2); /* show comm commands */
933 if (QUERY_FLAG (op, FLAG_WIZ))
934 show_commands (op, 1);
935 return 0;
936 }
937
938 /*
939 * User wants info about command
940 */
941 if (strchr (params, '.') || strchr (params, ' ') || strchr (params, '/'))
942 {
943 sprintf (line, "Illegal characters in '%s'", params);
944 new_draw_info (NDI_UNIQUE, 0, op, line);
945 return 0;
946 }
947
948 sprintf (filename, "%s/mischelp/%s", settings.datadir, params);
949 if (stat (filename, &st) || !S_ISREG (st.st_mode))
950 {
951 if (op)
952 {
953 sprintf (filename, "%s/help/%s", settings.datadir, params);
954 if (stat (filename, &st) || !S_ISREG (st.st_mode))
955 {
956 if (QUERY_FLAG (op, FLAG_WIZ))
957 {
958 sprintf (filename, "%s/wizhelp/%s", settings.datadir, params);
959 if (stat (filename, &st) || !S_ISREG (st.st_mode))
960 goto nohelp;
961 }
962 else
963 goto nohelp;
964 }
965 }
966 }
967
968 /*
969 * Found that. Just cat it to screen.
970 */
971 if ((fp = fopen (filename, "r")) == NULL)
972 {
973 LOG (llevError, "Cannot open help file %s: %s\n", filename, strerror (errno));
974 return 0;
975 }
976 sprintf (line, "Help about '%s'", params);
977 new_draw_info (NDI_UNIQUE, 0, op, line);
978 while (fgets (line, MAX_BUF, fp))
979 {
980 line[MAX_BUF - 1] = '\0';
981 len = strlen (line) - 1;
982 if (line[len] == '\n')
983 line[len] = '\0';
984 new_draw_info (NDI_UNIQUE, 0, op, line);
985 }
986 fclose (fp);
987 return 0;
988
989 /*
990 * No_help -escape
991 */
992nohelp:
993 sprintf (line, "No help available on '%s'", params);
994 new_draw_info (NDI_UNIQUE, 0, op, line);
995 return 0;
996}
997
998 515
999int 516int
1000onoff_value (const char *line) 517onoff_value (const char *line)
1001{ 518{
1002 int i; 519 int i;
… …
1025 return 0; 542 return 0;
1026 } 543 }
1027} 544}
1028 545
1029int 546int
1030command_sound (object *op, char *params)
1031{
1032 if (op->contr->ns->sound)
1033 {
1034 op->contr->ns->sound = 0;
1035 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1036 }
1037 else
1038 {
1039 op->contr->ns->sound = 1;
1040 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1041 }
1042
1043 return 1;
1044}
1045
1046int
1047command_title (object *op, char *params) 547command_title (object *op, char *params)
1048{ 548{
1049 char buf[MAX_BUF]; 549 char buf[MAX_BUF];
1050 550
1051 if (settings.set_title == FALSE) 551 if (settings.set_title == FALSE)
… …
1088 strcpy (op->contr->own_title, params); 588 strcpy (op->contr->own_title, params);
1089 return 1; 589 return 1;
1090} 590}
1091 591
1092int 592int
1093command_peaceful (object *op, char *params)
1094{
1095 new_draw_info (NDI_UNIQUE, 0, op,
1096 "You cannot change your peaceful setting with this command."
1097 " Please speak to the priest in the temple of Gorokh"
1098 " if you want to become hostile or in temple of Valriel" " if you want to become peaceful again.");
1099
1100/*
1101 if((op->contr->peaceful=!op->contr->peaceful))
1102 new_draw_info(NDI_UNIQUE, 0,op,"You will not attack other players.");
1103 else
1104 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");
1105*/
1106 return 1;
1107}
1108
1109int
1110command_wimpy (object *op, char *params)
1111{
1112 int i;
1113 char buf[MAX_BUF];
1114
1115 if (params == NULL || !sscanf (params, "%d", &i))
1116 {
1117 sprintf (buf, "Your current wimpy level is %d.", op->run_away);
1118 new_draw_info (NDI_UNIQUE, 0, op, buf);
1119 return 1;
1120 }
1121 sprintf (buf, "Your new wimpy level is %d.", i);
1122 new_draw_info (NDI_UNIQUE, 0, op, buf);
1123 op->run_away = i;
1124 return 1;
1125}
1126
1127int
1128command_brace (object *op, char *params)
1129{
1130 if (!params)
1131 op->contr->braced = !op->contr->braced;
1132 else
1133 op->contr->braced = onoff_value (params);
1134
1135 if (op->contr->braced)
1136 new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1137 else
1138 new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1139
1140 op->update_stats ();
1141 return 0;
1142}
1143
1144int
1145command_kill_pets (object *op, char *params) 593command_kill_pets (object *op, char *params)
1146{ 594{
1147 objectlink *obl, *next; 595 objectlink *obl, *next;
1148 int counter = 0, removecount = 0; 596 int counter = 0, removecount = 0;
1149 597
1150 if (params == NULL) 598 if (!params)
1151 { 599 {
1152 terminate_all_pets (op); 600 terminate_all_pets (op);
1153 new_draw_info (NDI_UNIQUE, 0, op, "Your pets have been killed."); 601 new_draw_info (NDI_UNIQUE, 0, op, "Your pets have been killed.");
1154 } 602 }
1155 else 603 else
1156 { 604 {
1157 int target = atoi (params); 605 int target = atoi (params);
1158 606
1159 for (obl = first_friendly_object; obl != NULL; obl = next) 607 for (obl = first_friendly_object; obl; obl = next)
1160 { 608 {
1161 object *ob = obl->ob; 609 object *ob = obl->ob;
1162 610
1163 next = obl->next; 611 next = obl->next;
612
1164 if (ob->owner == op) 613 if (ob->owner == op)
1165 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params))) 614 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params)))
1166 { 615 {
1167 ob->destroy (); 616 ob->destroy ();
1168 removecount++; 617 removecount++;
1169 } 618 }
1170 } 619 }
620
1171 if (removecount != 0) 621 if (removecount != 0)
1172 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount); 622 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);
1173 else 623 else
1174 new_draw_info (NDI_UNIQUE, 0, op, "Couldn't find any suitable pets to kill.\n"); 624 new_draw_info (NDI_UNIQUE, 0, op, "Couldn't find any suitable pets to kill.\n");
1175 } 625 }
626
1176 return 0; 627 return 0;
1177} 628}

Diff Legend

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