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.13 by root, Fri Sep 15 23:31:34 2006 UTC vs.
Revision 1.53 by root, Thu Nov 8 19:43:26 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#ifndef __CEXTRACT__
26# include <sproto.h> 25#include <sproto.h>
27#endif
28#include <spells.h> 26#include <spells.h>
29#include <treasure.h> 27#include <treasure.h>
30#include <skills.h> 28#include <skills.h>
31 29
32/** Defines for DM item stack **/ 30/** Defines for DM item stack **/
… …
47 * other player, or NULL otherwise. 45 * other player, or NULL otherwise.
48 */ 46 */
49static player * 47static player *
50get_other_player_from_name (object *op, char *name) 48get_other_player_from_name (object *op, char *name)
51{ 49{
52 player *pl;
53
54 if (!name) 50 if (!name)
55 return NULL; 51 return NULL;
56 52
57 for (pl = first_player; pl != NULL; pl = pl->next) 53 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 54 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 55 {
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
64 return NULL;
65 }
66
67 if (pl->ob == op) 56 if (pl->ob == op)
68 { 57 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 58 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 59 return NULL;
71 } 60 }
61
72 if (pl->state != ST_PLAYING) 62 if (pl->ns->state != ST_PLAYING)
73 { 63 {
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 64 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
75 return NULL; 65 return NULL;
76 }
77 return pl;
78}
79
80/**
81 * This command will stress server.
82 */
83int
84command_loadtest (object *op, char *params)
85{
86 uint32 x, y;
87 char buf[1024];
88
89 new_draw_info (NDI_UNIQUE, 0, op, "loadtest will stress server through teleporting");
90 new_draw_info (NDI_UNIQUE, 0, op, "at different map places.");
91 new_draw_info (NDI_UNIQUE, 0, op, "use at your own risks.");
92 new_draw_info (NDI_UNIQUE, 0, op, "Very long loop used so server may have to be reset.");
93 new_draw_info (NDI_UNIQUE, 0, op, "type loadtest TRUE to run");
94 new_draw_info_format (NDI_UNIQUE, 0, op, "{%s}", params);
95
96 if (!params)
97 return 0;
98
99 if (strncmp (params, "TRUE", 4))
100 return 0;
101
102 new_draw_info_format (NDI_UNIQUE, 0, op, "gogogo");
103
104 for (x = 0; x < settings.worldmaptilesx; x++)
105 {
106 for (y = 0; y < settings.worldmaptilesy; y++)
107 {
108 sprintf (buf, "/world/world_%d_%d", x + settings.worldmapstartx, y + settings.worldmapstarty);
109 command_goto (op, buf);
110 } 66 }
67
68 return pl;
111 } 69 }
112 70
71 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
113 return 0; 72 return 0;
114} 73}
115 74
116/** 75/**
117 * Actually hides specified player (obviously a DM). 76 * Actually hides specified player (obviously a DM).
… …
126 op->contr->hidden = 0; 85 op->contr->hidden = 0;
127 op->invisible = 1; 86 op->invisible = 1;
128 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 87 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
129 op->map->players++; 88 op->map->players++;
130 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 89 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
90
131 if (!silent_dm) 91 if (!silent_dm)
132 {
133 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 92 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
134 }
135 } 93 }
136 else 94 else
137 { 95 {
138 op->contr->hidden = 1; 96 op->contr->hidden = 1;
139 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); 97 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
140 op->map->players--; 98 op->map->players--;
99
141 if (!silent_dm) 100 if (!silent_dm)
142 {
143 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 101 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
144 } 102
145 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); 103 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name);
146 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); 104 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name);
147 } 105 }
148} 106}
149 107
… …
213 171
214 become_follower (ob, god); 172 become_follower (ob, god);
215 return 1; 173 return 1;
216} 174}
217 175
218/** 176// TODO: Rewrite banish in perl and get rid of the following two functions
219 * Add player's IP to ban_file and kick them off the server
220 * I know most people have dynamic IPs but this is more of a short term
221 * solution if they have to get a new IP to play maybe they'll calm down.
222 * This uses the banish_file in the local directory *not* the ban_file
223 * The action is logged with a ! for easy searching. -tm
224 */
225int
226command_banish (object *op, char *params)
227{
228 player *pl;
229 FILE *banishfile;
230 char buf[MAX_BUF];
231 time_t now;
232
233 if (!params)
234 {
235 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
236 return 1;
237 }
238
239 pl = get_other_player_from_name (op, params);
240 if (!pl)
241 return 1;
242
243 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
244
245 if ((banishfile = fopen (buf, "a")) == NULL)
246 {
247 LOG (llevDebug, "Could not find file banish_file.\n");
248 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
249 return 0;
250 }
251
252 now = time (NULL);
253 /*
254 * Record this as a comment - then we don't have to worry about changing
255 * the parsing code.
256 */
257 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket.host, &op->name, ctime (&now));
258 fprintf (banishfile, "*@%s\n", pl->socket.host);
259 fclose (banishfile);
260
261 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host);
262 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
263 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
264 command_kick (op, (char *) &pl->ob->name);
265 return 1;
266}
267
268int 177int
269command_kick (object *op, char *params) 178command_kick (object *op, char *params)
270{ 179{
271 struct pl *pl; 180 for_all_players (pl)
272
273 for (pl = first_player; pl != NULL; pl = pl->next)
274 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) 181 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
275 { 182 {
276 object *op = pl->ob; 183 object *op = pl->ob;
277 184
278 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 185 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
279 { 186 {
280 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 187 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
281 strcpy (op->contr->killer, "kicked"); 188 strcpy (op->contr->killer, "kicked");
282 } 189 }
283 190
284 pl->socket.status = Ns_Dead; 191 pl->ns->destroy ();
285 } 192 }
286 193
287 return 1; 194 return 1;
288} 195}
289 196
197//TODO
198#if 0
290int 199int
291command_save_overlay (object *op, char *params) 200command_save_overlay (object *op, char *params)
292{ 201{
293 if (!op) 202 if (!op)
294 return 0; 203 return 0;
… …
305 214
306 ready_map_name (op->map->path, 0); 215 ready_map_name (op->map->path, 0);
307 216
308 return 1; 217 return 1;
309} 218}
310 219#endif
311int
312command_shutdown (object *op, char *params)
313{
314 struct pl *pl;
315
316 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
317 {
318 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
319 return 1;
320 }
321
322 cleanup ();
323 /* not reached */
324 return 1;
325}
326
327int
328command_goto (object *op, char *params)
329{
330 char *name;
331 object *dummy;
332
333 if (!op)
334 return 0;
335
336 if (params == NULL)
337 {
338 new_draw_info (NDI_UNIQUE, 0, op, "Go to what level?");
339 return 1;
340 }
341
342 name = params;
343 dummy = get_object ();
344 dummy->map = op->map;
345 EXIT_PATH (dummy) = name;
346 dummy->name = name;
347
348 enter_exit (op, dummy);
349 free_object (dummy);
350 if (op->contr->loading == NULL)
351 {
352 new_draw_info_format (NDI_UNIQUE, 0, op, "Difficulty: %d.", op->map->difficulty);
353 }
354
355 return 1;
356}
357
358/* is this function called from somewhere ? -Tero */
359int
360command_generate (object *op, char *params)
361{
362 object *tmp;
363 int nr = 1, i, retry;
364
365 if (!op)
366 return 0;
367
368 if (params != NULL)
369 sscanf (params, "%d", &nr);
370 for (i = 0; i < nr; i++)
371 {
372 retry = 50;
373 while ((tmp = generate_treasure (0, op->map->difficulty)) == NULL && --retry)
374 ;
375 if (tmp != NULL)
376 {
377 tmp = insert_ob_in_ob (tmp, op);
378 if (op->type == PLAYER)
379 esrv_send_item (op, tmp);
380 }
381 }
382
383 return 1;
384}
385 220
386int 221int
387command_freeze (object *op, char *params) 222command_freeze (object *op, char *params)
388{ 223{
389 int ticks; 224 int ticks;
… …
425 object *dummy; 260 object *dummy;
426 player *pl; 261 player *pl;
427 262
428 if (!op) 263 if (!op)
429 return 0; 264 return 0;
265
430 if (params == NULL) 266 if (params == NULL)
431 { 267 {
432 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 268 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
433 return 1; 269 return 1;
434 } 270 }
271
435 pl = get_other_player_from_name (op, params); 272 pl = get_other_player_from_name (op, params);
436 if (!pl) 273 if (!pl)
437 return 1; 274 return 1;
275
438 dummy = get_jail_exit (pl->ob); 276 dummy = get_jail_exit (pl->ob);
439 if (!dummy) 277 if (!dummy)
440 { 278 {
441 /* we have nowhere to send the prisoner.... */ 279 /* we have nowhere to send the prisoner.... */
442 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 280 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
443 return 0; 281 return 0;
444 } 282 }
445 enter_exit (pl->ob, dummy); 283
446 free_object (dummy); 284 pl->ob->enter_exit (dummy);
285 dummy->destroy ();
447 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 286 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
448 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 287 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
449 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 288 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
450 return 1; 289 return 1;
451} 290}
… …
475 { 314 {
476 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 315 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
477 return 1; 316 return 1;
478 } 317 }
479 318
480 dummy = get_object (); 319 dummy = object::create ();
481 EXIT_PATH (dummy) = op->map->path; 320 EXIT_PATH (dummy) = op->map->path;
482 EXIT_X (dummy) = op->x + freearr_x[i]; 321 EXIT_X (dummy) = op->x + freearr_x[i];
483 EXIT_Y (dummy) = op->y + freearr_y[i]; 322 EXIT_Y (dummy) = op->y + freearr_y[i];
484 enter_exit (pl->ob, dummy); 323 pl->ob->enter_exit (dummy);
485 free_object (dummy); 324 dummy->destroy ();
486 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 325 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
487 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 326 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
488 327
489 return 1;
490}
491
492/**
493 * Teleport next to target player.
494 */
495
496/* mids 01/16/2002 */
497int
498command_teleport (object *op, char *params)
499{
500 int i;
501 object *dummy;
502 player *pl;
503
504 if (!op)
505 return 0;
506
507 if (params == NULL)
508 {
509 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
510 return 1;
511 }
512
513 pl = get_other_player_from_name (op, params);
514 if (!pl)
515 return 1;
516
517 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
518 if (i == -1)
519 {
520 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
521 return 1;
522 }
523
524 dummy = get_object ();
525 EXIT_PATH (dummy) = pl->ob->map->path;
526 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
527 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
528 enter_exit (op, dummy);
529 free_object (dummy);
530 if (!op->contr->hidden)
531 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
532 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
533 return 1; 328 return 1;
534} 329}
535 330
536/** 331/**
537 * This function is a real mess, because we're stucking getting 332 * This function is a real mess, because we're stucking getting
… …
627 * we also set up spell_name which is only 422 * we also set up spell_name which is only
628 * the first word. 423 * the first word.
629 */ 424 */
630 425
631 at_spell = archetype::find (cp); 426 at_spell = archetype::find (cp);
632 if (!at_spell || at_spell->clone.type != SPELL) 427 if (!at_spell || at_spell->type != SPELL)
633 at_spell = find_archetype_by_object_name (cp); 428 at_spell = find_archetype_by_object_name (cp);
634 if (!at_spell || at_spell->clone.type != SPELL) 429 if (!at_spell || at_spell->type != SPELL)
635 { 430 {
636 strcpy (spell_name, cp); 431 assign (spell_name, cp);
637 fsp = strchr (spell_name, ' '); 432 fsp = strchr (spell_name, ' ');
638 if (fsp) 433 if (fsp)
639 { 434 {
640 *fsp = 0; 435 *fsp = 0;
641 fsp++; 436 fsp++;
642 at_spell = archetype::find (spell_name); 437 at_spell = archetype::find (spell_name);
643 438
644 /* Got a spell, update the first string pointer */ 439 /* Got a spell, update the first string pointer */
645 if (at_spell && at_spell->clone.type == SPELL) 440 if (at_spell && at_spell->type == SPELL)
646 bp2 = cp + strlen (spell_name) + 1; 441 bp2 = cp + strlen (spell_name) + 1;
647 else 442 else
648 at_spell = NULL; 443 at_spell = NULL;
649 } 444 }
650 } 445 }
… …
652 /* OK - we didn't find a spell - presume the 'of' 447 /* OK - we didn't find a spell - presume the 'of'
653 * in this case means its an artifact. 448 * in this case means its an artifact.
654 */ 449 */
655 if (!at_spell) 450 if (!at_spell)
656 { 451 {
657 if (find_artifactlist (at->clone.type) == NULL) 452 if (find_artifactlist (at->type) == NULL)
658 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type); 453 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
659 else 454 else
660 { 455 {
661 art = find_artifactlist (at->clone.type)->items; 456 art = find_artifactlist (at->type)->items;
662 457
663 do 458 while (art)
664 { 459 {
665 if (!strcmp (art->item->name, cp)) 460 if (!strcmp (art->item->name, cp))
666 break; 461 break;
462
667 art = art->next; 463 art = art->next;
668 } 464 }
669 while (art != NULL);
670 465
671 if (!art) 466 if (!art)
672 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 467 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
673 } 468 }
674 469
675 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 470 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
676 } 471 }
677 } /* if cp */ 472 } /* if cp */
678 473
679 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 474 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
680 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 475 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
681 { 476 {
682 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp); 477 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp);
683 return 1; 478 return 1;
684 } 479 }
685 480
… …
687 * Rather than have two different blocks with a lot of similar code, 482 * Rather than have two different blocks with a lot of similar code,
688 * just create one object, do all the processing, and then determine 483 * just create one object, do all the processing, and then determine
689 * if that one object should be inserted or if we need to make copies. 484 * if that one object should be inserted or if we need to make copies.
690 */ 485 */
691 tmp = arch_to_object (at); 486 tmp = arch_to_object (at);
692
693 if (settings.real_wiz == FALSE)
694 SET_FLAG (tmp, FLAG_WAS_WIZ);
695 487
696 if (set_magic) 488 if (set_magic)
697 set_abs_magic (tmp, magic); 489 set_abs_magic (tmp, magic);
698 490
699 if (art) 491 if (art)
… …
779 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 571 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
780 572
781 bp2 = bp3 + 1; 573 bp2 = bp3 + 1;
782 } 574 }
783 575
784 if (at->clone.nrof) 576 if (at->nrof)
785 { 577 {
786 if (at_spell) 578 if (at_spell)
787 insert_ob_in_ob (arch_to_object (at_spell), tmp); 579 insert_ob_in_ob (arch_to_object (at_spell), tmp);
788 580
789 tmp->x = op->x; 581 tmp->x = op->x;
… …
804 } 596 }
805 else 597 else
806 { 598 {
807 for (i = 0; i < (set_nrof ? nrof : 1); i++) 599 for (i = 0; i < (set_nrof ? nrof : 1); i++)
808 { 600 {
809 archetype *atmp;
810 object *prev = 0, *head = 0; 601 object *prev = 0, *head = 0;
811 602
812 for (atmp = at; atmp; atmp = atmp->more) 603 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
813 { 604 {
814 object *dup = arch_to_object (atmp); 605 object *dup = arch_to_object (atmp);
815 606
816 if (at_spell) 607 if (at_spell)
817 insert_ob_in_ob (arch_to_object (at_spell), dup); 608 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
821 * so just copying it over should be fine. 612 * so just copying it over should be fine.
822 */ 613 */
823 if (!head) 614 if (!head)
824 { 615 {
825 head = dup; 616 head = dup;
826 copy_object (tmp, dup); 617 tmp->copy_to (dup);
827 } 618 }
828 619
829 if (settings.real_wiz == FALSE)
830 SET_FLAG (dup, FLAG_WAS_WIZ);
831
832 dup->x = op->x + dup->arch->clone.x; 620 dup->x = op->x + dup->arch->x;
833 dup->y = op->y + dup->arch->clone.y; 621 dup->y = op->y + dup->arch->y;
834 dup->map = op->map; 622 dup->map = op->map;
835 623
836 if (head != dup) 624 if (head != dup)
837 { 625 {
838 dup->head = head; 626 dup->head = head;
… …
848 int size_x = 0; 636 int size_x = 0;
849 int size_y = 0; 637 int size_y = 0;
850 638
851 while (check) 639 while (check)
852 { 640 {
853 size_x = MAX (size_x, check->arch->clone.x); 641 size_x = MAX (size_x, check->arch->x);
854 size_y = MAX (size_y, check->arch->clone.y); 642 size_y = MAX (size_y, check->arch->y);
855 check = check->more; 643 check = check->more;
856 } 644 }
857 645
858 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 646 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
859 { 647 {
860 if (head->x < size_x || head->y < size_y) 648 if (head->x < size_x || head->y < size_y)
861 { 649 {
862 dm_stack_pop (op->contr); 650 dm_stack_pop (op->contr);
863 free_object (head); 651 head->destroy ();
864 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 652 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
865 free_object (tmp); 653 tmp->destroy ();
866 return 1; 654 return 1;
867 } 655 }
868 656
869 check = head; 657 check = head;
870 658
… …
885 /* Wonder if we really want to push all of these, but since 673 /* Wonder if we really want to push all of these, but since
886 * things like rods have nrof 0, we want to cover those. 674 * things like rods have nrof 0, we want to cover those.
887 */ 675 */
888 dm_stack_push (op->contr, head->count); 676 dm_stack_push (op->contr, head->count);
889 677
890 if (at->clone.randomitems != NULL && !at_spell) 678 if (at->randomitems != NULL && !at_spell)
891 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 679 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
892 680
893 esrv_send_item (op, head); 681 esrv_send_item (op, head);
894 } 682 }
895 683
896 /* free the one we used to copy */ 684 /* free the one we used to copy */
897 free_object (tmp); 685 tmp->destroy ();
898 } 686 }
899 687
900 return 1; 688 return 1;
901} 689}
902 690
… …
905 */ 693 */
906 694
907int 695int
908command_inventory (object *op, char *params) 696command_inventory (object *op, char *params)
909{ 697{
698 int i;
910 object *tmp; 699 object *tmp;
911 int i;
912 700
913 if (!params) 701 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
914 { 702 {
915 inventory (op, NULL); 703 op->contr->failmsg ("Inventory of what object (nr)?");
916 return 0; 704 return 1;
917 }
918
919 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
920 { 705 }
921 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
922 return 1;
923 }
924 706
925 inventory (op, tmp); 707 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
708
926 return 1; 709 return 1;
927} 710}
928 711
929/* just show player's their skills for now. Dm's can 712/* just show player's their skills for now. Dm's can
930 * already see skills w/ inventory command - b.t. 713 * already see skills w/ inventory command - b.t.
… …
944 727
945 tmp = get_dm_object (op->contr, &params, NULL); 728 tmp = get_dm_object (op->contr, &params, NULL);
946 if (!tmp) 729 if (!tmp)
947 return 1; 730 return 1;
948 731
949 dump_object (tmp); 732 char *dump = dump_object (tmp);
950 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 733 new_draw_info (NDI_UNIQUE, 0, op, dump);
734 free (dump);
735
951 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 736 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
952 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 737 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
953 return 1;
954}
955 738
956/**
957 * When DM is possessing a monster, flip aggression on and off, to allow
958 * better motion.
959 */
960int
961command_mon_aggr (object *op, char *params)
962{
963 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
964 {
965 op->enemy = NULL;
966 SET_FLAG (op, FLAG_UNAGGRESSIVE);
967 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
968 }
969 else
970 {
971 CLEAR_FLAG (op, FLAG_FRIENDLY);
972 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
973 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
974 }
975
976 return 1;
977}
978
979/** DM can possess a monster. Basically, this tricks the client into thinking
980 * a given monster, is actually the player it controls. This allows a DM
981 * to inhabit a monster's body, and run around the game with it.
982 * This function is severely broken - it has tons of hardcoded values,
983 */
984int
985command_possess (object *op, char *params)
986{
987 object *victim, *curinv, *nextinv;
988 player *pl;
989 int i;
990 char buf[MAX_BUF];
991
992 victim = NULL;
993 if (params != NULL)
994 {
995 if (sscanf (params, "%d", &i))
996 victim = find_object (i);
997 else if (sscanf (params, "%s", buf))
998 victim = find_object_name (buf);
999 }
1000 if (victim == NULL)
1001 {
1002 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
1003 return 1;
1004 }
1005
1006 if (victim == op)
1007 {
1008 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
1009 return 1;
1010 }
1011
1012 /* clear out the old inventory */
1013 curinv = op->inv;
1014 while (curinv != NULL)
1015 {
1016 nextinv = curinv->below;
1017 esrv_del_item (op->contr, curinv->count);
1018 curinv = nextinv;
1019 }
1020
1021 /* make the switch */
1022 pl = op->contr;
1023 victim->contr = pl;
1024 pl->ob = victim;
1025 victim->type = PLAYER;
1026 SET_FLAG (victim, FLAG_WIZ);
1027
1028 /* send the inventory to the client */
1029 curinv = victim->inv;
1030 while (curinv != NULL)
1031 {
1032 nextinv = curinv->below;
1033 esrv_send_item (victim, curinv);
1034 curinv = nextinv;
1035 }
1036 /* basic patchup */
1037 /* The use of hard coded values is terrible. Note
1038 * that really, to be fair, this shouldn't get changed at
1039 * all - if you are possessing a kobold, you should have the
1040 * same limitations. As it is, as more body locations are added,
1041 * this will give this player more locations than perhaps
1042 * they should be allowed.
1043 */
1044 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1045 if (i == 1 || i == 6 || i == 8 || i == 9)
1046 victim->body_info[i] = 2;
1047 else
1048 victim->body_info[i] = 1;
1049
1050 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
1051 esrv_send_inventory (victim, victim);
1052
1053 fix_player (victim);
1054
1055 do_some_living (victim);
1056 return 1; 739 return 1;
1057} 740}
1058 741
1059int 742int
1060command_patch (object *op, char *params) 743command_patch (object *op, char *params)
… …
1075 return 1; 758 return 1;
1076 } 759 }
1077 760
1078 if ((arg2 = strchr (arg, ' '))) 761 if ((arg2 = strchr (arg, ' ')))
1079 arg2++; 762 arg2++;
1080 if (settings.real_wiz == FALSE) 763
1081 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
1082 if (set_variable (tmp, arg) == -1) 764 if (set_variable (tmp, arg) == -1)
1083 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 765 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
1084 else 766 else
1085 {
1086 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 767 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
1087 }
1088 768
1089 return 1; 769 return 1;
1090} 770}
1091 771
1092int 772int
… …
1119 dm_stack_pop (op->contr); 799 dm_stack_pop (op->contr);
1120 800
1121 /* Always work on the head - otherwise object will get in odd state */ 801 /* Always work on the head - otherwise object will get in odd state */
1122 if (tmp->head) 802 if (tmp->head)
1123 tmp = tmp->head; 803 tmp = tmp->head;
1124 remove_ob (tmp); 804 tmp->remove ();
1125 return 1; 805 return 1;
1126} 806}
1127 807
1128int 808int
1129command_free (object *op, char *params) 809command_free (object *op, char *params)
… …
1141 821
1142 if (from != STACK_FROM_STACK) 822 if (from != STACK_FROM_STACK)
1143 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 823 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1144 dm_stack_pop (op->contr); 824 dm_stack_pop (op->contr);
1145 825
1146 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1147 {
1148 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1149 remove_ob (tmp);
1150 }
1151
1152 if (tmp->head) 826 if (tmp->head)
1153 tmp = tmp->head; 827 tmp = tmp->head;
1154 free_object (tmp); 828
829 tmp->destroy ();
1155 return 1; 830 return 1;
1156} 831}
1157 832
1158/** 833/**
1159 * This adds exp to a player. We now allow adding to a specific skill. 834 * This adds exp to a player. We now allow adding to a specific skill.
1160 */ 835 */
1161int 836int
1162command_addexp (object *op, char *params) 837command_addexp (object *op, char *params)
1163{ 838{
1164 char buf[MAX_BUF], skill[MAX_BUF]; 839 char buf[MAX_BUF], skill[MAX_BUF];
1165 int i, q; 840 int q;
841 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1166 object *skillob = NULL; 842 object *skillob = NULL;
1167 player *pl;
1168 843
1169 skill[0] = '\0'; 844 skill[0] = '\0';
1170 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 845 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %s", buf, &i, skill)) < 2))
1171 { 846 {
1172 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 847 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1173 return 1; 848 return 1;
1174 } 849 }
1175 850
1176 for (pl = first_player; pl != NULL; pl = pl->next) 851 for_all_players (pl)
1177 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 852 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1178 break;
1179
1180 if (pl == NULL)
1181 { 853 {
1182 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1183 return 1;
1184 }
1185
1186 if (q >= 3) 854 if (q >= 3)
1187 { 855 {
1188 skillob = find_skill_by_name (pl->ob, skill); 856 skillob = find_skill_by_name (pl->ob, skill);
1189 if (!skillob) 857 if (!skillob)
1190 { 858 {
1191 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 859 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
860 return 1;
861 }
862
863 i = check_exp_adjust (skillob, i);
864 skillob->stats.exp += i;
865 calc_perm_exp (skillob);
866 player_lvl_adj (pl->ob, skillob);
867 }
868
869 pl->ob->stats.exp += i;
870 calc_perm_exp (pl->ob);
871 player_lvl_adj (pl->ob, NULL);
872
1192 return 1; 873 return 1;
1193 } 874 }
1194 875
1195 i = check_exp_adjust (skillob, i); 876 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1196 skillob->stats.exp += i;
1197 calc_perm_exp (skillob);
1198 player_lvl_adj (pl->ob, skillob);
1199 }
1200
1201 pl->ob->stats.exp += i;
1202 calc_perm_exp (pl->ob);
1203 player_lvl_adj (pl->ob, NULL);
1204
1205 if (settings.real_wiz == FALSE)
1206 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1207 return 1; 877 return 1;
1208} 878}
1209 879
1210/**************************************************************************/ 880/**************************************************************************/
1211 881
… …
1217 887
1218int 888int
1219command_stats (object *op, char *params) 889command_stats (object *op, char *params)
1220{ 890{
1221 char thing[20]; 891 char thing[20];
1222 player *pl;
1223 char buf[MAX_BUF]; 892 char buf[MAX_BUF];
1224 893
1225 thing[0] = '\0'; 894 thing[0] = '\0';
1226 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 895 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1227 { 896 {
1228 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 897 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1229 return 1; 898 return 1;
1230 } 899 }
1231 900
1232 for (pl = first_player; pl != NULL; pl = pl->next) 901 for_all_players (pl)
1233 if (!strcmp (pl->ob->name, thing)) 902 if (!strcmp (pl->ob->name, thing))
1234 { 903 {
1235 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 904 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1236 new_draw_info (NDI_UNIQUE, 0, op, buf); 905 new_draw_info (NDI_UNIQUE, 0, op, buf);
1237 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 906 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
1238 new_draw_info (NDI_UNIQUE, 0, op, buf); 907 new_draw_info (NDI_UNIQUE, 0, op, buf);
1239 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 908 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1240 new_draw_info (NDI_UNIQUE, 0, op, buf); 909 new_draw_info (NDI_UNIQUE, 0, op, buf);
1241 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 910 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1242 new_draw_info (NDI_UNIQUE, 0, op, buf); 911 new_draw_info (NDI_UNIQUE, 0, op, buf);
1243 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 912 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1244 new_draw_info (NDI_UNIQUE, 0, op, buf); 913 new_draw_info (NDI_UNIQUE, 0, op, buf);
1245 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 914 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1246 new_draw_info (NDI_UNIQUE, 0, op, buf); 915 new_draw_info (NDI_UNIQUE, 0, op, buf);
1247 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 916 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1248 new_draw_info (NDI_UNIQUE, 0, op, buf); 917 new_draw_info (NDI_UNIQUE, 0, op, buf);
1249 break; 918 return 1;
1250 } 919 }
1251 if (pl == NULL) 920
1252 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 921 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1253 return 1; 922 return 1;
1254} 923}
1255 924
1256int 925int
1257command_abil (object *op, char *params) 926command_abil (object *op, char *params)
1258{ 927{
1259 char thing[20], thing2[20]; 928 char thing[20], thing2[20];
1260 int iii; 929 int iii;
1261 player *pl;
1262 char buf[MAX_BUF]; 930 char buf[MAX_BUF];
1263 931
1264 iii = 0; 932 iii = 0;
1265 thing[0] = '\0'; 933 thing[0] = '\0';
1266 thing2[0] = '\0'; 934 thing2[0] = '\0';
… …
1280 { 948 {
1281 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 949 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1282 return 1; 950 return 1;
1283 } 951 }
1284 952
1285 for (pl = first_player; pl != NULL; pl = pl->next) 953 for_all_players (pl)
1286 { 954 {
1287 if (!strcmp (pl->ob->name, thing)) 955 if (!strcmp (pl->ob->name, thing))
1288 { 956 {
1289 if (settings.real_wiz == FALSE)
1290 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1291 if (!strcmp ("str", thing2))
1292 pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 957 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
1293 if (!strcmp ("dex", thing2))
1294 pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 958 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
1295 if (!strcmp ("con", thing2))
1296 pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 959 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
1297 if (!strcmp ("wis", thing2))
1298 pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 960 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
1299 if (!strcmp ("cha", thing2))
1300 pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii; 961 if (!strcmp ("cha", thing2)) pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii;
1301 if (!strcmp ("int", thing2))
1302 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 962 if (!strcmp ("int", thing2)) pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1303 if (!strcmp ("pow", thing2))
1304 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 963 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
964
1305 sprintf (buf, "%s has been altered.", &pl->ob->name); 965 sprintf (buf, "%s has been altered.", &pl->ob->name);
1306 new_draw_info (NDI_UNIQUE, 0, op, buf); 966 new_draw_info (NDI_UNIQUE, 0, op, buf);
1307 fix_player (pl->ob); 967 pl->ob->update_stats ();
1308 return 1; 968 return 1;
1309 } 969 }
1310 } 970 }
1311 971
1312 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 972 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1313 return 1; 973 return 1;
1314} 974}
1315 975
1316int 976int
1317command_reset (object *op, char *params)
1318{
1319 mapstruct *m;
1320 object *dummy = NULL, *tmp = NULL;
1321
1322 if (params == NULL)
1323 {
1324 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1325 return 1;
1326 }
1327
1328 if (strcmp (params, ".") == 0)
1329 params = op->map->path;
1330 m = has_been_loaded (params);
1331 if (m == NULL)
1332 {
1333 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1334 return 1;
1335 }
1336
1337 if (m->in_memory != MAP_SWAPPED)
1338 {
1339 if (m->in_memory != MAP_IN_MEMORY)
1340 {
1341 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1342 return 0;
1343 }
1344
1345 /*
1346 * Only attempt to remove the player that is doing the reset, and not other
1347 * players or wiz's.
1348 */
1349 if (op->map == m)
1350 {
1351 dummy = get_object ();
1352 dummy->map = NULL;
1353 EXIT_X (dummy) = op->x;
1354 EXIT_Y (dummy) = op->y;
1355 EXIT_PATH (dummy) = op->map->path;
1356 remove_ob (op);
1357 op->map = NULL;
1358 tmp = op;
1359 }
1360 swap_map (m);
1361 }
1362
1363 if (m->in_memory == MAP_SWAPPED)
1364 {
1365 LOG (llevDebug, "Resetting map %s.\n", m->path);
1366
1367 /* setting this effectively causes an immediate reload */
1368 m->reset_time = 1;
1369 flush_old_maps ();
1370 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1371 if (tmp)
1372 {
1373 enter_exit (tmp, dummy);
1374 free_object (dummy);
1375 }
1376 return 1;
1377 }
1378 else
1379 {
1380 player *pl;
1381 int playercount = 0;
1382
1383 /* Need to re-insert player if swap failed for some reason */
1384 if (tmp)
1385 {
1386 insert_ob_in_map (op, m, NULL, 0);
1387 free_object (dummy);
1388 }
1389
1390 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1391 for (pl = first_player; pl != NULL; pl = pl->next)
1392 {
1393 if (pl->ob->map == m && pl->ob != op)
1394 {
1395 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1396 playercount++;
1397 }
1398 }
1399 if (!playercount)
1400 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1401 return 1;
1402 }
1403}
1404
1405int
1406command_nowiz (object *op, char *params) 977command_nowiz (object *op, char *params)
1407{ /* 'noadm' is alias */ 978{ /* 'nodm' is alias */
1408 CLEAR_FLAG (op, FLAG_WIZ); 979 CLEAR_FLAG (op, FLAG_WIZ);
1409 CLEAR_FLAG (op, FLAG_WIZPASS); 980 CLEAR_FLAG (op, FLAG_WIZPASS);
1410 CLEAR_FLAG (op, FLAG_WIZCAST); 981 CLEAR_FLAG (op, FLAG_WIZCAST);
1411 982
1412 if (settings.real_wiz == TRUE)
1413 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1414 if (op->contr->hidden) 983 if (op->contr->hidden)
1415 { 984 {
1416 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 985 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1417 op->map->players++; 986 op->map->players++;
1418 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 987 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
… …
1477 { 1046 {
1478 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1047 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1479 return 0; 1048 return 0;
1480 } 1049 }
1481 1050
1482 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1051 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1483 { 1052 {
1484 SET_FLAG (op, FLAG_WIZ); 1053 SET_FLAG (op, FLAG_WIZ);
1485 SET_FLAG (op, FLAG_WAS_WIZ);
1486 SET_FLAG (op, FLAG_WIZPASS); 1054 SET_FLAG (op, FLAG_WIZPASS);
1487 SET_FLAG (op, FLAG_WIZCAST); 1055 SET_FLAG (op, FLAG_WIZCAST);
1056
1488 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1057 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1489 /* 1058 /*
1490 * Remove setting flying here - that won't work, because next 1059 * Remove setting flying here - that won't work, because next
1491 * fix_player() is called that will get cleared - proper solution 1060 * fix_player() is called that will get cleared - proper solution
1492 * is probably something like a wiz_force which gives that and any 1061 * is probably something like a wiz_force which gives that and any
1493 * other desired abilities. 1062 * other desired abilities.
1494 */ 1063 */
1495 clear_los (op); 1064 clear_los (op->contr);
1496 op->contr->write_buf[0] = '\0'; 1065 op->contr->write_buf[0] = '\0';
1497 1066
1498 if (!silent) 1067 if (!silent)
1499 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1068 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1500 1069
… …
1527command_invisible (object *op, char *params) 1096command_invisible (object *op, char *params)
1528{ 1097{
1529 if (op) 1098 if (op)
1530 { 1099 {
1531 op->invisible += 100; 1100 op->invisible += 100;
1532 update_object (op, UP_OBJ_FACE); 1101 update_object (op, UP_OBJ_CHANGE);
1533 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1102 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1534 } 1103 }
1535 1104
1536 return 0; 1105 return 0;
1537} 1106}
… …
1549 * name than other "spell_xxx" archetypes and would always conflict. 1118 * name than other "spell_xxx" archetypes and would always conflict.
1550 */ 1119 */
1551static object * 1120static object *
1552get_spell_by_name (object *op, const char *spell_name) 1121get_spell_by_name (object *op, const char *spell_name)
1553{ 1122{
1554 archetype *ar; 1123 archetype *at;
1555 archetype *found; 1124 archetype *found;
1556 int conflict_found; 1125 int conflict_found;
1557 size_t spell_name_length; 1126 size_t spell_name_length;
1558 1127
1559 /* First check for full name matches. */ 1128 /* First check for full name matches. */
1560 conflict_found = 0; 1129 conflict_found = 0;
1561 found = NULL; 1130 found = NULL;
1562 for (ar = first_archetype; ar != NULL; ar = ar->next) 1131 for_all_archetypes (at)
1563 { 1132 {
1564 if (ar->clone.type != SPELL) 1133 if (at->type != SPELL)
1565 continue; 1134 continue;
1566 1135
1567 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1136 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1568 continue; 1137 continue;
1569 1138
1570 if (strcmp (ar->clone.name, spell_name) != 0) 1139 if (strcmp (at->object::name, spell_name) != 0)
1571 continue; 1140 continue;
1572 1141
1573 if (found != NULL) 1142 if (found != NULL)
1574 { 1143 {
1575 if (!conflict_found) 1144 if (!conflict_found)
1576 { 1145 {
1577 conflict_found = 1; 1146 conflict_found = 1;
1578 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1147 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name);
1579 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1148 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1580 } 1149 }
1150
1581 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1151 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1582 continue; 1152 continue;
1583 } 1153 }
1584 1154
1585 found = ar; 1155 found = at;
1586 } 1156 }
1587 1157
1588 /* No match if more more than one archetype matches. */ 1158 /* No match if more more than one archetype matches. */
1589 if (conflict_found) 1159 if (conflict_found)
1590 return NULL; 1160 return NULL;
… …
1595 1165
1596 /* No full match found: now check for partial matches. */ 1166 /* No full match found: now check for partial matches. */
1597 spell_name_length = strlen (spell_name); 1167 spell_name_length = strlen (spell_name);
1598 conflict_found = 0; 1168 conflict_found = 0;
1599 found = NULL; 1169 found = NULL;
1600 for (ar = first_archetype; ar != NULL; ar = ar->next) 1170 for_all_archetypes (at)
1601 { 1171 {
1602 if (ar->clone.type != SPELL) 1172 if (at->type != SPELL)
1603 continue; 1173 continue;
1604 1174
1605 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1175 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1606 continue; 1176 continue;
1607 1177
1608 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1178 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1609 continue; 1179 continue;
1610 1180
1611 if (found != NULL) 1181 if (found != NULL)
1612 { 1182 {
1613 if (!conflict_found) 1183 if (!conflict_found)
1614 { 1184 {
1615 conflict_found = 1; 1185 conflict_found = 1;
1616 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name); 1186 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1617 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name); 1187 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1618 } 1188 }
1619 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name); 1189 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1620 continue; 1190 continue;
1621 } 1191 }
1622 1192
1623 found = ar; 1193 found = at;
1624 } 1194 }
1625 1195
1626 /* No match if more more than one archetype matches. */ 1196 /* No match if more more than one archetype matches. */
1627 if (conflict_found) 1197 if (conflict_found)
1628 return NULL; 1198 return NULL;
… …
1658 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1228 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1659 return 0; 1229 return 0;
1660 } 1230 }
1661 1231
1662 do_learn_spell (op, tmp, special_prayer); 1232 do_learn_spell (op, tmp, special_prayer);
1663 free_object (tmp); 1233 tmp->destroy ();
1664 return 1; 1234 return 1;
1665} 1235}
1666 1236
1667int 1237int
1668command_learn_spell (object *op, char *params) 1238command_learn_spell (object *op, char *params)
… …
1693 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1263 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1694 return 0; 1264 return 0;
1695 } 1265 }
1696 1266
1697 do_forget_spell (op, spell->name); 1267 do_forget_spell (op, spell->name);
1698 return 1;
1699}
1700
1701/**
1702 * Lists all plugins currently loaded with their IDs and full names.
1703 */
1704int
1705command_listplugins (object *op, char *params)
1706{
1707 plugins_display_list (op);
1708 return 1;
1709}
1710
1711/**
1712 * Loads the given plugin. The DM specifies the name of the library to load (no
1713 * pathname is needed). Do not ever attempt to load the same plugin more than
1714 * once at a time, or bad things could happen.
1715 */
1716int
1717command_loadplugin (object *op, char *params)
1718{
1719 char buf[MAX_BUF];
1720
1721 if (params == NULL)
1722 {
1723 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1724 return 1;
1725 }
1726
1727 strcpy (buf, LIBDIR);
1728 strcat (buf, "/plugins/");
1729 strcat (buf, params);
1730 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1731 if (plugins_init_plugin (buf) == 0)
1732 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1733 else
1734 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1735 return 1;
1736}
1737
1738/**
1739 * Unloads the given plugin. The DM specified the ID of the library to unload.
1740 * Note that some things may behave strangely if the correct plugins are not
1741 * loaded.
1742 */
1743int
1744command_unloadplugin (object *op, char *params)
1745{
1746 if (params == NULL)
1747 {
1748 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1749 return 1;
1750 }
1751
1752 if (plugins_remove_plugin (params) == 0)
1753 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1754 else
1755 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1756 return 1; 1268 return 1;
1757} 1269}
1758 1270
1759/** 1271/**
1760 * A players wants to become DM and hide. 1272 * A players wants to become DM and hide.
… …
2080 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1592 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
2081 return 0; 1593 return 0;
2082 } 1594 }
2083 1595
2084 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1596 if (!QUERY_FLAG (right, FLAG_REMOVED))
2085 remove_ob (right); 1597 right->remove ();
2086 inserted = insert_ob_in_ob (right, left); 1598 inserted = insert_ob_in_ob (right, left);
2087 if (left->type == PLAYER) 1599 if (left->type == PLAYER)
2088 if (inserted == right) 1600 if (inserted == right)
2089 esrv_send_item (left, right); 1601 esrv_send_item (left, right);
2090 else 1602 else

Diff Legend

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