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.9 by root, Sun Sep 10 14:15:34 2006 UTC vs.
Revision 1.61 by root, Sat Dec 20 02:32:31 2008 UTC

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

Diff Legend

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