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.12 by root, Thu Sep 14 22:34:03 2006 UTC vs.
Revision 1.67 by root, Thu Jan 1 16:05:13 2009 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,2008 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 *plop = pl->ob;
277 184
278 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 185 if (!QUERY_FLAG (plop, FLAG_REMOVED) && !QUERY_FLAG (plop, 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.", &plop->name);
281 strcpy (op->contr->killer, "kicked"); 188 plop->contr->killer = op;
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 for (pl = first_player; pl != NULL; pl = pl->next)
323 save_player (pl->ob, 0);
324
325 for (pl = first_player; pl != NULL; pl = pl->next)
326 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
327 leave_map (pl->ob);
328
329 cleanup ();
330 /* not reached */
331 return 1;
332}
333
334int
335command_goto (object *op, char *params)
336{
337 char *name;
338 object *dummy;
339
340 if (!op)
341 return 0;
342
343 if (params == NULL)
344 {
345 new_draw_info (NDI_UNIQUE, 0, op, "Go to what level?");
346 return 1;
347 }
348
349 name = params;
350 dummy = get_object ();
351 dummy->map = op->map;
352 EXIT_PATH (dummy) = name;
353 dummy->name = name;
354
355 enter_exit (op, dummy);
356 free_object (dummy);
357 if (op->contr->loading == NULL)
358 {
359 new_draw_info_format (NDI_UNIQUE, 0, op, "Difficulty: %d.", op->map->difficulty);
360 }
361
362 return 1;
363}
364
365/* is this function called from somewhere ? -Tero */
366int
367command_generate (object *op, char *params)
368{
369 object *tmp;
370 int nr = 1, i, retry;
371
372 if (!op)
373 return 0;
374
375 if (params != NULL)
376 sscanf (params, "%d", &nr);
377 for (i = 0; i < nr; i++)
378 {
379 retry = 50;
380 while ((tmp = generate_treasure (0, op->map->difficulty)) == NULL && --retry)
381 ;
382 if (tmp != NULL)
383 {
384 tmp = insert_ob_in_ob (tmp, op);
385 if (op->type == PLAYER)
386 esrv_send_item (op, tmp);
387 }
388 }
389
390 return 1;
391}
392 220
393int 221int
394command_freeze (object *op, char *params) 222command_freeze (object *op, char *params)
395{ 223{
396 int ticks; 224 int ticks;
… …
432 object *dummy; 260 object *dummy;
433 player *pl; 261 player *pl;
434 262
435 if (!op) 263 if (!op)
436 return 0; 264 return 0;
265
437 if (params == NULL) 266 if (params == NULL)
438 { 267 {
439 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 268 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
440 return 1; 269 return 1;
441 } 270 }
271
442 pl = get_other_player_from_name (op, params); 272 pl = get_other_player_from_name (op, params);
443 if (!pl) 273 if (!pl)
444 return 1; 274 return 1;
275
445 dummy = get_jail_exit (pl->ob); 276 dummy = get_jail_exit (pl->ob);
446 if (!dummy) 277 if (!dummy)
447 { 278 {
448 /* we have nowhere to send the prisoner.... */ 279 /* we have nowhere to send the prisoner.... */
449 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");
450 return 0; 281 return 0;
451 } 282 }
452 enter_exit (pl->ob, dummy); 283
453 free_object (dummy); 284 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
285 dummy->destroy ();
286
454 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.");
455 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 288 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
456 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);
457 return 1; 290 return 1;
458} 291}
… …
482 { 315 {
483 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.");
484 return 1; 317 return 1;
485 } 318 }
486 319
487 dummy = get_object (); 320 pl->ob->player_goto (op->map->path, op->x + freearr_x[i], op->y + freearr_y[i]);
488 EXIT_PATH (dummy) = op->map->path;
489 EXIT_X (dummy) = op->x + freearr_x[i];
490 EXIT_Y (dummy) = op->y + freearr_y[i];
491 enter_exit (pl->ob, dummy);
492 free_object (dummy);
493 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 321 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
494 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 322 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
495 323
496 return 1;
497}
498
499/**
500 * Teleport next to target player.
501 */
502
503/* mids 01/16/2002 */
504int
505command_teleport (object *op, char *params)
506{
507 int i;
508 object *dummy;
509 player *pl;
510
511 if (!op)
512 return 0;
513
514 if (params == NULL)
515 {
516 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
517 return 1;
518 }
519
520 pl = get_other_player_from_name (op, params);
521 if (!pl)
522 return 1;
523
524 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
525 if (i == -1)
526 {
527 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
528 return 1;
529 }
530
531 dummy = get_object ();
532 EXIT_PATH (dummy) = pl->ob->map->path;
533 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
534 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
535 enter_exit (op, dummy);
536 free_object (dummy);
537 if (!op->contr->hidden)
538 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
539 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
540 return 1; 324 return 1;
541} 325}
542 326
543/** 327/**
544 * This function is a real mess, because we're stucking getting 328 * This function is a real mess, because we're stucking getting
… …
634 * we also set up spell_name which is only 418 * we also set up spell_name which is only
635 * the first word. 419 * the first word.
636 */ 420 */
637 421
638 at_spell = archetype::find (cp); 422 at_spell = archetype::find (cp);
639 if (!at_spell || at_spell->clone.type != SPELL) 423 if (!at_spell || at_spell->type != SPELL)
640 at_spell = find_archetype_by_object_name (cp); 424 at_spell = find_archetype_by_object_name (cp);
641 if (!at_spell || at_spell->clone.type != SPELL) 425 if (!at_spell || at_spell->type != SPELL)
642 { 426 {
643 strcpy (spell_name, cp); 427 assign (spell_name, cp);
644 fsp = strchr (spell_name, ' '); 428 fsp = strchr (spell_name, ' ');
645 if (fsp) 429 if (fsp)
646 { 430 {
647 *fsp = 0; 431 *fsp = 0;
648 fsp++; 432 fsp++;
649 at_spell = archetype::find (spell_name); 433 at_spell = archetype::find (spell_name);
650 434
651 /* Got a spell, update the first string pointer */ 435 /* Got a spell, update the first string pointer */
652 if (at_spell && at_spell->clone.type == SPELL) 436 if (at_spell && at_spell->type == SPELL)
653 bp2 = cp + strlen (spell_name) + 1; 437 bp2 = cp + strlen (spell_name) + 1;
654 else 438 else
655 at_spell = NULL; 439 at_spell = NULL;
656 } 440 }
657 } 441 }
… …
659 /* OK - we didn't find a spell - presume the 'of' 443 /* OK - we didn't find a spell - presume the 'of'
660 * in this case means its an artifact. 444 * in this case means its an artifact.
661 */ 445 */
662 if (!at_spell) 446 if (!at_spell)
663 { 447 {
664 if (find_artifactlist (at->clone.type) == NULL) 448 if (find_artifactlist (at->type) == NULL)
665 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);
666 else 450 else
667 { 451 {
668 art = find_artifactlist (at->clone.type)->items; 452 art = find_artifactlist (at->type)->items;
669 453
670 do 454 while (art)
671 { 455 {
672 if (!strcmp (art->item->name, cp)) 456 if (!strcmp (&art->item->name, cp))
673 break; 457 break;
458
674 art = art->next; 459 art = art->next;
675 } 460 }
676 while (art != NULL);
677 461
678 if (!art) 462 if (!art)
679 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);
680 } 464 }
681 465
682 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);
683 } 467 }
684 } /* if cp */ 468 } /* if cp */
685 469
686 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 470 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
687 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 471 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
688 { 472 {
689 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);
690 return 1; 474 return 1;
691 } 475 }
692 476
… …
694 * 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,
695 * just create one object, do all the processing, and then determine 479 * just create one object, do all the processing, and then determine
696 * 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.
697 */ 481 */
698 tmp = arch_to_object (at); 482 tmp = arch_to_object (at);
699
700 if (settings.real_wiz == FALSE)
701 SET_FLAG (tmp, FLAG_WAS_WIZ);
702 483
703 if (set_magic) 484 if (set_magic)
704 set_abs_magic (tmp, magic); 485 set_abs_magic (tmp, magic);
705 486
706 if (art) 487 if (art)
… …
786 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);
787 568
788 bp2 = bp3 + 1; 569 bp2 = bp3 + 1;
789 } 570 }
790 571
791 if (at->clone.nrof) 572 if (at->nrof)
792 { 573 {
793 if (at_spell) 574 if (at_spell)
794 insert_ob_in_ob (arch_to_object (at_spell), tmp); 575 tmp->insert (arch_to_object (at_spell));
795 576
796 tmp->x = op->x; 577 tmp->x = op->x;
797 tmp->y = op->y; 578 tmp->y = op->y;
579 tmp->map = op->map;
798 580
799 if (set_nrof) 581 if (set_nrof)
800 tmp->nrof = nrof; 582 tmp->nrof = nrof;
801 583
802 tmp->map = op->map; 584 op->insert (tmp);
803
804 tmp = insert_ob_in_ob (tmp, op);
805 esrv_send_item (op, tmp);
806 585
807 /* 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. */
808 dm_stack_push (op->contr, tmp->count); 587 dm_stack_push (op->contr, tmp->count);
809 588
810 return 1; 589 return 1;
811 } 590 }
812 else 591 else
813 { 592 {
814 for (i = 0; i < (set_nrof ? nrof : 1); i++) 593 for (i = 0; i < (set_nrof ? nrof : 1); i++)
815 { 594 {
816 archetype *atmp;
817 object *prev = 0, *head = 0; 595 object *prev = 0, *head = 0;
818 596
819 for (atmp = at; atmp; atmp = atmp->more) 597 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
820 { 598 {
821 object *dup = arch_to_object (atmp); 599 object *dup = arch_to_object (atmp);
822 600
823 if (at_spell) 601 if (at_spell)
824 insert_ob_in_ob (arch_to_object (at_spell), dup); 602 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
828 * so just copying it over should be fine. 606 * so just copying it over should be fine.
829 */ 607 */
830 if (!head) 608 if (!head)
831 { 609 {
832 head = dup; 610 head = dup;
833 copy_object (tmp, dup); 611 tmp->copy_to (dup);
834 } 612 }
835 613
836 if (settings.real_wiz == FALSE)
837 SET_FLAG (dup, FLAG_WAS_WIZ);
838
839 dup->x = op->x + dup->arch->clone.x; 614 dup->x = op->x + dup->arch->x;
840 dup->y = op->y + dup->arch->clone.y; 615 dup->y = op->y + dup->arch->y;
841 dup->map = op->map; 616 dup->map = op->map;
842 617
843 if (head != dup) 618 if (head != dup)
844 { 619 {
845 dup->head = head; 620 dup->head = head;
… …
855 int size_x = 0; 630 int size_x = 0;
856 int size_y = 0; 631 int size_y = 0;
857 632
858 while (check) 633 while (check)
859 { 634 {
860 size_x = MAX (size_x, check->arch->clone.x); 635 size_x = MAX (size_x, check->arch->x);
861 size_y = MAX (size_y, check->arch->clone.y); 636 size_y = MAX (size_y, check->arch->y);
862 check = check->more; 637 check = check->more;
863 } 638 }
864 639
865 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))
866 { 641 {
867 if (head->x < size_x || head->y < size_y) 642 if (head->x < size_x || head->y < size_y)
868 { 643 {
869 dm_stack_pop (op->contr); 644 dm_stack_pop (op->contr);
870 free_object (head); 645 head->destroy ();
871 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.");
872 free_object (tmp); 647 tmp->destroy ();
873 return 1; 648 return 1;
874 } 649 }
875 650
876 check = head; 651 check = head;
877 652
… …
892 /* 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
893 * things like rods have nrof 0, we want to cover those. 668 * things like rods have nrof 0, we want to cover those.
894 */ 669 */
895 dm_stack_push (op->contr, head->count); 670 dm_stack_push (op->contr, head->count);
896 671
897 if (at->clone.randomitems != NULL && !at_spell) 672 if (at->randomitems && !at_spell)
898 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 673 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
899
900 esrv_send_item (op, head);
901 } 674 }
902 675
903 /* free the one we used to copy */ 676 /* free the one we used to copy */
904 free_object (tmp); 677 tmp->destroy ();
905 } 678 }
906 679
907 return 1; 680 return 1;
908} 681}
909 682
… …
912 */ 685 */
913 686
914int 687int
915command_inventory (object *op, char *params) 688command_inventory (object *op, char *params)
916{ 689{
690 int i;
917 object *tmp; 691 object *tmp;
918 int i;
919 692
920 if (!params) 693 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
921 { 694 {
922 inventory (op, NULL); 695 op->contr->failmsg ("Inventory of what object (nr)?");
923 return 0; 696 return 1;
924 }
925
926 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
927 { 697 }
928 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
929 return 1;
930 }
931 698
932 inventory (op, tmp); 699 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
700
933 return 1; 701 return 1;
934} 702}
935 703
936/* just show player's their skills for now. Dm's can 704/* just show player's their skills for now. Dm's can
937 * already see skills w/ inventory command - b.t. 705 * already see skills w/ inventory command - b.t.
… …
951 719
952 tmp = get_dm_object (op->contr, &params, NULL); 720 tmp = get_dm_object (op->contr, &params, NULL);
953 if (!tmp) 721 if (!tmp)
954 return 1; 722 return 1;
955 723
956 dump_object (tmp); 724 char *dump = dump_object (tmp);
957 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 725 new_draw_info (NDI_UNIQUE, 0, op, dump);
726 free (dump);
727
958 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 728 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
959 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 729 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
960 return 1;
961}
962 730
963/**
964 * When DM is possessing a monster, flip aggression on and off, to allow
965 * better motion.
966 */
967int
968command_mon_aggr (object *op, char *params)
969{
970 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
971 {
972 op->enemy = NULL;
973 SET_FLAG (op, FLAG_UNAGGRESSIVE);
974 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
975 }
976 else
977 {
978 CLEAR_FLAG (op, FLAG_FRIENDLY);
979 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
980 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
981 }
982
983 return 1;
984}
985
986/** DM can possess a monster. Basically, this tricks the client into thinking
987 * a given monster, is actually the player it controls. This allows a DM
988 * to inhabit a monster's body, and run around the game with it.
989 * This function is severely broken - it has tons of hardcoded values,
990 */
991int
992command_possess (object *op, char *params)
993{
994 object *victim, *curinv, *nextinv;
995 player *pl;
996 int i;
997 char buf[MAX_BUF];
998
999 victim = NULL;
1000 if (params != NULL)
1001 {
1002 if (sscanf (params, "%d", &i))
1003 victim = find_object (i);
1004 else if (sscanf (params, "%s", buf))
1005 victim = find_object_name (buf);
1006 }
1007 if (victim == NULL)
1008 {
1009 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
1010 return 1;
1011 }
1012
1013 if (victim == op)
1014 {
1015 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
1016 return 1;
1017 }
1018
1019 /* clear out the old inventory */
1020 curinv = op->inv;
1021 while (curinv != NULL)
1022 {
1023 nextinv = curinv->below;
1024 esrv_del_item (op->contr, curinv->count);
1025 curinv = nextinv;
1026 }
1027
1028 /* make the switch */
1029 pl = op->contr;
1030 victim->contr = pl;
1031 pl->ob = victim;
1032 victim->type = PLAYER;
1033 SET_FLAG (victim, FLAG_WIZ);
1034
1035 /* send the inventory to the client */
1036 curinv = victim->inv;
1037 while (curinv != NULL)
1038 {
1039 nextinv = curinv->below;
1040 esrv_send_item (victim, curinv);
1041 curinv = nextinv;
1042 }
1043 /* basic patchup */
1044 /* The use of hard coded values is terrible. Note
1045 * that really, to be fair, this shouldn't get changed at
1046 * all - if you are possessing a kobold, you should have the
1047 * same limitations. As it is, as more body locations are added,
1048 * this will give this player more locations than perhaps
1049 * they should be allowed.
1050 */
1051 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1052 if (i == 1 || i == 6 || i == 8 || i == 9)
1053 victim->body_info[i] = 2;
1054 else
1055 victim->body_info[i] = 1;
1056
1057 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
1058 esrv_send_inventory (victim, victim);
1059
1060 fix_player (victim);
1061
1062 do_some_living (victim);
1063 return 1; 731 return 1;
1064} 732}
1065 733
1066int 734int
1067command_patch (object *op, char *params) 735command_patch (object *op, char *params)
… …
1082 return 1; 750 return 1;
1083 } 751 }
1084 752
1085 if ((arg2 = strchr (arg, ' '))) 753 if ((arg2 = strchr (arg, ' ')))
1086 arg2++; 754 arg2++;
1087 if (settings.real_wiz == FALSE) 755
1088 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
1089 if (set_variable (tmp, arg) == -1) 756 if (set_variable (tmp, arg) == -1)
1090 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);
1091 else 758 else
1092 {
1093 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);
1094 }
1095 760
1096 return 1; 761 return 1;
1097} 762}
1098 763
1099int 764int
… …
1126 dm_stack_pop (op->contr); 791 dm_stack_pop (op->contr);
1127 792
1128 /* 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 */
1129 if (tmp->head) 794 if (tmp->head)
1130 tmp = tmp->head; 795 tmp = tmp->head;
1131 remove_ob (tmp); 796 tmp->remove ();
1132 return 1; 797 return 1;
1133} 798}
1134 799
1135int 800int
1136command_free (object *op, char *params) 801command_free (object *op, char *params)
… …
1148 813
1149 if (from != STACK_FROM_STACK) 814 if (from != STACK_FROM_STACK)
1150 /* 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 */
1151 dm_stack_pop (op->contr); 816 dm_stack_pop (op->contr);
1152 817
1153 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1154 {
1155 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1156 remove_ob (tmp);
1157 }
1158
1159 if (tmp->head) 818 if (tmp->head)
1160 tmp = tmp->head; 819 tmp = tmp->head;
1161 free_object (tmp); 820
821 tmp->destroy ();
1162 return 1; 822 return 1;
1163} 823}
1164 824
1165/** 825/**
1166 * 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.
1167 */ 827 */
1168int 828int
1169command_addexp (object *op, char *params) 829command_addexp (object *op, char *params)
1170{ 830{
1171 char buf[MAX_BUF], skill[MAX_BUF]; 831 char buf[MAX_BUF], skill[MAX_BUF];
1172 int i, q; 832 int q;
833 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1173 object *skillob = NULL; 834 object *skillob = NULL;
1174 player *pl;
1175 835
1176 skill[0] = '\0'; 836 skill[0] = '\0';
1177 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))
1178 { 838 {
1179 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>].");
1180 return 1; 840 return 1;
1181 } 841 }
1182 842
1183 for (pl = first_player; pl != NULL; pl = pl->next) 843 for_all_players (pl)
1184 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 844 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1185 break;
1186
1187 if (pl == NULL)
1188 { 845 {
1189 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1190 return 1;
1191 }
1192
1193 if (q >= 3) 846 if (q >= 3)
1194 { 847 {
1195 skillob = find_skill_by_name (pl->ob, skill); 848 skillob = find_skill_by_name (pl->ob, skill);
1196 if (!skillob) 849 if (!skillob)
1197 { 850 {
1198 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
1199 return 1; 865 return 1;
1200 } 866 }
1201 867
1202 i = check_exp_adjust (skillob, i); 868 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1203 skillob->stats.exp += i;
1204 calc_perm_exp (skillob);
1205 player_lvl_adj (pl->ob, skillob);
1206 }
1207
1208 pl->ob->stats.exp += i;
1209 calc_perm_exp (pl->ob);
1210 player_lvl_adj (pl->ob, NULL);
1211
1212 if (settings.real_wiz == FALSE)
1213 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1214 return 1; 869 return 1;
1215} 870}
1216 871
1217/**************************************************************************/ 872/**************************************************************************/
1218 873
… …
1224 879
1225int 880int
1226command_stats (object *op, char *params) 881command_stats (object *op, char *params)
1227{ 882{
1228 char thing[20]; 883 char thing[20];
1229 player *pl;
1230 char buf[MAX_BUF]; 884 char buf[MAX_BUF];
1231 885
1232 thing[0] = '\0'; 886 thing[0] = '\0';
1233 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 887 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1234 { 888 {
1235 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 889 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1236 return 1; 890 return 1;
1237 } 891 }
1238 892
1239 for (pl = first_player; pl != NULL; pl = pl->next) 893 for_all_players (pl)
1240 if (!strcmp (pl->ob->name, thing)) 894 if (!strcmp (&pl->ob->name, thing))
1241 { 895 {
1242 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);
1243 new_draw_info (NDI_UNIQUE, 0, op, buf); 897 new_draw_info (NDI_UNIQUE, 0, op, buf);
1244 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);
1245 new_draw_info (NDI_UNIQUE, 0, op, buf); 899 new_draw_info (NDI_UNIQUE, 0, op, buf);
1246 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);
1247 new_draw_info (NDI_UNIQUE, 0, op, buf); 901 new_draw_info (NDI_UNIQUE, 0, op, buf);
1248 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);
1249 new_draw_info (NDI_UNIQUE, 0, op, buf); 903 new_draw_info (NDI_UNIQUE, 0, op, buf);
1250 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);
1251 new_draw_info (NDI_UNIQUE, 0, op, buf); 905 new_draw_info (NDI_UNIQUE, 0, op, buf);
1252 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);
1253 new_draw_info (NDI_UNIQUE, 0, op, buf); 907 new_draw_info (NDI_UNIQUE, 0, op, buf);
1254 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);
1255 new_draw_info (NDI_UNIQUE, 0, op, buf); 909 new_draw_info (NDI_UNIQUE, 0, op, buf);
1256 break; 910 return 1;
1257 } 911 }
1258 if (pl == NULL) 912
1259 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 913 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1260 return 1; 914 return 1;
1261} 915}
1262 916
1263int 917int
1264command_abil (object *op, char *params) 918command_abil (object *op, char *params)
1265{ 919{
1266 char thing[20], thing2[20]; 920 char thing[20], thing2[20];
1267 int iii; 921 int iii;
1268 player *pl;
1269 char buf[MAX_BUF]; 922 char buf[MAX_BUF];
1270 923
1271 iii = 0; 924 iii = 0;
1272 thing[0] = '\0'; 925 thing[0] = '\0';
1273 thing2[0] = '\0'; 926 thing2[0] = '\0';
… …
1287 { 940 {
1288 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");
1289 return 1; 942 return 1;
1290 } 943 }
1291 944
1292 for (pl = first_player; pl != NULL; pl = pl->next) 945 for_all_players (pl)
1293 { 946 {
1294 if (!strcmp (pl->ob->name, thing)) 947 if (!strcmp (&pl->ob->name, thing))
1295 { 948 {
1296 if (settings.real_wiz == FALSE)
1297 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1298 if (!strcmp ("str", thing2))
1299 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;
1300 if (!strcmp ("dex", thing2))
1301 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;
1302 if (!strcmp ("con", thing2))
1303 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;
1304 if (!strcmp ("wis", thing2))
1305 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;
1306 if (!strcmp ("cha", thing2))
1307 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;
1308 if (!strcmp ("int", thing2))
1309 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;
1310 if (!strcmp ("pow", thing2))
1311 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
1312 sprintf (buf, "%s has been altered.", &pl->ob->name); 957 sprintf (buf, "%s has been altered.", &pl->ob->name);
1313 new_draw_info (NDI_UNIQUE, 0, op, buf); 958 new_draw_info (NDI_UNIQUE, 0, op, buf);
1314 fix_player (pl->ob); 959 pl->ob->update_stats ();
1315 return 1; 960 return 1;
1316 } 961 }
1317 } 962 }
1318 963
1319 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 964 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1320 return 1; 965 return 1;
1321} 966}
1322 967
1323int 968int
1324command_reset (object *op, char *params)
1325{
1326 mapstruct *m;
1327 object *dummy = NULL, *tmp = NULL;
1328
1329 if (params == NULL)
1330 {
1331 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1332 return 1;
1333 }
1334
1335 if (strcmp (params, ".") == 0)
1336 params = op->map->path;
1337 m = has_been_loaded (params);
1338 if (m == NULL)
1339 {
1340 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1341 return 1;
1342 }
1343
1344 if (m->in_memory != MAP_SWAPPED)
1345 {
1346 if (m->in_memory != MAP_IN_MEMORY)
1347 {
1348 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1349 return 0;
1350 }
1351
1352 /*
1353 * Only attempt to remove the player that is doing the reset, and not other
1354 * players or wiz's.
1355 */
1356 if (op->map == m)
1357 {
1358 dummy = get_object ();
1359 dummy->map = NULL;
1360 EXIT_X (dummy) = op->x;
1361 EXIT_Y (dummy) = op->y;
1362 EXIT_PATH (dummy) = op->map->path;
1363 remove_ob (op);
1364 op->map = NULL;
1365 tmp = op;
1366 }
1367 swap_map (m);
1368 }
1369
1370 if (m->in_memory == MAP_SWAPPED)
1371 {
1372 LOG (llevDebug, "Resetting map %s.\n", m->path);
1373
1374 /* setting this effectively causes an immediate reload */
1375 m->reset_time = 1;
1376 flush_old_maps ();
1377 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1378 if (tmp)
1379 {
1380 enter_exit (tmp, dummy);
1381 free_object (dummy);
1382 }
1383 return 1;
1384 }
1385 else
1386 {
1387 player *pl;
1388 int playercount = 0;
1389
1390 /* Need to re-insert player if swap failed for some reason */
1391 if (tmp)
1392 {
1393 insert_ob_in_map (op, m, NULL, 0);
1394 free_object (dummy);
1395 }
1396
1397 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1398 for (pl = first_player; pl != NULL; pl = pl->next)
1399 {
1400 if (pl->ob->map == m && pl->ob != op)
1401 {
1402 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1403 playercount++;
1404 }
1405 }
1406 if (!playercount)
1407 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1408 return 1;
1409 }
1410}
1411
1412int
1413command_nowiz (object *op, char *params) 969command_nowiz (object *op, char *params)
1414{ /* 'noadm' is alias */ 970{ /* 'nodm' is alias */
1415 CLEAR_FLAG (op, FLAG_WIZ); 971 CLEAR_FLAG (op, FLAG_WIZ);
1416 CLEAR_FLAG (op, FLAG_WIZPASS); 972 CLEAR_FLAG (op, FLAG_WIZPASS);
1417 CLEAR_FLAG (op, FLAG_WIZCAST); 973 CLEAR_FLAG (op, FLAG_WIZCAST);
1418
1419 if (settings.real_wiz == TRUE)
1420 CLEAR_FLAG (op, FLAG_WAS_WIZ); 974 CLEAR_FLAG (op, FLAG_WIZLOOK);
975 op->contr->do_los = 1;
976
1421 if (op->contr->hidden) 977 if (op->contr->hidden)
1422 { 978 {
1423 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 979 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1424 op->map->players++; 980 op->map->players++;
1425 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 981 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
1426 op->contr->hidden = 0; 982 op->contr->hidden = 0;
1427 op->invisible = 1; 983 op->invisible = 1;
1428 } 984 }
1429 else 985 else
1430 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 986 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
987
1431 return 1; 988 return 1;
1432} 989}
1433 990
1434/** 991/**
1435 * object *op is trying to become dm. 992 * object *op is trying to become dm.
… …
1484 { 1041 {
1485 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1042 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1486 return 0; 1043 return 0;
1487 } 1044 }
1488 1045
1489 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1046 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1490 { 1047 {
1491 SET_FLAG (op, FLAG_WIZ); 1048 SET_FLAG (op, FLAG_WIZ);
1492 SET_FLAG (op, FLAG_WAS_WIZ);
1493 SET_FLAG (op, FLAG_WIZPASS); 1049 SET_FLAG (op, FLAG_WIZPASS);
1494 SET_FLAG (op, FLAG_WIZCAST); 1050 SET_FLAG (op, FLAG_WIZCAST);
1051 SET_FLAG (op, FLAG_WIZLOOK);
1052 op->contr->do_los = 1;
1053
1495 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1054 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1496 /*
1497 * Remove setting flying here - that won't work, because next
1498 * fix_player() is called that will get cleared - proper solution
1499 * is probably something like a wiz_force which gives that and any
1500 * other desired abilities.
1501 */
1502 clear_los (op);
1503 op->contr->write_buf[0] = '\0'; 1055 op->contr->write_buf[0] = '\0';
1504 1056
1505 if (!silent) 1057 if (!silent)
1506 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1058 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1507 1059
… …
1534command_invisible (object *op, char *params) 1086command_invisible (object *op, char *params)
1535{ 1087{
1536 if (op) 1088 if (op)
1537 { 1089 {
1538 op->invisible += 100; 1090 op->invisible += 100;
1539 update_object (op, UP_OBJ_FACE); 1091 update_object (op, UP_OBJ_CHANGE);
1540 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1092 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1541 } 1093 }
1542 1094
1543 return 0; 1095 return 0;
1544} 1096}
… …
1547 * Returns spell object (from archetypes) by name. 1099 * Returns spell object (from archetypes) by name.
1548 * Returns NULL if 0 or more than one spell matches. 1100 * Returns NULL if 0 or more than one spell matches.
1549 * Used for wizard's learn spell/prayer. 1101 * Used for wizard's learn spell/prayer.
1550 * 1102 *
1551 * op is the player issuing the command. 1103 * op is the player issuing the command.
1552 *
1553 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1554 * anymore (but may still be present in some player's inventories and thus
1555 * cannot be removed). We have to ignore them here since they have the same
1556 * name than other "spell_xxx" archetypes and would always conflict.
1557 */ 1104 */
1558static object * 1105static object *
1559get_spell_by_name (object *op, const char *spell_name) 1106get_spell_by_name (object *op, shstr_cmp spell_name)
1560{ 1107{
1561 archetype *ar; 1108 archetype *at;
1562 archetype *found; 1109 archetype *found;
1563 int conflict_found; 1110 int conflict_found;
1564 size_t spell_name_length; 1111 size_t spell_name_length;
1565 1112
1566 /* First check for full name matches. */ 1113 /* First check for full name matches. */
1567 conflict_found = 0; 1114 conflict_found = 0;
1568 found = NULL; 1115 found = NULL;
1569 for (ar = first_archetype; ar != NULL; ar = ar->next) 1116 for_all_archetypes (at)
1570 { 1117 {
1571 if (ar->clone.type != SPELL) 1118 if (at->type != SPELL)
1572 continue; 1119 continue;
1573 1120
1574 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1121 if (at->object::name != spell_name)
1575 continue; 1122 continue;
1576 1123
1577 if (strcmp (ar->clone.name, spell_name) != 0)
1578 continue;
1579
1580 if (found != NULL) 1124 if (found)
1581 { 1125 {
1582 if (!conflict_found) 1126 if (!conflict_found)
1583 { 1127 {
1584 conflict_found = 1; 1128 conflict_found = 1;
1585 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1129 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", &spell_name);
1586 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1130 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1587 } 1131 }
1132
1588 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1133 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1589 continue; 1134 continue;
1590 } 1135 }
1591 1136
1592 found = ar; 1137 found = at;
1593 } 1138 }
1594 1139
1595 /* No match if more more than one archetype matches. */ 1140 /* No match if more more than one archetype matches. */
1596 if (conflict_found) 1141 if (conflict_found)
1597 return NULL; 1142 return NULL;
… …
1602 1147
1603 /* No full match found: now check for partial matches. */ 1148 /* No full match found: now check for partial matches. */
1604 spell_name_length = strlen (spell_name); 1149 spell_name_length = strlen (spell_name);
1605 conflict_found = 0; 1150 conflict_found = 0;
1606 found = NULL; 1151 found = NULL;
1607 for (ar = first_archetype; ar != NULL; ar = ar->next) 1152 for_all_archetypes (at)
1608 { 1153 {
1609 if (ar->clone.type != SPELL) 1154 if (at->type != SPELL)
1610 continue; 1155 continue;
1611 1156
1612 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1157 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1613 continue; 1158 continue;
1614 1159
1615 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1160 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1616 continue; 1161 continue;
1617 1162
1618 if (found != NULL) 1163 if (found != NULL)
1619 { 1164 {
1620 if (!conflict_found) 1165 if (!conflict_found)
1621 { 1166 {
1622 conflict_found = 1; 1167 conflict_found = 1;
1623 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name); 1168 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", &spell_name);
1624 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name); 1169 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1625 } 1170 }
1626 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name); 1171 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1627 continue; 1172 continue;
1628 } 1173 }
1629 1174
1630 found = ar; 1175 found = at;
1631 } 1176 }
1632 1177
1633 /* No match if more more than one archetype matches. */ 1178 /* No match if more more than one archetype matches. */
1634 if (conflict_found) 1179 if (conflict_found)
1635 return NULL; 1180 return NULL;
… …
1637 /* Return if exactly one archetype matches. */ 1182 /* Return if exactly one archetype matches. */
1638 if (found != NULL) 1183 if (found != NULL)
1639 return arch_to_object (found); 1184 return arch_to_object (found);
1640 1185
1641 /* No spell found: just print an error message. */ 1186 /* No spell found: just print an error message. */
1642 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", spell_name); 1187 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", &spell_name);
1643 return NULL; 1188 return NULL;
1644} 1189}
1645 1190
1646static int 1191static int
1647command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1192command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
… …
1665 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1210 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1666 return 0; 1211 return 0;
1667 } 1212 }
1668 1213
1669 do_learn_spell (op, tmp, special_prayer); 1214 do_learn_spell (op, tmp, special_prayer);
1670 free_object (tmp); 1215 tmp->destroy ();
1671 return 1; 1216 return 1;
1672} 1217}
1673 1218
1674int 1219int
1675command_learn_spell (object *op, char *params) 1220command_learn_spell (object *op, char *params)
… …
1700 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1245 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1701 return 0; 1246 return 0;
1702 } 1247 }
1703 1248
1704 do_forget_spell (op, spell->name); 1249 do_forget_spell (op, spell->name);
1705 return 1;
1706}
1707
1708/**
1709 * Lists all plugins currently loaded with their IDs and full names.
1710 */
1711int
1712command_listplugins (object *op, char *params)
1713{
1714 plugins_display_list (op);
1715 return 1;
1716}
1717
1718/**
1719 * Loads the given plugin. The DM specifies the name of the library to load (no
1720 * pathname is needed). Do not ever attempt to load the same plugin more than
1721 * once at a time, or bad things could happen.
1722 */
1723int
1724command_loadplugin (object *op, char *params)
1725{
1726 char buf[MAX_BUF];
1727
1728 if (params == NULL)
1729 {
1730 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1731 return 1;
1732 }
1733
1734 strcpy (buf, LIBDIR);
1735 strcat (buf, "/plugins/");
1736 strcat (buf, params);
1737 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1738 if (plugins_init_plugin (buf) == 0)
1739 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1740 else
1741 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1742 return 1;
1743}
1744
1745/**
1746 * Unloads the given plugin. The DM specified the ID of the library to unload.
1747 * Note that some things may behave strangely if the correct plugins are not
1748 * loaded.
1749 */
1750int
1751command_unloadplugin (object *op, char *params)
1752{
1753 if (params == NULL)
1754 {
1755 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1756 return 1;
1757 }
1758
1759 if (plugins_remove_plugin (params) == 0)
1760 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1761 else
1762 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1763 return 1; 1250 return 1;
1764} 1251}
1765 1252
1766/** 1253/**
1767 * A players wants to become DM and hide. 1254 * A players wants to become DM and hide.
… …
2087 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1574 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
2088 return 0; 1575 return 0;
2089 } 1576 }
2090 1577
2091 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1578 if (!QUERY_FLAG (right, FLAG_REMOVED))
2092 remove_ob (right); 1579 right->remove ();
1580
2093 inserted = insert_ob_in_ob (right, left); 1581 insert_ob_in_ob (right, left);
2094 if (left->type == PLAYER)
2095 if (inserted == right)
2096 esrv_send_item (left, right);
2097 else
2098 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
2099 1582
2100 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1583 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
2101 1584
2102 return 0; 1585 return 0;
2103 1586

Diff Legend

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