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

Comparing deliantra/server/server/c_wiz.C (file contents):
Revision 1.25 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.43 by root, Thu May 17 14:14:55 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#ifndef __CEXTRACT__
26# include <sproto.h> 26#include <sproto.h>
27#endif
28#include <spells.h> 27#include <spells.h>
29#include <treasure.h> 28#include <treasure.h>
30#include <skills.h> 29#include <skills.h>
31 30
32/** Defines for DM item stack **/ 31/** Defines for DM item stack **/
… …
47 * other player, or NULL otherwise. 46 * other player, or NULL otherwise.
48 */ 47 */
49static player * 48static player *
50get_other_player_from_name (object *op, char *name) 49get_other_player_from_name (object *op, char *name)
51{ 50{
52 player *pl;
53
54 if (!name) 51 if (!name)
55 return NULL; 52 return NULL;
56 53
57 for (pl = first_player; pl != NULL; pl = pl->next) 54 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 55 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 56 {
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
64 return NULL;
65 }
66
67 if (pl->ob == op) 57 if (pl->ob == op)
68 { 58 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 59 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 60 return NULL;
71 } 61 }
72 62
73 if (pl->ns->state != ST_PLAYING) 63 if (pl->ns->state != ST_PLAYING)
74 { 64 {
75 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 65 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
76 return NULL; 66 return NULL;
67 }
68
69 return pl;
77 } 70 }
78 71
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
79 return pl; 73 return 0;
80} 74}
81 75
82/** 76/**
83 * Actually hides specified player (obviously a DM). 77 * Actually hides specified player (obviously a DM).
84 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 78 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
… …
92 op->contr->hidden = 0; 86 op->contr->hidden = 0;
93 op->invisible = 1; 87 op->invisible = 1;
94 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 88 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
95 op->map->players++; 89 op->map->players++;
96 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 90 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
91
97 if (!silent_dm) 92 if (!silent_dm)
98 {
99 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 93 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
100 }
101 } 94 }
102 else 95 else
103 { 96 {
104 op->contr->hidden = 1; 97 op->contr->hidden = 1;
105 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); 98 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
106 op->map->players--; 99 op->map->players--;
100
107 if (!silent_dm) 101 if (!silent_dm)
108 {
109 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 102 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
110 } 103
111 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); 104 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name);
112 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); 105 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name);
113 } 106 }
114} 107}
115 108
… …
179 172
180 become_follower (ob, god); 173 become_follower (ob, god);
181 return 1; 174 return 1;
182} 175}
183 176
184/** 177// TODO: Rewrite banish in perl and get rid of the following two functions
185 * Add player's IP to ban_file and kick them off the server
186 * I know most people have dynamic IPs but this is more of a short term
187 * solution if they have to get a new IP to play maybe they'll calm down.
188 * This uses the banish_file in the local directory *not* the ban_file
189 * The action is logged with a ! for easy searching. -tm
190 */
191int
192command_banish (object *op, char *params)
193{
194 player *pl;
195 FILE *banishfile;
196 char buf[MAX_BUF];
197 time_t now;
198
199 if (!params)
200 {
201 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
202 return 1;
203 }
204
205 pl = get_other_player_from_name (op, params);
206 if (!pl)
207 return 1;
208
209 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
210
211 if ((banishfile = fopen (buf, "a")) == NULL)
212 {
213 LOG (llevDebug, "Could not find file banish_file.\n");
214 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
215 return 0;
216 }
217
218 now = time (NULL);
219 /*
220 * Record this as a comment - then we don't have to worry about changing
221 * the parsing code.
222 */
223 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
224 fprintf (banishfile, "*@%s\n", pl->ns->host);
225 fclose (banishfile);
226
227 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
228 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
229 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
230 command_kick (op, (char *) &pl->ob->name);
231 return 1;
232}
233
234int 178int
235command_kick (object *op, char *params) 179command_kick (object *op, char *params)
236{ 180{
237 for (player *pl = first_player; pl; pl = pl->next) 181 for_all_players (pl)
238 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) 182 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
239 { 183 {
240 object *op = pl->ob; 184 object *op = pl->ob;
241 185
242 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 186 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
… …
249 } 193 }
250 194
251 return 1; 195 return 1;
252} 196}
253 197
198//TODO
199#if 0
254int 200int
255command_save_overlay (object *op, char *params) 201command_save_overlay (object *op, char *params)
256{ 202{
257 if (!op) 203 if (!op)
258 return 0; 204 return 0;
… …
269 215
270 ready_map_name (op->map->path, 0); 216 ready_map_name (op->map->path, 0);
271 217
272 return 1; 218 return 1;
273} 219}
274 220#endif
275int
276command_shutdown (object *op, char *params)
277{
278 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
279 {
280 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
281 return 1;
282 }
283
284 cleanup ();
285 /* not reached */
286 return 1;
287}
288 221
289int 222int
290command_freeze (object *op, char *params) 223command_freeze (object *op, char *params)
291{ 224{
292 int ticks; 225 int ticks;
… …
328 object *dummy; 261 object *dummy;
329 player *pl; 262 player *pl;
330 263
331 if (!op) 264 if (!op)
332 return 0; 265 return 0;
266
333 if (params == NULL) 267 if (params == NULL)
334 { 268 {
335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 269 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
336 return 1; 270 return 1;
337 } 271 }
272
338 pl = get_other_player_from_name (op, params); 273 pl = get_other_player_from_name (op, params);
339 if (!pl) 274 if (!pl)
340 return 1; 275 return 1;
276
341 dummy = get_jail_exit (pl->ob); 277 dummy = get_jail_exit (pl->ob);
342 if (!dummy) 278 if (!dummy)
343 { 279 {
344 /* we have nowhere to send the prisoner.... */ 280 /* we have nowhere to send the prisoner.... */
345 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 281 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
346 return 0; 282 return 0;
347 } 283 }
348 enter_exit (pl->ob, dummy); 284
285 pl->ob->enter_exit (dummy);
349 dummy->destroy (); 286 dummy->destroy ();
350 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 287 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
351 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 288 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
352 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 289 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
353 return 1; 290 return 1;
… …
382 319
383 dummy = object::create (); 320 dummy = object::create ();
384 EXIT_PATH (dummy) = op->map->path; 321 EXIT_PATH (dummy) = op->map->path;
385 EXIT_X (dummy) = op->x + freearr_x[i]; 322 EXIT_X (dummy) = op->x + freearr_x[i];
386 EXIT_Y (dummy) = op->y + freearr_y[i]; 323 EXIT_Y (dummy) = op->y + freearr_y[i];
387 enter_exit (pl->ob, dummy); 324 pl->ob->enter_exit (dummy);
388 dummy->destroy (); 325 dummy->destroy ();
389 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 326 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
390 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 327 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
391 328
392 return 1;
393}
394
395/**
396 * Teleport next to target player.
397 */
398
399/* mids 01/16/2002 */
400int
401command_teleport (object *op, char *params)
402{
403 int i;
404 object *dummy;
405 player *pl;
406
407 if (!op)
408 return 0;
409
410 if (params == NULL)
411 {
412 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
413 return 1;
414 }
415
416 pl = get_other_player_from_name (op, params);
417 if (!pl)
418 return 1;
419
420 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
421 if (i == -1)
422 {
423 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
424 return 1;
425 }
426
427 dummy = object::create ();
428 EXIT_PATH (dummy) = pl->ob->map->path;
429 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
430 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
431 enter_exit (op, dummy);
432 dummy->destroy ();
433 if (!op->contr->hidden)
434 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
435 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
436 return 1; 329 return 1;
437} 330}
438 331
439/** 332/**
440 * This function is a real mess, because we're stucking getting 333 * This function is a real mess, because we're stucking getting
… …
534 at_spell = archetype::find (cp); 427 at_spell = archetype::find (cp);
535 if (!at_spell || at_spell->clone.type != SPELL) 428 if (!at_spell || at_spell->clone.type != SPELL)
536 at_spell = find_archetype_by_object_name (cp); 429 at_spell = find_archetype_by_object_name (cp);
537 if (!at_spell || at_spell->clone.type != SPELL) 430 if (!at_spell || at_spell->clone.type != SPELL)
538 { 431 {
539 strcpy (spell_name, cp); 432 assign (spell_name, cp);
540 fsp = strchr (spell_name, ' '); 433 fsp = strchr (spell_name, ' ');
541 if (fsp) 434 if (fsp)
542 { 435 {
543 *fsp = 0; 436 *fsp = 0;
544 fsp++; 437 fsp++;
… …
561 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type); 454 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type);
562 else 455 else
563 { 456 {
564 art = find_artifactlist (at->clone.type)->items; 457 art = find_artifactlist (at->clone.type)->items;
565 458
566 do 459 while (art)
567 { 460 {
568 if (!strcmp (art->item->name, cp)) 461 if (!strcmp (art->item->name, cp))
569 break; 462 break;
463
570 art = art->next; 464 art = art->next;
571 } 465 }
572 while (art != NULL);
573 466
574 if (!art) 467 if (!art)
575 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 468 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp);
576 } 469 }
577 470
… …
590 * Rather than have two different blocks with a lot of similar code, 483 * Rather than have two different blocks with a lot of similar code,
591 * just create one object, do all the processing, and then determine 484 * just create one object, do all the processing, and then determine
592 * if that one object should be inserted or if we need to make copies. 485 * if that one object should be inserted or if we need to make copies.
593 */ 486 */
594 tmp = arch_to_object (at); 487 tmp = arch_to_object (at);
595
596 if (settings.real_wiz == FALSE)
597 SET_FLAG (tmp, FLAG_WAS_WIZ);
598 488
599 if (set_magic) 489 if (set_magic)
600 set_abs_magic (tmp, magic); 490 set_abs_magic (tmp, magic);
601 491
602 if (art) 492 if (art)
… …
727 { 617 {
728 head = dup; 618 head = dup;
729 tmp->copy_to (dup); 619 tmp->copy_to (dup);
730 } 620 }
731 621
732 if (settings.real_wiz == FALSE)
733 SET_FLAG (dup, FLAG_WAS_WIZ);
734
735 dup->x = op->x + dup->arch->clone.x; 622 dup->x = op->x + dup->arch->clone.x;
736 dup->y = op->y + dup->arch->clone.y; 623 dup->y = op->y + dup->arch->clone.y;
737 dup->map = op->map; 624 dup->map = op->map;
738 625
739 if (head != dup) 626 if (head != dup)
… …
857 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 744 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
858 745
859 return 1; 746 return 1;
860} 747}
861 748
862/**
863 * When DM is possessing a monster, flip aggression on and off, to allow
864 * better motion.
865 */
866int
867command_mon_aggr (object *op, char *params)
868{
869 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
870 {
871 op->enemy = NULL;
872 SET_FLAG (op, FLAG_UNAGGRESSIVE);
873 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
874 }
875 else
876 {
877 CLEAR_FLAG (op, FLAG_FRIENDLY);
878 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
879 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
880 }
881
882 return 1;
883}
884
885/** DM can possess a monster. Basically, this tricks the client into thinking
886 * a given monster, is actually the player it controls. This allows a DM
887 * to inhabit a monster's body, and run around the game with it.
888 * This function is severely broken - it has tons of hardcoded values,
889 */
890int
891command_possess (object *op, char *params)
892{
893 object *victim, *curinv, *nextinv;
894 player *pl;
895 int i;
896 char buf[MAX_BUF];
897
898 victim = NULL;
899 if (params != NULL)
900 {
901 if (sscanf (params, "%d", &i))
902 victim = find_object (i);
903 else if (sscanf (params, "%s", buf))
904 victim = find_object_name (buf);
905 }
906 if (victim == NULL)
907 {
908 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
909 return 1;
910 }
911
912 if (victim == op)
913 {
914 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
915 return 1;
916 }
917
918 /* clear out the old inventory */
919 curinv = op->inv;
920 while (curinv != NULL)
921 {
922 nextinv = curinv->below;
923 esrv_del_item (op->contr, curinv->count);
924 curinv = nextinv;
925 }
926
927 /* make the switch */
928 pl = op->contr;
929 victim->contr = pl;
930 pl->ob = victim;
931 victim->type = PLAYER;
932 SET_FLAG (victim, FLAG_WIZ);
933
934 /* send the inventory to the client */
935 curinv = victim->inv;
936 while (curinv != NULL)
937 {
938 nextinv = curinv->below;
939 esrv_send_item (victim, curinv);
940 curinv = nextinv;
941 }
942 /* basic patchup */
943 /* The use of hard coded values is terrible. Note
944 * that really, to be fair, this shouldn't get changed at
945 * all - if you are possessing a kobold, you should have the
946 * same limitations. As it is, as more body locations are added,
947 * this will give this player more locations than perhaps
948 * they should be allowed.
949 */
950 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
951 if (i == 1 || i == 6 || i == 8 || i == 9)
952 victim->body_info[i] = 2;
953 else
954 victim->body_info[i] = 1;
955
956 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
957 esrv_send_inventory (victim, victim);
958
959 fix_player (victim);
960
961 do_some_living (victim);
962 return 1;
963}
964
965int 749int
966command_patch (object *op, char *params) 750command_patch (object *op, char *params)
967{ 751{
968 char *arg, *arg2; 752 char *arg, *arg2;
969 object *tmp; 753 object *tmp;
… …
981 return 1; 765 return 1;
982 } 766 }
983 767
984 if ((arg2 = strchr (arg, ' '))) 768 if ((arg2 = strchr (arg, ' ')))
985 arg2++; 769 arg2++;
986 if (settings.real_wiz == FALSE) 770
987 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
988 if (set_variable (tmp, arg) == -1) 771 if (set_variable (tmp, arg) == -1)
989 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 772 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
990 else 773 else
991 {
992 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 774 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
993 }
994 775
995 return 1; 776 return 1;
996} 777}
997 778
998int 779int
… …
1047 828
1048 if (from != STACK_FROM_STACK) 829 if (from != STACK_FROM_STACK)
1049 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 830 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1050 dm_stack_pop (op->contr); 831 dm_stack_pop (op->contr);
1051 832
1052 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1053 {
1054 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1055 tmp->remove ();
1056 }
1057
1058 if (tmp->head) 833 if (tmp->head)
1059 tmp = tmp->head; 834 tmp = tmp->head;
1060 835
1061 tmp->destroy (); 836 tmp->destroy ();
1062 return 1; 837 return 1;
… …
1069command_addexp (object *op, char *params) 844command_addexp (object *op, char *params)
1070{ 845{
1071 char buf[MAX_BUF], skill[MAX_BUF]; 846 char buf[MAX_BUF], skill[MAX_BUF];
1072 int i, q; 847 int i, q;
1073 object *skillob = NULL; 848 object *skillob = NULL;
1074 player *pl;
1075 849
1076 skill[0] = '\0'; 850 skill[0] = '\0';
1077 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 851 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2))
1078 { 852 {
1079 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 853 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1080 return 1; 854 return 1;
1081 } 855 }
1082 856
1083 for (pl = first_player; pl != NULL; pl = pl->next) 857 for_all_players (pl)
1084 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 858 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1085 break;
1086
1087 if (pl == NULL)
1088 { 859 {
1089 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1090 return 1;
1091 }
1092
1093 if (q >= 3) 860 if (q >= 3)
1094 { 861 {
1095 skillob = find_skill_by_name (pl->ob, skill); 862 skillob = find_skill_by_name (pl->ob, skill);
1096 if (!skillob) 863 if (!skillob)
1097 { 864 {
1098 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 865 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
866 return 1;
867 }
868
869 i = check_exp_adjust (skillob, i);
870 skillob->stats.exp += i;
871 calc_perm_exp (skillob);
872 player_lvl_adj (pl->ob, skillob);
873 }
874
875 pl->ob->stats.exp += i;
876 calc_perm_exp (pl->ob);
877 player_lvl_adj (pl->ob, NULL);
878
1099 return 1; 879 return 1;
1100 } 880 }
1101 881
1102 i = check_exp_adjust (skillob, i); 882 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1103 skillob->stats.exp += i;
1104 calc_perm_exp (skillob);
1105 player_lvl_adj (pl->ob, skillob);
1106 }
1107
1108 pl->ob->stats.exp += i;
1109 calc_perm_exp (pl->ob);
1110 player_lvl_adj (pl->ob, NULL);
1111
1112 if (settings.real_wiz == FALSE)
1113 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1114 return 1; 883 return 1;
1115} 884}
1116 885
1117/**************************************************************************/ 886/**************************************************************************/
1118 887
… …
1124 893
1125int 894int
1126command_stats (object *op, char *params) 895command_stats (object *op, char *params)
1127{ 896{
1128 char thing[20]; 897 char thing[20];
1129 player *pl;
1130 char buf[MAX_BUF]; 898 char buf[MAX_BUF];
1131 899
1132 thing[0] = '\0'; 900 thing[0] = '\0';
1133 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 901 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1134 { 902 {
1135 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 903 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1136 return 1; 904 return 1;
1137 } 905 }
1138 906
1139 for (pl = first_player; pl != NULL; pl = pl->next) 907 for_all_players (pl)
1140 if (!strcmp (pl->ob->name, thing)) 908 if (!strcmp (pl->ob->name, thing))
1141 { 909 {
1142 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 910 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1143 new_draw_info (NDI_UNIQUE, 0, op, buf); 911 new_draw_info (NDI_UNIQUE, 0, op, buf);
1144 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 912 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
… …
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 919 new_draw_info (NDI_UNIQUE, 0, op, buf);
1152 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 920 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1153 new_draw_info (NDI_UNIQUE, 0, op, buf); 921 new_draw_info (NDI_UNIQUE, 0, op, buf);
1154 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 922 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1155 new_draw_info (NDI_UNIQUE, 0, op, buf); 923 new_draw_info (NDI_UNIQUE, 0, op, buf);
1156 break; 924 return 1;
1157 } 925 }
1158 if (pl == NULL) 926
1159 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 927 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1160 return 1; 928 return 1;
1161} 929}
1162 930
1163int 931int
1164command_abil (object *op, char *params) 932command_abil (object *op, char *params)
1165{ 933{
1166 char thing[20], thing2[20]; 934 char thing[20], thing2[20];
1167 int iii; 935 int iii;
1168 player *pl;
1169 char buf[MAX_BUF]; 936 char buf[MAX_BUF];
1170 937
1171 iii = 0; 938 iii = 0;
1172 thing[0] = '\0'; 939 thing[0] = '\0';
1173 thing2[0] = '\0'; 940 thing2[0] = '\0';
… …
1187 { 954 {
1188 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 955 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1189 return 1; 956 return 1;
1190 } 957 }
1191 958
1192 for (pl = first_player; pl != NULL; pl = pl->next) 959 for_all_players (pl)
1193 { 960 {
1194 if (!strcmp (pl->ob->name, thing)) 961 if (!strcmp (pl->ob->name, thing))
1195 { 962 {
1196 if (settings.real_wiz == FALSE)
1197 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1198 if (!strcmp ("str", thing2))
1199 pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 963 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
1200 if (!strcmp ("dex", thing2))
1201 pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 964 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
1202 if (!strcmp ("con", thing2))
1203 pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 965 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
1204 if (!strcmp ("wis", thing2))
1205 pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 966 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
1206 if (!strcmp ("cha", thing2))
1207 pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii; 967 if (!strcmp ("cha", thing2)) pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii;
1208 if (!strcmp ("int", thing2))
1209 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 968 if (!strcmp ("int", thing2)) pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1210 if (!strcmp ("pow", thing2))
1211 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 969 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
970
1212 sprintf (buf, "%s has been altered.", &pl->ob->name); 971 sprintf (buf, "%s has been altered.", &pl->ob->name);
1213 new_draw_info (NDI_UNIQUE, 0, op, buf); 972 new_draw_info (NDI_UNIQUE, 0, op, buf);
1214 fix_player (pl->ob); 973 pl->ob->update_stats ();
1215 return 1; 974 return 1;
1216 } 975 }
1217 } 976 }
1218 977
1219 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 978 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1220 return 1; 979 return 1;
1221} 980}
1222 981
1223int 982int
1224command_reset (object *op, char *params)
1225{
1226 maptile *m;
1227 object *dummy = NULL, *tmp = NULL;
1228
1229 if (params == NULL)
1230 {
1231 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1232 return 1;
1233 }
1234
1235 if (strcmp (params, ".") == 0)
1236 params = op->map->path;
1237
1238 m = has_been_loaded (params);
1239 if (m == NULL)
1240 {
1241 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1242 return 1;
1243 }
1244
1245 if (m->in_memory != MAP_SWAPPED)
1246 {
1247 if (m->in_memory != MAP_IN_MEMORY)
1248 {
1249 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1250 return 0;
1251 }
1252
1253 /*
1254 * Only attempt to remove the player that is doing the reset, and not other
1255 * players or wiz's.
1256 */
1257 if (op->map == m)
1258 {
1259 dummy = object::create ();
1260 dummy->map = NULL;
1261 EXIT_X (dummy) = op->x;
1262 EXIT_Y (dummy) = op->y;
1263 EXIT_PATH (dummy) = op->map->path;
1264 op->remove ();
1265 op->map = NULL;
1266 tmp = op;
1267 }
1268 swap_map (m);
1269 }
1270
1271 if (m->in_memory == MAP_SWAPPED)
1272 {
1273 LOG (llevDebug, "Resetting map %s.\n", m->path);
1274
1275 /* setting this effectively causes an immediate reload */
1276 m->reset_time = 1;
1277 flush_old_maps ();
1278 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1279
1280 if (tmp)
1281 {
1282 enter_exit (tmp, dummy);
1283 dummy->destroy ();
1284 }
1285
1286 return 1;
1287 }
1288 else
1289 {
1290 player *pl;
1291 int playercount = 0;
1292
1293 /* Need to re-insert player if swap failed for some reason */
1294 if (tmp)
1295 {
1296 insert_ob_in_map (op, m, NULL, 0);
1297 dummy->destroy ();
1298 }
1299
1300 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1301 for (pl = first_player; pl != NULL; pl = pl->next)
1302 {
1303 if (pl->ob->map == m && pl->ob != op)
1304 {
1305 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1306 playercount++;
1307 }
1308 }
1309 if (!playercount)
1310 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1311 return 1;
1312 }
1313}
1314
1315int
1316command_nowiz (object *op, char *params) 983command_nowiz (object *op, char *params)
1317{ /* 'noadm' is alias */ 984{ /* 'nodm' is alias */
1318 CLEAR_FLAG (op, FLAG_WIZ); 985 CLEAR_FLAG (op, FLAG_WIZ);
1319 CLEAR_FLAG (op, FLAG_WIZPASS); 986 CLEAR_FLAG (op, FLAG_WIZPASS);
1320 CLEAR_FLAG (op, FLAG_WIZCAST); 987 CLEAR_FLAG (op, FLAG_WIZCAST);
1321 988
1322 if (settings.real_wiz == TRUE)
1323 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1324 if (op->contr->hidden) 989 if (op->contr->hidden)
1325 { 990 {
1326 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 991 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1327 op->map->players++; 992 op->map->players++;
1328 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 993 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
… …
1390 } 1055 }
1391 1056
1392 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1057 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1393 { 1058 {
1394 SET_FLAG (op, FLAG_WIZ); 1059 SET_FLAG (op, FLAG_WIZ);
1395 SET_FLAG (op, FLAG_WAS_WIZ);
1396 SET_FLAG (op, FLAG_WIZPASS); 1060 SET_FLAG (op, FLAG_WIZPASS);
1397 SET_FLAG (op, FLAG_WIZCAST); 1061 SET_FLAG (op, FLAG_WIZCAST);
1062
1398 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1063 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1399 /* 1064 /*
1400 * Remove setting flying here - that won't work, because next 1065 * Remove setting flying here - that won't work, because next
1401 * fix_player() is called that will get cleared - proper solution 1066 * fix_player() is called that will get cleared - proper solution
1402 * is probably something like a wiz_force which gives that and any 1067 * is probably something like a wiz_force which gives that and any
… …
1437command_invisible (object *op, char *params) 1102command_invisible (object *op, char *params)
1438{ 1103{
1439 if (op) 1104 if (op)
1440 { 1105 {
1441 op->invisible += 100; 1106 op->invisible += 100;
1442 update_object (op, UP_OBJ_FACE); 1107 update_object (op, UP_OBJ_CHANGE);
1443 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1108 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1444 } 1109 }
1445 1110
1446 return 0; 1111 return 0;
1447} 1112}

Diff Legend

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