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.17 by root, Wed Nov 8 00:52:56 2006 UTC vs.
Revision 1.44 by root, Mon May 28 21:28:36 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 to <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 }
62
72 if (pl->state != ST_PLAYING) 63 if (pl->ns->state != ST_PLAYING)
73 { 64 {
74 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.");
75 return NULL; 66 return NULL;
67 }
68
69 return pl;
76 } 70 }
71
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
77 return pl; 73 return 0;
78} 74}
79 75
80/** 76/**
81 * Actually hides specified player (obviously a DM). 77 * Actually hides specified player (obviously a DM).
82 * 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,
… …
90 op->contr->hidden = 0; 86 op->contr->hidden = 0;
91 op->invisible = 1; 87 op->invisible = 1;
92 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");
93 op->map->players++; 89 op->map->players++;
94 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
95 if (!silent_dm) 92 if (!silent_dm)
96 {
97 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!");
98 }
99 } 94 }
100 else 95 else
101 { 96 {
102 op->contr->hidden = 1; 97 op->contr->hidden = 1;
103 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.");
104 op->map->players--; 99 op->map->players--;
100
105 if (!silent_dm) 101 if (!silent_dm)
106 {
107 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..");
108 } 103
109 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);
110 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);
111 } 106 }
112} 107}
113 108
… …
177 172
178 become_follower (ob, god); 173 become_follower (ob, god);
179 return 1; 174 return 1;
180} 175}
181 176
182/** 177// TODO: Rewrite banish in perl and get rid of the following two functions
183 * Add player's IP to ban_file and kick them off the server
184 * I know most people have dynamic IPs but this is more of a short term
185 * solution if they have to get a new IP to play maybe they'll calm down.
186 * This uses the banish_file in the local directory *not* the ban_file
187 * The action is logged with a ! for easy searching. -tm
188 */
189int
190command_banish (object *op, char *params)
191{
192 player *pl;
193 FILE *banishfile;
194 char buf[MAX_BUF];
195 time_t now;
196
197 if (!params)
198 {
199 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
200 return 1;
201 }
202
203 pl = get_other_player_from_name (op, params);
204 if (!pl)
205 return 1;
206
207 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
208
209 if ((banishfile = fopen (buf, "a")) == NULL)
210 {
211 LOG (llevDebug, "Could not find file banish_file.\n");
212 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
213 return 0;
214 }
215
216 now = time (NULL);
217 /*
218 * Record this as a comment - then we don't have to worry about changing
219 * the parsing code.
220 */
221 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket.host, &op->name, ctime (&now));
222 fprintf (banishfile, "*@%s\n", pl->socket.host);
223 fclose (banishfile);
224
225 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host);
226 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
227 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
228 command_kick (op, (char *) &pl->ob->name);
229 return 1;
230}
231
232int 178int
233command_kick (object *op, char *params) 179command_kick (object *op, char *params)
234{ 180{
235 for (player *pl = first_player; pl; pl = pl->next) 181 for_all_players (pl)
236 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)))
237 { 183 {
238 object *op = pl->ob; 184 object *op = pl->ob;
239 185
240 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 186 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
241 { 187 {
242 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 188 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
243 strcpy (op->contr->killer, "kicked"); 189 strcpy (op->contr->killer, "kicked");
244 } 190 }
245 191
246 pl->socket.status = Ns_Dead; 192 pl->ns->destroy ();
247 } 193 }
248 194
249 return 1; 195 return 1;
250} 196}
251 197
198//TODO
199#if 0
252int 200int
253command_save_overlay (object *op, char *params) 201command_save_overlay (object *op, char *params)
254{ 202{
255 if (!op) 203 if (!op)
256 return 0; 204 return 0;
… …
267 215
268 ready_map_name (op->map->path, 0); 216 ready_map_name (op->map->path, 0);
269 217
270 return 1; 218 return 1;
271} 219}
272 220#endif
273int
274command_shutdown (object *op, char *params)
275{
276 struct pl *pl;
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
349 free_object (dummy); 285 pl->ob->enter_exit (dummy);
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;
354} 291}
… …
378 { 315 {
379 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 316 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
380 return 1; 317 return 1;
381 } 318 }
382 319
383 dummy = get_object (); 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 free_object (dummy); 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 = get_object ();
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 free_object (dummy);
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)
… …
724 * so just copying it over should be fine. 614 * so just copying it over should be fine.
725 */ 615 */
726 if (!head) 616 if (!head)
727 { 617 {
728 head = dup; 618 head = dup;
729 copy_object (tmp, dup); 619 tmp->copy_to (dup);
730 } 620 }
731
732 if (settings.real_wiz == FALSE)
733 SET_FLAG (dup, FLAG_WAS_WIZ);
734 621
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
… …
761 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 648 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
762 { 649 {
763 if (head->x < size_x || head->y < size_y) 650 if (head->x < size_x || head->y < size_y)
764 { 651 {
765 dm_stack_pop (op->contr); 652 dm_stack_pop (op->contr);
766 free_object (head); 653 head->destroy ();
767 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 654 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
768 free_object (tmp); 655 tmp->destroy ();
769 return 1; 656 return 1;
770 } 657 }
771 658
772 check = head; 659 check = head;
773 660
… …
795 682
796 esrv_send_item (op, head); 683 esrv_send_item (op, head);
797 } 684 }
798 685
799 /* free the one we used to copy */ 686 /* free the one we used to copy */
800 free_object (tmp); 687 tmp->destroy ();
801 } 688 }
802 689
803 return 1; 690 return 1;
804} 691}
805 692
… …
854 free (dump); 741 free (dump);
855 742
856 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 743 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
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;
860}
861
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; 746 return 1;
963} 747}
964 748
965int 749int
966command_patch (object *op, char *params) 750command_patch (object *op, char *params)
… …
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
… …
1025 dm_stack_pop (op->contr); 806 dm_stack_pop (op->contr);
1026 807
1027 /* Always work on the head - otherwise object will get in odd state */ 808 /* Always work on the head - otherwise object will get in odd state */
1028 if (tmp->head) 809 if (tmp->head)
1029 tmp = tmp->head; 810 tmp = tmp->head;
1030 remove_ob (tmp); 811 tmp->remove ();
1031 return 1; 812 return 1;
1032} 813}
1033 814
1034int 815int
1035command_free (object *op, char *params) 816command_free (object *op, char *params)
… …
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 remove_ob (tmp);
1056 }
1057
1058 if (tmp->head) 833 if (tmp->head)
1059 tmp = tmp->head; 834 tmp = tmp->head;
1060 free_object (tmp); 835
836 tmp->destroy ();
1061 return 1; 837 return 1;
1062} 838}
1063 839
1064/** 840/**
1065 * This adds exp to a player. We now allow adding to a specific skill. 841 * This adds exp to a player. We now allow adding to a specific skill.
… …
1068command_addexp (object *op, char *params) 844command_addexp (object *op, char *params)
1069{ 845{
1070 char buf[MAX_BUF], skill[MAX_BUF]; 846 char buf[MAX_BUF], skill[MAX_BUF];
1071 int i, q; 847 int i, q;
1072 object *skillob = NULL; 848 object *skillob = NULL;
1073 player *pl;
1074 849
1075 skill[0] = '\0'; 850 skill[0] = '\0';
1076 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))
1077 { 852 {
1078 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>].");
1079 return 1; 854 return 1;
1080 } 855 }
1081 856
1082 for (pl = first_player; pl != NULL; pl = pl->next) 857 for_all_players (pl)
1083 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 858 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1084 break;
1085
1086 if (pl == NULL)
1087 { 859 {
1088 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1089 return 1;
1090 }
1091
1092 if (q >= 3) 860 if (q >= 3)
1093 { 861 {
1094 skillob = find_skill_by_name (pl->ob, skill); 862 skillob = find_skill_by_name (pl->ob, skill);
1095 if (!skillob) 863 if (!skillob)
1096 { 864 {
1097 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
1098 return 1; 879 return 1;
1099 } 880 }
1100 881
1101 i = check_exp_adjust (skillob, i); 882 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1102 skillob->stats.exp += i;
1103 calc_perm_exp (skillob);
1104 player_lvl_adj (pl->ob, skillob);
1105 }
1106
1107 pl->ob->stats.exp += i;
1108 calc_perm_exp (pl->ob);
1109 player_lvl_adj (pl->ob, NULL);
1110
1111 if (settings.real_wiz == FALSE)
1112 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1113 return 1; 883 return 1;
1114} 884}
1115 885
1116/**************************************************************************/ 886/**************************************************************************/
1117 887
… …
1123 893
1124int 894int
1125command_stats (object *op, char *params) 895command_stats (object *op, char *params)
1126{ 896{
1127 char thing[20]; 897 char thing[20];
1128 player *pl;
1129 char buf[MAX_BUF]; 898 char buf[MAX_BUF];
1130 899
1131 thing[0] = '\0'; 900 thing[0] = '\0';
1132 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 901 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1133 { 902 {
1134 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 903 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1135 return 1; 904 return 1;
1136 } 905 }
1137 906
1138 for (pl = first_player; pl != NULL; pl = pl->next) 907 for_all_players (pl)
1139 if (!strcmp (pl->ob->name, thing)) 908 if (!strcmp (pl->ob->name, thing))
1140 { 909 {
1141 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);
1142 new_draw_info (NDI_UNIQUE, 0, op, buf); 911 new_draw_info (NDI_UNIQUE, 0, op, buf);
1143 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);
1144 new_draw_info (NDI_UNIQUE, 0, op, buf); 913 new_draw_info (NDI_UNIQUE, 0, op, buf);
1145 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 914 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1146 new_draw_info (NDI_UNIQUE, 0, op, buf); 915 new_draw_info (NDI_UNIQUE, 0, op, buf);
1147 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 916 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 917 new_draw_info (NDI_UNIQUE, 0, op, buf);
1149 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 918 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1150 new_draw_info (NDI_UNIQUE, 0, op, buf); 919 new_draw_info (NDI_UNIQUE, 0, op, buf);
1151 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);
1152 new_draw_info (NDI_UNIQUE, 0, op, buf); 921 new_draw_info (NDI_UNIQUE, 0, op, buf);
1153 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);
1154 new_draw_info (NDI_UNIQUE, 0, op, buf); 923 new_draw_info (NDI_UNIQUE, 0, op, buf);
1155 break; 924 return 1;
1156 } 925 }
1157 if (pl == NULL) 926
1158 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 927 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1159 return 1; 928 return 1;
1160} 929}
1161 930
1162int 931int
1163command_abil (object *op, char *params) 932command_abil (object *op, char *params)
1164{ 933{
1165 char thing[20], thing2[20]; 934 char thing[20], thing2[20];
1166 int iii; 935 int iii;
1167 player *pl;
1168 char buf[MAX_BUF]; 936 char buf[MAX_BUF];
1169 937
1170 iii = 0; 938 iii = 0;
1171 thing[0] = '\0'; 939 thing[0] = '\0';
1172 thing2[0] = '\0'; 940 thing2[0] = '\0';
… …
1186 { 954 {
1187 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");
1188 return 1; 956 return 1;
1189 } 957 }
1190 958
1191 for (pl = first_player; pl != NULL; pl = pl->next) 959 for_all_players (pl)
1192 { 960 {
1193 if (!strcmp (pl->ob->name, thing)) 961 if (!strcmp (pl->ob->name, thing))
1194 { 962 {
1195 if (settings.real_wiz == FALSE)
1196 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1197 if (!strcmp ("str", thing2))
1198 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;
1199 if (!strcmp ("dex", thing2))
1200 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;
1201 if (!strcmp ("con", thing2))
1202 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;
1203 if (!strcmp ("wis", thing2))
1204 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;
1205 if (!strcmp ("cha", thing2))
1206 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;
1207 if (!strcmp ("int", thing2))
1208 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;
1209 if (!strcmp ("pow", thing2))
1210 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
1211 sprintf (buf, "%s has been altered.", &pl->ob->name); 971 sprintf (buf, "%s has been altered.", &pl->ob->name);
1212 new_draw_info (NDI_UNIQUE, 0, op, buf); 972 new_draw_info (NDI_UNIQUE, 0, op, buf);
1213 fix_player (pl->ob); 973 pl->ob->update_stats ();
1214 return 1; 974 return 1;
1215 } 975 }
1216 } 976 }
1217 977
1218 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 978 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1219 return 1; 979 return 1;
1220} 980}
1221 981
1222int 982int
1223command_reset (object *op, char *params)
1224{
1225 maptile *m;
1226 object *dummy = NULL, *tmp = NULL;
1227
1228 if (params == NULL)
1229 {
1230 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1231 return 1;
1232 }
1233
1234 if (strcmp (params, ".") == 0)
1235 params = op->map->path;
1236
1237 m = has_been_loaded (params);
1238 if (m == NULL)
1239 {
1240 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1241 return 1;
1242 }
1243
1244 if (m->in_memory != MAP_SWAPPED)
1245 {
1246 if (m->in_memory != MAP_IN_MEMORY)
1247 {
1248 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1249 return 0;
1250 }
1251
1252 /*
1253 * Only attempt to remove the player that is doing the reset, and not other
1254 * players or wiz's.
1255 */
1256 if (op->map == m)
1257 {
1258 dummy = get_object ();
1259 dummy->map = NULL;
1260 EXIT_X (dummy) = op->x;
1261 EXIT_Y (dummy) = op->y;
1262 EXIT_PATH (dummy) = op->map->path;
1263 remove_ob (op);
1264 op->map = NULL;
1265 tmp = op;
1266 }
1267 swap_map (m);
1268 }
1269
1270 if (m->in_memory == MAP_SWAPPED)
1271 {
1272 LOG (llevDebug, "Resetting map %s.\n", m->path);
1273
1274 /* setting this effectively causes an immediate reload */
1275 m->reset_time = 1;
1276 flush_old_maps ();
1277 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1278 if (tmp)
1279 {
1280 enter_exit (tmp, dummy);
1281 free_object (dummy);
1282 }
1283 return 1;
1284 }
1285 else
1286 {
1287 player *pl;
1288 int playercount = 0;
1289
1290 /* Need to re-insert player if swap failed for some reason */
1291 if (tmp)
1292 {
1293 insert_ob_in_map (op, m, NULL, 0);
1294 free_object (dummy);
1295 }
1296
1297 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1298 for (pl = first_player; pl != NULL; pl = pl->next)
1299 {
1300 if (pl->ob->map == m && pl->ob != op)
1301 {
1302 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1303 playercount++;
1304 }
1305 }
1306 if (!playercount)
1307 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1308 return 1;
1309 }
1310}
1311
1312int
1313command_nowiz (object *op, char *params) 983command_nowiz (object *op, char *params)
1314{ /* 'noadm' is alias */ 984{ /* 'nodm' is alias */
1315 CLEAR_FLAG (op, FLAG_WIZ); 985 CLEAR_FLAG (op, FLAG_WIZ);
1316 CLEAR_FLAG (op, FLAG_WIZPASS); 986 CLEAR_FLAG (op, FLAG_WIZPASS);
1317 CLEAR_FLAG (op, FLAG_WIZCAST); 987 CLEAR_FLAG (op, FLAG_WIZCAST);
1318 988
1319 if (settings.real_wiz == TRUE)
1320 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1321 if (op->contr->hidden) 989 if (op->contr->hidden)
1322 { 990 {
1323 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");
1324 op->map->players++; 992 op->map->players++;
1325 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);
… …
1384 { 1052 {
1385 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1053 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1386 return 0; 1054 return 0;
1387 } 1055 }
1388 1056
1389 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1057 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1390 { 1058 {
1391 SET_FLAG (op, FLAG_WIZ); 1059 SET_FLAG (op, FLAG_WIZ);
1392 SET_FLAG (op, FLAG_WAS_WIZ);
1393 SET_FLAG (op, FLAG_WIZPASS); 1060 SET_FLAG (op, FLAG_WIZPASS);
1394 SET_FLAG (op, FLAG_WIZCAST); 1061 SET_FLAG (op, FLAG_WIZCAST);
1062
1395 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!");
1396 /* 1064 /*
1397 * Remove setting flying here - that won't work, because next 1065 * Remove setting flying here - that won't work, because next
1398 * fix_player() is called that will get cleared - proper solution 1066 * fix_player() is called that will get cleared - proper solution
1399 * 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
… …
1434command_invisible (object *op, char *params) 1102command_invisible (object *op, char *params)
1435{ 1103{
1436 if (op) 1104 if (op)
1437 { 1105 {
1438 op->invisible += 100; 1106 op->invisible += 100;
1439 update_object (op, UP_OBJ_FACE); 1107 update_object (op, UP_OBJ_CHANGE);
1440 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1108 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1441 } 1109 }
1442 1110
1443 return 0; 1111 return 0;
1444} 1112}
… …
1565 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1233 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1566 return 0; 1234 return 0;
1567 } 1235 }
1568 1236
1569 do_learn_spell (op, tmp, special_prayer); 1237 do_learn_spell (op, tmp, special_prayer);
1570 free_object (tmp); 1238 tmp->destroy ();
1571 return 1; 1239 return 1;
1572} 1240}
1573 1241
1574int 1242int
1575command_learn_spell (object *op, char *params) 1243command_learn_spell (object *op, char *params)
… …
1987 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1655 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1988 return 0; 1656 return 0;
1989 } 1657 }
1990 1658
1991 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1659 if (!QUERY_FLAG (right, FLAG_REMOVED))
1992 remove_ob (right); 1660 right->remove ();
1993 inserted = insert_ob_in_ob (right, left); 1661 inserted = insert_ob_in_ob (right, left);
1994 if (left->type == PLAYER) 1662 if (left->type == PLAYER)
1995 if (inserted == right) 1663 if (inserted == right)
1996 esrv_send_item (left, right); 1664 esrv_send_item (left, right);
1997 else 1665 else

Diff Legend

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