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.38 by pippijn, Fri Mar 2 13:43:59 2007 UTC vs.
Revision 1.91 by root, Wed Nov 21 12:12:03 2012 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 17 *
18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <sproto.h> 26#include <sproto.h>
27#include <spells.h> 27#include <spells.h>
… …
34/* Values for 'from' field of get_dm_object */ 34/* Values for 'from' field of get_dm_object */
35#define STACK_FROM_NONE 0 /* Item was not found */ 35#define STACK_FROM_NONE 0 /* Item was not found */
36#define STACK_FROM_TOP 1 /* Item is stack top */ 36#define STACK_FROM_TOP 1 /* Item is stack top */
37#define STACK_FROM_STACK 2 /* Item is somewhere in stack */ 37#define STACK_FROM_STACK 2 /* Item is somewhere in stack */
38#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */ 38#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */
39
40 39
41/** 40/**
42 * Enough of the DM functions seem to need this that I broke 41 * Enough of the DM functions seem to need this that I broke
43 * it out to a seperate function. name is the person 42 * it out to a seperate function. name is the person
44 * being saught, rq is who is looking for them. This 43 * being saught, rq is who is looking for them. This
… …
71 70
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 71 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
73 return 0; 72 return 0;
74} 73}
75 74
75static void
76dm_stack_pop (player *pl)
77{
78 if (!pl->stack_items || !pl->stack_position)
79 {
80 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
81 return;
82 }
83
84 pl->stack_position--;
85 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
86}
87
88/**
89 * Get current stack top item for player.
90 * Returns NULL if no stacked item.
91 * If stacked item disappeared (freed), remove it.
92 *
93 * Ryo, august 2004
94 */
95static object *
96dm_stack_peek (player *pl)
97{
98 object *ob;
99
100 if (!pl->stack_position)
101 {
102 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
103 return NULL;
104 }
105
106 ob = find_object (pl->stack_items[pl->stack_position - 1]);
107 if (!ob)
108 {
109 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
110 dm_stack_pop (pl);
111 return NULL;
112 }
113
114 return ob;
115}
116
117/**
118 * Push specified item on player stack.
119 * Inform player of position.
120 * Initializes variables if needed.
121 */
122void
123dm_stack_push (player *pl, tag_t item)
124{
125 if (!pl->stack_items)
126 {
127 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
128 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
129 }
130
131 if (pl->stack_position == STACK_SIZE)
132 {
133 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
134 return;
135 }
136
137 pl->stack_items[pl->stack_position] = item;
138 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
139 pl->stack_position++;
140}
141
142/**
143 * Checks 'params' for object code.
144 *
145 * Can be:
146 * * empty => get current object stack top for player
147 * * number => get item with that tag, stack it for future use
148 * * $number => get specified stack item
149 * * "me" => player himself
150 *
151 * At function exit, params points to first non-object char
152 *
153 * 'from', if not NULL, contains at exit:
154 * * STACK_FROM_NONE => object not found
155 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
156 * * STACK_FROM_STACK => item from somewhere in the stack
157 * * STACK_FROM_NUMBER => item by number, pushed on stack
158 *
159 * Ryo, august 2004
160 */
161static object *
162get_dm_object (player *pl, char **params, int *from)
163{
164 int item_tag, item_position;
165 object *ob;
166
167 if (!pl)
168 return NULL;
169
170 if (!params || !*params || **params == '\0')
171 {
172 if (from)
173 *from = STACK_FROM_TOP;
174 /* No parameter => get stack item */
175 return dm_stack_peek (pl);
176 }
177
178 /* Let's clean white spaces */
179 while (**params == ' ')
180 (*params)++;
181
182 /* Next case: number => item tag */
183 if (sscanf (*params, "%d", &item_tag))
184 {
185 /* Move parameter to next item */
186 while (isdigit (**params))
187 (*params)++;
188
189 /* And skip blanks, too */
190 while (**params == ' ')
191 (*params)++;
192
193 /* Get item */
194 ob = find_object (item_tag);
195 if (!ob)
196 {
197 if (from)
198 *from = STACK_FROM_NONE;
199 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
200 return NULL;
201 }
202
203 /* Got one, let's push it on stack */
204 dm_stack_push (pl, item_tag);
205 if (from)
206 *from = STACK_FROM_NUMBER;
207 return ob;
208 }
209
210 /* Next case: $number => stack item */
211 if (sscanf (*params, "$%d", &item_position))
212 {
213 /* Move parameter to next item */
214 (*params)++;
215
216 while (isdigit (**params))
217 (*params)++;
218 while (**params == ' ')
219 (*params)++;
220
221 if (item_position >= pl->stack_position)
222 {
223 if (from)
224 *from = STACK_FROM_NONE;
225 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
226 return NULL;
227 }
228
229 ob = find_object (pl->stack_items[item_position]);
230 if (!ob)
231 {
232 if (from)
233 *from = STACK_FROM_NONE;
234 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
235 return NULL;
236 }
237
238 if (from)
239 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
240 return ob;
241 }
242
243 /* Next case: 'me' => return pl->ob */
244 if (!strncmp (*params, "me", 2))
245 {
246 if (from)
247 *from = STACK_FROM_NUMBER;
248 dm_stack_push (pl, pl->ob->count);
249
250 /* Skip to next token */
251 (*params) += 2;
252 while (**params == ' ')
253 (*params)++;
254
255 return pl->ob;
256 }
257
258 /* Last case: get stack top */
259 if (from)
260 *from = STACK_FROM_TOP;
261 return dm_stack_peek (pl);
262}
263
76/** 264/**
77 * Actually hides specified player (obviously a DM). 265 * Actually hides specified player (obviously a DM).
78 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 266 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
79 * else they just think someone left/entered. 267 * else they just think someone left/entered.
80 */ 268 */
81void 269static void
82do_wizard_hide (object *op, int silent_dm) 270do_wizard_hide (object *op, int silent_dm)
83{ 271{
84 if (op->contr->hidden) 272 if (op->contr->hidden)
85 { 273 {
86 op->contr->hidden = 0; 274 op->contr->hidden = 0;
… …
168 { 356 {
169 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str); 357 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str);
170 return 1; 358 return 1;
171 } 359 }
172 360
173 become_follower (ob, god); 361 ob->become_follower (god);
174 return 1;
175}
176
177// TODO: Rewrite banish in perl and get rid of the following two functions
178int
179command_kick (object *op, char *params)
180{
181 for_all_players (pl)
182 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
183 {
184 object *op = pl->ob;
185
186 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
187 {
188 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
189 strcpy (op->contr->killer, "kicked");
190 }
191
192 pl->ns->destroy ();
193 }
194
195 return 1;
196}
197
198/**
199 * Add player's IP to ban_file and kick them off the server
200 * I know most people have dynamic IPs but this is more of a short term
201 * solution if they have to get a new IP to play maybe they'll calm down.
202 * This uses the banish_file in the local directory *not* the ban_file
203 * The action is logged with a ! for easy searching. -tm
204 */
205int
206command_banish (object *op, char *params)
207{
208 player *pl;
209 FILE *banishfile;
210 char buf[MAX_BUF];
211 time_t now;
212
213 if (!params)
214 {
215 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
216 return 1;
217 }
218
219 pl = get_other_player_from_name (op, params);
220 if (!pl)
221 return 1; 362 return 1;
222
223 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
224
225 if ((banishfile = fopen (buf, "a")) == NULL)
226 {
227 LOG (llevDebug, "Could not find file banish_file.\n");
228 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
229 return 0;
230 }
231
232 now = time (NULL);
233 /*
234 * Record this as a comment - then we don't have to worry about changing
235 * the parsing code.
236 */
237 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
238 fprintf (banishfile, "*@%s\n", pl->ns->host);
239 fclose (banishfile);
240
241 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
242 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
243 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
244 command_kick (op, (char *) &pl->ob->name);
245 return 1;
246} 363}
247
248//TODO
249#if 0
250int
251command_save_overlay (object *op, char *params)
252{
253 if (!op)
254 return 0;
255
256 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
257 {
258 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't force an overlay save.");
259 return 1;
260 }
261
262 new_save_map (op->map, 2);
263 new_save_map (op->map, 0);
264 new_draw_info (NDI_UNIQUE, 0, op, "Current map has been saved as an" " overlay.");
265
266 ready_map_name (op->map->path, 0);
267
268 return 1;
269}
270#endif
271 364
272int 365int
273command_freeze (object *op, char *params) 366command_freeze (object *op, char *params)
274{ 367{
275 int ticks; 368 int ticks;
… …
330 /* we have nowhere to send the prisoner.... */ 423 /* we have nowhere to send the prisoner.... */
331 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 424 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
332 return 0; 425 return 0;
333 } 426 }
334 427
335 pl->ob->enter_exit (dummy); 428 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
336 dummy->destroy (); 429 dummy->destroy ();
430
337 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 431 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
338 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 432 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
339 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 433 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
340 return 1; 434 return 1;
341} 435}
342 436
343int 437int
344command_summon (object *op, char *params) 438command_summon (object *op, char *params)
345{ 439{
346 int i; 440 int i;
347 object *dummy;
348 player *pl; 441 player *pl;
349 442
350 if (!op) 443 if (!op)
351 return 0; 444 return 0;
352 445
… …
358 451
359 pl = get_other_player_from_name (op, params); 452 pl = get_other_player_from_name (op, params);
360 if (!pl) 453 if (!pl)
361 return 1; 454 return 1;
362 455
363 i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 456 maptile *m = op->map;
457 sint16 nx = op->x;
458 sint16 ny = op->y;
459
460 i = find_free_spot (op, m, nx, ny, 1, SIZEOFFREE1+1);
364 if (i == -1) 461 if (i == -1)
365 { 462 {
366 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 463 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
367 return 1; 464 return 1;
368 } 465 }
369 466
370 dummy = object::create (); 467 nx += freearr_x [i];
371 EXIT_PATH (dummy) = op->map->path; 468 ny += freearr_y [i];
372 EXIT_X (dummy) = op->x + freearr_x[i]; 469
373 EXIT_Y (dummy) = op->y + freearr_y[i]; 470 if (!xy_normalise (m, nx, ny))
374 pl->ob->enter_exit (dummy); 471 {
375 dummy->destroy (); 472 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
473 return 1;
474 }
475
476 pl->ob->player_goto (m->path, nx, ny);
376 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 477 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
377 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 478 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
378 479
379 return 1; 480 return 1;
380} 481}
… …
397int 498int
398command_create (object *op, char *params) 499command_create (object *op, char *params)
399{ 500{
400 object *tmp = NULL; 501 object *tmp = NULL;
401 int nrof, i, magic, set_magic = 0, set_nrof = 0, gotquote, gotspace; 502 int nrof, i, magic, set_magic = 0, set_nrof = 0, gotquote, gotspace;
402 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline; 503 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *endline;
403 archetype *at, *at_spell = NULL; 504 archetype *at, *at_spell = NULL;
404 artifact *art = NULL; 505 artifact *art = NULL;
405 506
406 if (!op) 507 if (!op)
407 return 0; 508 return 0;
… …
473 * we also set up spell_name which is only 574 * we also set up spell_name which is only
474 * the first word. 575 * the first word.
475 */ 576 */
476 577
477 at_spell = archetype::find (cp); 578 at_spell = archetype::find (cp);
478 if (!at_spell || at_spell->clone.type != SPELL) 579 if (!at_spell || at_spell->type != SPELL)
479 at_spell = find_archetype_by_object_name (cp); 580 at_spell = find_archetype_by_object_name (cp);
480 if (!at_spell || at_spell->clone.type != SPELL) 581 if (!at_spell || at_spell->type != SPELL)
481 { 582 {
482 assign (spell_name, cp); 583 assign (spell_name, cp);
483 fsp = strchr (spell_name, ' '); 584 fsp = strchr (spell_name, ' ');
484 if (fsp) 585 if (fsp)
485 { 586 {
486 *fsp = 0; 587 *fsp = 0;
487 fsp++; 588 fsp++;
488 at_spell = archetype::find (spell_name); 589 at_spell = archetype::find (spell_name);
489 590
490 /* Got a spell, update the first string pointer */ 591 /* Got a spell, update the first string pointer */
491 if (at_spell && at_spell->clone.type == SPELL) 592 if (at_spell && at_spell->type == SPELL)
492 bp2 = cp + strlen (spell_name) + 1; 593 bp2 = cp + strlen (spell_name) + 1;
493 else 594 else
494 at_spell = NULL; 595 at_spell = NULL;
495 } 596 }
496 } 597 }
… …
498 /* OK - we didn't find a spell - presume the 'of' 599 /* OK - we didn't find a spell - presume the 'of'
499 * in this case means its an artifact. 600 * in this case means its an artifact.
500 */ 601 */
501 if (!at_spell) 602 if (!at_spell)
502 { 603 {
503 if (find_artifactlist (at->clone.type) == NULL) 604 if (find_artifactlist (at->type) == NULL)
504 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type); 605 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
505 else 606 else
506 { 607 {
507 art = find_artifactlist (at->clone.type)->items; 608 art = find_artifactlist (at->type)->items;
508 609
509 do 610 while (art)
510 { 611 {
511 if (!strcmp (art->item->name, cp)) 612 if (!strcmp (&art->item->name, cp))
512 break; 613 break;
614
513 art = art->next; 615 art = art->next;
514 } 616 }
515 while (art != NULL);
516 617
517 if (!art) 618 if (!art)
518 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 619 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
519 } 620 }
520 621
521 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 622 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
522 } 623 }
523 } /* if cp */ 624 } /* if cp */
524 625
525 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 626 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
526 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 627 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
527 { 628 {
528 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); 629 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);
529 return 1; 630 return 1;
530 } 631 }
531 632
532 /* 633 /*
533 * Rather than have two different blocks with a lot of similar code, 634 * Rather than have two different blocks with a lot of similar code,
534 * just create one object, do all the processing, and then determine 635 * just create one object, do all the processing, and then determine
535 * if that one object should be inserted or if we need to make copies. 636 * if that one object should be inserted or if we need to make copies.
536 */ 637 */
537 tmp = arch_to_object (at); 638 tmp = at->instance ();
538
539 if (settings.real_wiz == FALSE)
540 SET_FLAG (tmp, FLAG_WAS_WIZ);
541 639
542 if (set_magic) 640 if (set_magic)
543 set_abs_magic (tmp, magic); 641 set_abs_magic (tmp, magic);
544 642
545 if (art) 643 if (art)
546 give_artifact_abilities (tmp, art->item); 644 give_artifact_abilities (tmp, art->item);
547 645
548 if (need_identify (tmp)) 646 if (tmp->need_identify ())
549 { 647 {
550 SET_FLAG (tmp, FLAG_IDENTIFIED); 648 tmp->set_flag (FLAG_IDENTIFIED);
551 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 649 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
552 } 650 }
553 651
554 /* 652 /*
555 * This entire block here tries to find variable pairings, 653 * This entire block here tries to find variable pairings,
556 * eg, 'hp 4' or the like. The mess here is that values 654 * eg, 'hp 4' or the like. The mess here is that values
… …
558 * is we want to find two spaces, but if we got a quote, 656 * is we want to find two spaces, but if we got a quote,
559 * any spaces there don't count. 657 * any spaces there don't count.
560 */ 658 */
561 while (*bp2 && bp2 <= endline) 659 while (*bp2 && bp2 <= endline)
562 { 660 {
563 bp4 = NULL;
564 gotspace = 0; 661 gotspace = 0;
565 gotquote = 0; 662 gotquote = 0;
566 663
567 /* find the first quote */ 664 /* find the first quote */
568 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) 665 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
… …
625 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 722 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
626 723
627 bp2 = bp3 + 1; 724 bp2 = bp3 + 1;
628 } 725 }
629 726
630 if (at->clone.nrof) 727 if (at->nrof)
631 { 728 {
632 if (at_spell) 729 if (at_spell)
633 insert_ob_in_ob (arch_to_object (at_spell), tmp); 730 tmp->insert (at_spell->instance ());
634 731
635 tmp->x = op->x; 732 tmp->x = op->x;
636 tmp->y = op->y; 733 tmp->y = op->y;
734 tmp->map = op->map;
637 735
638 if (set_nrof) 736 if (set_nrof)
639 tmp->nrof = nrof; 737 tmp->nrof = nrof;
640 738
641 tmp->map = op->map; 739 op->insert (tmp);
642
643 tmp = insert_ob_in_ob (tmp, op);
644 esrv_send_item (op, tmp);
645 740
646 /* Let's put this created item on stack so dm can access it easily. */ 741 /* Let's put this created item on stack so dm can access it easily. */
647 dm_stack_push (op->contr, tmp->count); 742 dm_stack_push (op->contr, tmp->count);
648 743
649 return 1; 744 return 1;
650 } 745 }
651 else 746 else
652 { 747 {
653 for (i = 0; i < (set_nrof ? nrof : 1); i++) 748 for (i = 0; i < (set_nrof ? nrof : 1); i++)
654 { 749 {
655 archetype *atmp;
656 object *prev = 0, *head = 0; 750 object *prev = 0, *head = 0;
657 751
658 for (atmp = at; atmp; atmp = atmp->more) 752 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
659 { 753 {
660 object *dup = arch_to_object (atmp); 754 object *dup = atmp->instance ();
661 755
662 if (at_spell) 756 if (at_spell)
663 insert_ob_in_ob (arch_to_object (at_spell), dup); 757 insert_ob_in_ob (at_spell->instance (), dup);
664 758
665 /* 759 /*
666 * The head is what contains all the important bits, 760 * The head is what contains all the important bits,
667 * so just copying it over should be fine. 761 * so just copying it over should be fine.
668 */ 762 */
… …
670 { 764 {
671 head = dup; 765 head = dup;
672 tmp->copy_to (dup); 766 tmp->copy_to (dup);
673 } 767 }
674 768
675 if (settings.real_wiz == FALSE)
676 SET_FLAG (dup, FLAG_WAS_WIZ);
677
678 dup->x = op->x + dup->arch->clone.x; 769 dup->x = op->x + dup->arch->x;
679 dup->y = op->y + dup->arch->clone.y; 770 dup->y = op->y + dup->arch->y;
680 dup->map = op->map; 771 dup->map = op->map;
681 772
682 if (head != dup) 773 if (head != dup)
683 { 774 {
684 dup->head = head; 775 dup->head = head;
… …
686 } 777 }
687 778
688 prev = dup; 779 prev = dup;
689 } 780 }
690 781
691 if (QUERY_FLAG (head, FLAG_ALIVE)) 782 if (head->flag [FLAG_ALIVE])
692 { 783 {
693 object *check = head; 784 object *check = head;
694 int size_x = 0; 785 int size_x = 0;
695 int size_y = 0; 786 int size_y = 0;
696 787
697 while (check) 788 while (check)
698 { 789 {
699 size_x = MAX (size_x, check->arch->clone.x); 790 size_x = max (size_x, check->arch->x);
700 size_y = MAX (size_y, check->arch->clone.y); 791 size_y = max (size_y, check->arch->y);
701 check = check->more; 792 check = check->more;
702 } 793 }
703 794
704 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 795 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
705 { 796 {
… …
731 /* Wonder if we really want to push all of these, but since 822 /* Wonder if we really want to push all of these, but since
732 * things like rods have nrof 0, we want to cover those. 823 * things like rods have nrof 0, we want to cover those.
733 */ 824 */
734 dm_stack_push (op->contr, head->count); 825 dm_stack_push (op->contr, head->count);
735 826
736 if (at->clone.randomitems != NULL && !at_spell) 827 if (at->randomitems && !at_spell)
737 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 828 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
738
739 esrv_send_item (op, head);
740 } 829 }
741 830
742 /* free the one we used to copy */ 831 /* free the one we used to copy */
743 tmp->destroy (); 832 tmp->destroy ();
744 } 833 }
… …
751 */ 840 */
752 841
753int 842int
754command_inventory (object *op, char *params) 843command_inventory (object *op, char *params)
755{ 844{
845 int i;
756 object *tmp; 846 object *tmp;
757 int i;
758 847
759 if (!params) 848 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
760 { 849 {
761 inventory (op, NULL); 850 op->contr->failmsg ("Inventory of what object (nr)?");
762 return 0; 851 return 1;
763 }
764
765 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
766 { 852 }
767 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
768 return 1;
769 }
770 853
771 inventory (op, tmp); 854 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
855
772 return 1; 856 return 1;
773} 857}
774 858
775/* just show player's their skills for now. Dm's can 859/* just show player's their skills for now. Dm's can
776 * already see skills w/ inventory command - b.t. 860 * already see skills w/ inventory command - b.t.
… …
794 878
795 char *dump = dump_object (tmp); 879 char *dump = dump_object (tmp);
796 new_draw_info (NDI_UNIQUE, 0, op, dump); 880 new_draw_info (NDI_UNIQUE, 0, op, dump);
797 free (dump); 881 free (dump);
798 882
799 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 883 if (tmp->flag [FLAG_OBJ_ORIGINAL])
800 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 884 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
801 885
802 return 1;
803}
804
805/**
806 * When DM is possessing a monster, flip aggression on and off, to allow
807 * better motion.
808 */
809int
810command_mon_aggr (object *op, char *params)
811{
812 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
813 {
814 op->enemy = NULL;
815 SET_FLAG (op, FLAG_UNAGGRESSIVE);
816 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
817 }
818 else
819 {
820 CLEAR_FLAG (op, FLAG_FRIENDLY);
821 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
822 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
823 }
824
825 return 1;
826}
827
828/** DM can possess a monster. Basically, this tricks the client into thinking
829 * a given monster, is actually the player it controls. This allows a DM
830 * to inhabit a monster's body, and run around the game with it.
831 * This function is severely broken - it has tons of hardcoded values,
832 */
833int
834command_possess (object *op, char *params)
835{
836 object *victim, *curinv, *nextinv;
837 player *pl;
838 int i;
839 char buf[MAX_BUF];
840
841 victim = NULL;
842 if (params != NULL)
843 {
844 if (sscanf (params, "%d", &i))
845 victim = find_object (i);
846 else if (sscanf (params, "%s", buf))
847 victim = find_object_name (buf);
848 }
849 if (victim == NULL)
850 {
851 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
852 return 1;
853 }
854
855 if (victim == op)
856 {
857 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
858 return 1;
859 }
860
861 /* clear out the old inventory */
862 curinv = op->inv;
863 while (curinv != NULL)
864 {
865 nextinv = curinv->below;
866 esrv_del_item (op->contr, curinv->count);
867 curinv = nextinv;
868 }
869
870 /* make the switch */
871 pl = op->contr;
872 victim->contr = pl;
873 pl->ob = victim;
874 victim->type = PLAYER;
875 SET_FLAG (victim, FLAG_WIZ);
876
877 /* send the inventory to the client */
878 curinv = victim->inv;
879 while (curinv != NULL)
880 {
881 nextinv = curinv->below;
882 esrv_send_item (victim, curinv);
883 curinv = nextinv;
884 }
885 /* basic patchup */
886 /* The use of hard coded values is terrible. Note
887 * that really, to be fair, this shouldn't get changed at
888 * all - if you are possessing a kobold, you should have the
889 * same limitations. As it is, as more body locations are added,
890 * this will give this player more locations than perhaps
891 * they should be allowed.
892 */
893 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
894 if (i == 1 || i == 6 || i == 8 || i == 9)
895 victim->body_info[i] = 2;
896 else
897 victim->body_info[i] = 1;
898
899 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
900 esrv_send_inventory (victim, victim);
901
902 victim->update_stats ();
903
904 do_some_living (victim);
905 return 1; 886 return 1;
906} 887}
907 888
908int 889int
909command_patch (object *op, char *params) 890command_patch (object *op, char *params)
… …
924 return 1; 905 return 1;
925 } 906 }
926 907
927 if ((arg2 = strchr (arg, ' '))) 908 if ((arg2 = strchr (arg, ' ')))
928 arg2++; 909 arg2++;
929 if (settings.real_wiz == FALSE) 910
930 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
931 if (set_variable (tmp, arg) == -1) 911 if (set_variable (tmp, arg) == -1)
932 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 912 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
933 else 913 else
934 {
935 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 914 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
936 }
937 915
938 return 1; 916 return 1;
939} 917}
940 918
941int 919int
… …
955 { 933 {
956 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!"); 934 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!");
957 return 1; 935 return 1;
958 } 936 }
959 937
960 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 938 if (tmp->flag [FLAG_REMOVED])
961 { 939 {
962 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp)); 940 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp));
963 return 1; 941 return 1;
964 } 942 }
965 943
… …
1004 */ 982 */
1005int 983int
1006command_addexp (object *op, char *params) 984command_addexp (object *op, char *params)
1007{ 985{
1008 char buf[MAX_BUF], skill[MAX_BUF]; 986 char buf[MAX_BUF], skill[MAX_BUF];
1009 int i, q; 987 int q;
988 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1010 object *skillob = NULL; 989 object *skillob = NULL;
1011 990
1012 skill[0] = '\0'; 991 skill[0] = '\0';
1013 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 992 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %[^\n]", buf, &i, skill)) < 2))
1014 { 993 {
1015 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 994 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1016 return 1; 995 return 1;
1017 } 996 }
1018 997
… …
1036 1015
1037 pl->ob->stats.exp += i; 1016 pl->ob->stats.exp += i;
1038 calc_perm_exp (pl->ob); 1017 calc_perm_exp (pl->ob);
1039 player_lvl_adj (pl->ob, NULL); 1018 player_lvl_adj (pl->ob, NULL);
1040 1019
1041 if (settings.real_wiz == FALSE)
1042 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1043
1044 return 1; 1020 return 1;
1045 } 1021 }
1046 1022
1047 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1023 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1048 return 1; 1024 return 1;
… …
1057/**************************************************************************/ 1033/**************************************************************************/
1058 1034
1059int 1035int
1060command_stats (object *op, char *params) 1036command_stats (object *op, char *params)
1061{ 1037{
1062 char thing[20];
1063 char buf[MAX_BUF]; 1038 char buf[MAX_BUF];
1064 1039
1065 thing[0] = '\0'; 1040 if (params == NULL || params[0] == '\0')
1066 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1067 { 1041 {
1068 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1042 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1069 return 1; 1043 return 1;
1070 } 1044 }
1071 1045
1072 for_all_players (pl) 1046 for_all_players (pl)
1073 if (!strcmp (pl->ob->name, thing)) 1047 if (!strcmp (&pl->ob->name, params))
1074 { 1048 {
1075 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1049 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1076 new_draw_info (NDI_UNIQUE, 0, op, buf); 1050 new_draw_info (NDI_UNIQUE, 0, op, buf);
1077 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 1051 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
1078 new_draw_info (NDI_UNIQUE, 0, op, buf); 1052 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
1121 return 1; 1095 return 1;
1122 } 1096 }
1123 1097
1124 for_all_players (pl) 1098 for_all_players (pl)
1125 { 1099 {
1126 if (!strcmp (pl->ob->name, thing)) 1100 if (!strcmp (&pl->ob->name, thing))
1127 { 1101 {
1128 if (settings.real_wiz == FALSE)
1129 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1130 if (!strcmp ("str", thing2))
1131 pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 1102 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
1132 if (!strcmp ("dex", thing2))
1133 pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 1103 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
1134 if (!strcmp ("con", thing2))
1135 pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 1104 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
1136 if (!strcmp ("wis", thing2))
1137 pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 1105 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
1138 if (!strcmp ("cha", thing2))
1139 pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii; 1106 if (!strcmp ("cha", thing2)) pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii;
1140 if (!strcmp ("int", thing2))
1141 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1107 if (!strcmp ("int", thing2)) pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1142 if (!strcmp ("pow", thing2))
1143 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1108 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1109
1144 sprintf (buf, "%s has been altered.", &pl->ob->name); 1110 sprintf (buf, "%s has been altered.", &pl->ob->name);
1145 new_draw_info (NDI_UNIQUE, 0, op, buf); 1111 new_draw_info (NDI_UNIQUE, 0, op, buf);
1146 pl->ob->update_stats (); 1112 pl->ob->update_stats ();
1147 return 1; 1113 return 1;
1148 } 1114 }
… …
1152 return 1; 1118 return 1;
1153} 1119}
1154 1120
1155int 1121int
1156command_nowiz (object *op, char *params) 1122command_nowiz (object *op, char *params)
1157{ /* 'noadm' is alias */ 1123{ /* 'nodm' is alias */
1158 CLEAR_FLAG (op, FLAG_WIZ); 1124 op->clr_flag (FLAG_WIZ);
1159 CLEAR_FLAG (op, FLAG_WIZPASS); 1125 op->clr_flag (FLAG_WIZPASS);
1160 CLEAR_FLAG (op, FLAG_WIZCAST); 1126 op->clr_flag (FLAG_WIZCAST);
1127 op->clr_flag (FLAG_WIZLOOK);
1128 op->contr->do_los = 1;
1161 1129
1162 if (settings.real_wiz == TRUE)
1163 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1164 if (op->contr->hidden) 1130 if (op->contr->hidden)
1165 { 1131 {
1166 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 1132 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1167 op->map->players++; 1133 op->map->players++;
1168 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 1134 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
1169 op->contr->hidden = 0; 1135 op->contr->hidden = 0;
1170 op->invisible = 1; 1136 op->invisible = 1;
1171 } 1137 }
1172 else 1138 else
1173 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 1139 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
1140
1174 return 1; 1141 return 1;
1175} 1142}
1176 1143
1177/** 1144/**
1178 * object *op is trying to become dm. 1145 * object *op is trying to become dm.
… …
1215 } 1182 }
1216 fclose (dmfile); 1183 fclose (dmfile);
1217 return (0); 1184 return (0);
1218} 1185}
1219 1186
1220int 1187static int
1221do_wizard_dm (object *op, char *params, int silent) 1188do_wizard_dm (object *op, char *params, int silent)
1222{ 1189{
1223 if (!op->contr) 1190 if (!op->contr)
1224 return 0; 1191 return 0;
1225 1192
1226 if (QUERY_FLAG (op, FLAG_WIZ)) 1193 if (op->flag [FLAG_WIZ])
1227 { 1194 {
1228 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1195 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1229 return 0; 1196 return 0;
1230 } 1197 }
1231 1198
1232 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1199 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1233 { 1200 {
1234 SET_FLAG (op, FLAG_WIZ); 1201 op->set_flag (FLAG_WIZ);
1235 SET_FLAG (op, FLAG_WAS_WIZ); 1202 op->set_flag (FLAG_WIZPASS);
1236 SET_FLAG (op, FLAG_WIZPASS); 1203 op->set_flag (FLAG_WIZCAST);
1237 SET_FLAG (op, FLAG_WIZCAST); 1204 op->set_flag (FLAG_WIZLOOK);
1205 op->contr->do_los = 1;
1206
1238 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1207 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1239 /*
1240 * Remove setting flying here - that won't work, because next
1241 * fix_player() is called that will get cleared - proper solution
1242 * is probably something like a wiz_force which gives that and any
1243 * other desired abilities.
1244 */
1245 clear_los (op);
1246 op->contr->write_buf[0] = '\0'; 1208 op->contr->write_buf[0] = '\0';
1247 1209
1248 if (!silent) 1210 if (!silent)
1249 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1211 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1250 1212
… …
1277command_invisible (object *op, char *params) 1239command_invisible (object *op, char *params)
1278{ 1240{
1279 if (op) 1241 if (op)
1280 { 1242 {
1281 op->invisible += 100; 1243 op->invisible += 100;
1282 update_object (op, UP_OBJ_FACE); 1244 update_object (op, UP_OBJ_CHANGE);
1283 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1245 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1284 } 1246 }
1285 1247
1286 return 0; 1248 return 0;
1287} 1249}
… …
1290 * Returns spell object (from archetypes) by name. 1252 * Returns spell object (from archetypes) by name.
1291 * Returns NULL if 0 or more than one spell matches. 1253 * Returns NULL if 0 or more than one spell matches.
1292 * Used for wizard's learn spell/prayer. 1254 * Used for wizard's learn spell/prayer.
1293 * 1255 *
1294 * op is the player issuing the command. 1256 * op is the player issuing the command.
1295 *
1296 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1297 * anymore (but may still be present in some player's inventories and thus
1298 * cannot be removed). We have to ignore them here since they have the same
1299 * name than other "spell_xxx" archetypes and would always conflict.
1300 */ 1257 */
1301static object * 1258static object *
1302get_spell_by_name (object *op, const char *spell_name) 1259get_spell_by_name (object *op, shstr_cmp spell_name)
1303{ 1260{
1304 archetype *ar;
1305 archetype *found;
1306 int conflict_found;
1307 size_t spell_name_length;
1308
1309 /* First check for full name matches. */ 1261 /* First check for full name matches. */
1310 conflict_found = 0; 1262 int conflict_found = 0;
1311 found = NULL; 1263 archetype *found = 0;
1312 for (ar = first_archetype; ar != NULL; ar = ar->next) 1264
1265 for_all_archetypes (at)
1313 { 1266 {
1314 if (ar->clone.type != SPELL) 1267 if (at->type != SPELL)
1315 continue; 1268 continue;
1316 1269
1317 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1270 if (at->object::name != spell_name)
1318 continue; 1271 continue;
1319 1272
1320 if (strcmp (ar->clone.name, spell_name) != 0)
1321 continue;
1322
1323 if (found != NULL) 1273 if (found)
1324 { 1274 {
1325 if (!conflict_found) 1275 if (!conflict_found)
1326 { 1276 {
1327 conflict_found = 1; 1277 conflict_found = 1;
1328 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1278 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", &spell_name);
1329 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1279 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1330 } 1280 }
1281
1331 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1282 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1332 continue; 1283 return 0;
1333 } 1284 }
1334 1285
1335 found = ar; 1286 found = at;
1336 } 1287 }
1337
1338 /* No match if more more than one archetype matches. */
1339 if (conflict_found)
1340 return NULL;
1341 1288
1342 /* Return if exactly one archetype matches. */ 1289 /* Return if exactly one archetype matches. */
1343 if (found != NULL) 1290 if (found)
1344 return arch_to_object (found); 1291 return found->instance ();
1345
1346 /* No full match found: now check for partial matches. */
1347 spell_name_length = strlen (spell_name);
1348 conflict_found = 0;
1349 found = NULL;
1350 for (ar = first_archetype; ar != NULL; ar = ar->next)
1351 {
1352 if (ar->clone.type != SPELL)
1353 continue;
1354
1355 if (strncmp (ar->name, "spelldirect_", 12) == 0)
1356 continue;
1357
1358 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0)
1359 continue;
1360
1361 if (found != NULL)
1362 {
1363 if (!conflict_found)
1364 {
1365 conflict_found = 1;
1366 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1367 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name);
1368 }
1369 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name);
1370 continue;
1371 }
1372
1373 found = ar;
1374 }
1375
1376 /* No match if more more than one archetype matches. */
1377 if (conflict_found)
1378 return NULL;
1379
1380 /* Return if exactly one archetype matches. */
1381 if (found != NULL)
1382 return arch_to_object (found);
1383 1292
1384 /* No spell found: just print an error message. */ 1293 /* No spell found: just print an error message. */
1385 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", spell_name); 1294 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell does not exist.");
1295
1386 return NULL; 1296 return 0;
1387} 1297}
1388 1298
1389static int 1299static int
1390command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1300command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1391{ 1301{
… …
1435 { 1345 {
1436 new_draw_info (NDI_UNIQUE, 0, op, "Which spell do you want to forget?"); 1346 new_draw_info (NDI_UNIQUE, 0, op, "Which spell do you want to forget?");
1437 return 0; 1347 return 0;
1438 } 1348 }
1439 1349
1440 spell = lookup_spell_by_name (op, params); 1350 spell = op->find_spell (params);
1441 if (spell == NULL) 1351 if (spell == NULL)
1442 { 1352 {
1443 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1353 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1444 return 0; 1354 return 0;
1445 } 1355 }
1446 1356
1447 do_forget_spell (op, spell->name); 1357 do_forget_spell (op, spell->name);
1448 return 1;
1449}
1450
1451/**
1452 * Lists all plugins currently loaded with their IDs and full names.
1453 */
1454int
1455command_listplugins (object *op, char *params)
1456{
1457 plugins_display_list (op);
1458 return 1;
1459}
1460
1461/**
1462 * Loads the given plugin. The DM specifies the name of the library to load (no
1463 * pathname is needed). Do not ever attempt to load the same plugin more than
1464 * once at a time, or bad things could happen.
1465 */
1466int
1467command_loadplugin (object *op, char *params)
1468{
1469 char buf[MAX_BUF];
1470
1471 if (params == NULL)
1472 {
1473 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1474 return 1;
1475 }
1476
1477 strcpy (buf, LIBDIR);
1478 strcat (buf, "/plugins/");
1479 strcat (buf, params);
1480 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1481 if (plugins_init_plugin (buf) == 0)
1482 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1483 else
1484 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1485 return 1;
1486}
1487
1488/**
1489 * Unloads the given plugin. The DM specified the ID of the library to unload.
1490 * Note that some things may behave strangely if the correct plugins are not
1491 * loaded.
1492 */
1493int
1494command_unloadplugin (object *op, char *params)
1495{
1496 if (params == NULL)
1497 {
1498 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1499 return 1;
1500 }
1501
1502 if (plugins_remove_plugin (params) == 0)
1503 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1504 else
1505 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1506 return 1; 1358 return 1;
1507} 1359}
1508 1360
1509/** 1361/**
1510 * A players wants to become DM and hide. 1362 * A players wants to become DM and hide.
… …
1518 return 0; 1370 return 0;
1519 1371
1520 do_wizard_hide (op, 1); 1372 do_wizard_hide (op, 1);
1521 1373
1522 return 1; 1374 return 1;
1523}
1524
1525void
1526dm_stack_pop (player *pl)
1527{
1528 if (!pl->stack_items || !pl->stack_position)
1529 {
1530 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1531 return;
1532 }
1533
1534 pl->stack_position--;
1535 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1536}
1537
1538/**
1539 * Get current stack top item for player.
1540 * Returns NULL if no stacked item.
1541 * If stacked item disappeared (freed), remove it.
1542 *
1543 * Ryo, august 2004
1544 */
1545object *
1546dm_stack_peek (player *pl)
1547{
1548 object *ob;
1549
1550 if (!pl->stack_position)
1551 {
1552 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1553 return NULL;
1554 }
1555
1556 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1557 if (!ob)
1558 {
1559 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1560 dm_stack_pop (pl);
1561 return NULL;
1562 }
1563
1564 return ob;
1565}
1566
1567/**
1568 * Push specified item on player stack.
1569 * Inform player of position.
1570 * Initializes variables if needed.
1571 */
1572void
1573dm_stack_push (player *pl, tag_t item)
1574{
1575 if (!pl->stack_items)
1576 {
1577 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1578 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1579 }
1580
1581 if (pl->stack_position == STACK_SIZE)
1582 {
1583 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1584 return;
1585 }
1586
1587 pl->stack_items[pl->stack_position] = item;
1588 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1589 pl->stack_position++;
1590}
1591
1592/**
1593 * Checks 'params' for object code.
1594 *
1595 * Can be:
1596 * * empty => get current object stack top for player
1597 * * number => get item with that tag, stack it for future use
1598 * * $number => get specified stack item
1599 * * "me" => player himself
1600 *
1601 * At function exit, params points to first non-object char
1602 *
1603 * 'from', if not NULL, contains at exit:
1604 * * STACK_FROM_NONE => object not found
1605 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1606 * * STACK_FROM_STACK => item from somewhere in the stack
1607 * * STACK_FROM_NUMBER => item by number, pushed on stack
1608 *
1609 * Ryo, august 2004
1610 */
1611object *
1612get_dm_object (player *pl, char **params, int *from)
1613{
1614 int item_tag, item_position;
1615 object *ob;
1616
1617 if (!pl)
1618 return NULL;
1619
1620 if (!params || !*params || **params == '\0')
1621 {
1622 if (from)
1623 *from = STACK_FROM_TOP;
1624 /* No parameter => get stack item */
1625 return dm_stack_peek (pl);
1626 }
1627
1628 /* Let's clean white spaces */
1629 while (**params == ' ')
1630 (*params)++;
1631
1632 /* Next case: number => item tag */
1633 if (sscanf (*params, "%d", &item_tag))
1634 {
1635 /* Move parameter to next item */
1636 while (isdigit (**params))
1637 (*params)++;
1638
1639 /* And skip blanks, too */
1640 while (**params == ' ')
1641 (*params)++;
1642
1643 /* Get item */
1644 ob = find_object (item_tag);
1645 if (!ob)
1646 {
1647 if (from)
1648 *from = STACK_FROM_NONE;
1649 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1650 return NULL;
1651 }
1652
1653 /* Got one, let's push it on stack */
1654 dm_stack_push (pl, item_tag);
1655 if (from)
1656 *from = STACK_FROM_NUMBER;
1657 return ob;
1658 }
1659
1660 /* Next case: $number => stack item */
1661 if (sscanf (*params, "$%d", &item_position))
1662 {
1663 /* Move parameter to next item */
1664 (*params)++;
1665
1666 while (isdigit (**params))
1667 (*params)++;
1668 while (**params == ' ')
1669 (*params)++;
1670
1671 if (item_position >= pl->stack_position)
1672 {
1673 if (from)
1674 *from = STACK_FROM_NONE;
1675 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1676 return NULL;
1677 }
1678
1679 ob = find_object (pl->stack_items[item_position]);
1680 if (!ob)
1681 {
1682 if (from)
1683 *from = STACK_FROM_NONE;
1684 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1685 return NULL;
1686 }
1687
1688 if (from)
1689 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1690 return ob;
1691 }
1692
1693 /* Next case: 'me' => return pl->ob */
1694 if (!strncmp (*params, "me", 2))
1695 {
1696 if (from)
1697 *from = STACK_FROM_NUMBER;
1698 dm_stack_push (pl, pl->ob->count);
1699
1700 /* Skip to next token */
1701 (*params) += 2;
1702 while (**params == ' ')
1703 (*params)++;
1704
1705 return pl->ob;
1706 }
1707
1708 /* Last case: get stack top */
1709 if (from)
1710 *from = STACK_FROM_TOP;
1711 return dm_stack_peek (pl);
1712} 1375}
1713 1376
1714/** 1377/**
1715 * Pop the stack top. 1378 * Pop the stack top.
1716 */ 1379 */
… …
1776} 1439}
1777 1440
1778int 1441int
1779command_insert_into (object *op, char *params) 1442command_insert_into (object *op, char *params)
1780{ 1443{
1781 object *left, *right, *inserted; 1444 object *left, *right;
1782 int left_from, right_from; 1445 int left_from, right_from;
1783 1446
1784 left = get_dm_object (op->contr, &params, &left_from); 1447 left = get_dm_object (op->contr, &params, &left_from);
1785 if (!left) 1448 if (!left)
1786 { 1449 {
… …
1829 { 1492 {
1830 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1493 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1831 return 0; 1494 return 0;
1832 } 1495 }
1833 1496
1834 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1497 if (!right->flag [FLAG_REMOVED])
1835 right->remove (); 1498 right->remove ();
1499
1836 inserted = insert_ob_in_ob (right, left); 1500 object *inserted = insert_ob_in_ob (right, left);
1837 if (left->type == PLAYER)
1838 if (inserted == right)
1839 esrv_send_item (left, right);
1840 else
1841 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1842 1501
1843 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1502 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
1844 1503
1845 return 0; 1504 return 0;
1846 1505

Diff Legend

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