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.34 by root, Mon Feb 5 01:24:46 2007 UTC vs.
Revision 1.89 by sf-kernelpanic, Sun Feb 5 20:53:22 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 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 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;
87 op->invisible = 1; 275 op->invisible = 1;
88 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 276 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
89 op->map->players++; 277 op->map->players++;
90 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 278 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
279
91 if (!silent_dm) 280 if (!silent_dm)
92 {
93 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 281 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
94 }
95 } 282 }
96 else 283 else
97 { 284 {
98 op->contr->hidden = 1; 285 op->contr->hidden = 1;
99 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); 286 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
100 op->map->players--; 287 op->map->players--;
288
101 if (!silent_dm) 289 if (!silent_dm)
102 {
103 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 290 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
104 } 291
105 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); 292 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name);
106 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); 293 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name);
107 } 294 }
108} 295}
109 296
… …
169 { 356 {
170 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);
171 return 1; 358 return 1;
172 } 359 }
173 360
174 become_follower (ob, god); 361 ob->become_follower (god);
175 return 1;
176}
177
178/**
179 * Add player's IP to ban_file and kick them off the server
180 * I know most people have dynamic IPs but this is more of a short term
181 * solution if they have to get a new IP to play maybe they'll calm down.
182 * This uses the banish_file in the local directory *not* the ban_file
183 * The action is logged with a ! for easy searching. -tm
184 */
185int
186command_banish (object *op, char *params)
187{
188 player *pl;
189 FILE *banishfile;
190 char buf[MAX_BUF];
191 time_t now;
192
193 if (!params)
194 {
195 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
196 return 1;
197 }
198
199 pl = get_other_player_from_name (op, params);
200 if (!pl)
201 return 1;
202
203 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
204
205 if ((banishfile = fopen (buf, "a")) == NULL)
206 {
207 LOG (llevDebug, "Could not find file banish_file.\n");
208 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
209 return 0;
210 }
211
212 now = time (NULL);
213 /*
214 * Record this as a comment - then we don't have to worry about changing
215 * the parsing code.
216 */
217 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
218 fprintf (banishfile, "*@%s\n", pl->ns->host);
219 fclose (banishfile);
220
221 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
222 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
223 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
224 command_kick (op, (char *) &pl->ob->name);
225 return 1;
226}
227
228int
229command_kick (object *op, char *params)
230{
231 for_all_players (pl)
232 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
233 {
234 object *op = pl->ob;
235
236 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
237 {
238 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
239 strcpy (op->contr->killer, "kicked");
240 }
241
242 pl->ns->destroy ();
243 }
244
245 return 1;
246}
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
272int
273command_shutdown (object *op, char *params)
274{
275 if (op && !QUERY_FLAG (op, FLAG_WIZ))
276 {
277 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
278 return 1;
279 }
280
281 cleanup ("dm initiated shutdown", 0);
282
283 /* not reached */
284 return 1; 362 return 1;
285} 363}
286 364
287int 365int
288command_freeze (object *op, char *params) 366command_freeze (object *op, char *params)
… …
345 /* we have nowhere to send the prisoner.... */ 423 /* we have nowhere to send the prisoner.... */
346 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");
347 return 0; 425 return 0;
348 } 426 }
349 427
350 pl->ob->enter_exit (dummy); 428 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
351 dummy->destroy (); 429 dummy->destroy ();
430
352 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.");
353 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 432 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
354 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);
355 return 1; 434 return 1;
356} 435}
357 436
358int 437int
359command_summon (object *op, char *params) 438command_summon (object *op, char *params)
360{ 439{
361 int i; 440 int i;
362 object *dummy;
363 player *pl; 441 player *pl;
364 442
365 if (!op) 443 if (!op)
366 return 0; 444 return 0;
367 445
… …
373 451
374 pl = get_other_player_from_name (op, params); 452 pl = get_other_player_from_name (op, params);
375 if (!pl) 453 if (!pl)
376 return 1; 454 return 1;
377 455
378 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);
379 if (i == -1) 461 if (i == -1)
380 { 462 {
381 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.");
382 return 1; 464 return 1;
383 } 465 }
384 466
385 dummy = object::create (); 467 nx += freearr_x [i];
386 EXIT_PATH (dummy) = op->map->path; 468 ny += freearr_y [i];
387 EXIT_X (dummy) = op->x + freearr_x[i]; 469
388 EXIT_Y (dummy) = op->y + freearr_y[i]; 470 if (!xy_normalise (m, nx, ny))
389 pl->ob->enter_exit (dummy); 471 {
390 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);
391 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 477 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
392 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 478 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
393 479
394 return 1; 480 return 1;
395} 481}
… …
412int 498int
413command_create (object *op, char *params) 499command_create (object *op, char *params)
414{ 500{
415 object *tmp = NULL; 501 object *tmp = NULL;
416 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;
417 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline; 503 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *endline;
418 archetype *at, *at_spell = NULL; 504 archetype *at, *at_spell = NULL;
419 artifact *art = NULL; 505 artifact *art = NULL;
420 506
421 if (!op) 507 if (!op)
422 return 0; 508 return 0;
… …
488 * we also set up spell_name which is only 574 * we also set up spell_name which is only
489 * the first word. 575 * the first word.
490 */ 576 */
491 577
492 at_spell = archetype::find (cp); 578 at_spell = archetype::find (cp);
493 if (!at_spell || at_spell->clone.type != SPELL) 579 if (!at_spell || at_spell->type != SPELL)
494 at_spell = find_archetype_by_object_name (cp); 580 at_spell = find_archetype_by_object_name (cp);
495 if (!at_spell || at_spell->clone.type != SPELL) 581 if (!at_spell || at_spell->type != SPELL)
496 { 582 {
497 assign (spell_name, cp); 583 assign (spell_name, cp);
498 fsp = strchr (spell_name, ' '); 584 fsp = strchr (spell_name, ' ');
499 if (fsp) 585 if (fsp)
500 { 586 {
501 *fsp = 0; 587 *fsp = 0;
502 fsp++; 588 fsp++;
503 at_spell = archetype::find (spell_name); 589 at_spell = archetype::find (spell_name);
504 590
505 /* Got a spell, update the first string pointer */ 591 /* Got a spell, update the first string pointer */
506 if (at_spell && at_spell->clone.type == SPELL) 592 if (at_spell && at_spell->type == SPELL)
507 bp2 = cp + strlen (spell_name) + 1; 593 bp2 = cp + strlen (spell_name) + 1;
508 else 594 else
509 at_spell = NULL; 595 at_spell = NULL;
510 } 596 }
511 } 597 }
… …
513 /* OK - we didn't find a spell - presume the 'of' 599 /* OK - we didn't find a spell - presume the 'of'
514 * in this case means its an artifact. 600 * in this case means its an artifact.
515 */ 601 */
516 if (!at_spell) 602 if (!at_spell)
517 { 603 {
518 if (find_artifactlist (at->clone.type) == NULL) 604 if (find_artifactlist (at->type) == NULL)
519 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);
520 else 606 else
521 { 607 {
522 art = find_artifactlist (at->clone.type)->items; 608 art = find_artifactlist (at->type)->items;
523 609
524 do 610 while (art)
525 { 611 {
526 if (!strcmp (art->item->name, cp)) 612 if (!strcmp (&art->item->name, cp))
527 break; 613 break;
614
528 art = art->next; 615 art = art->next;
529 } 616 }
530 while (art != NULL);
531 617
532 if (!art) 618 if (!art)
533 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);
534 } 620 }
535 621
536 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);
537 } 623 }
538 } /* if cp */ 624 } /* if cp */
539 625
540 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 626 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
541 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 627 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
542 { 628 {
543 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);
544 return 1; 630 return 1;
545 } 631 }
546 632
547 /* 633 /*
548 * 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,
549 * just create one object, do all the processing, and then determine 635 * just create one object, do all the processing, and then determine
550 * 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.
551 */ 637 */
552 tmp = arch_to_object (at); 638 tmp = at->instance ();
553
554 if (settings.real_wiz == FALSE)
555 SET_FLAG (tmp, FLAG_WAS_WIZ);
556 639
557 if (set_magic) 640 if (set_magic)
558 set_abs_magic (tmp, magic); 641 set_abs_magic (tmp, magic);
559 642
560 if (art) 643 if (art)
561 give_artifact_abilities (tmp, art->item); 644 give_artifact_abilities (tmp, art->item);
562 645
563 if (need_identify (tmp)) 646 if (tmp->need_identify ())
564 { 647 {
565 SET_FLAG (tmp, FLAG_IDENTIFIED); 648 tmp->set_flag (FLAG_IDENTIFIED);
566 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 649 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
567 } 650 }
568 651
569 /* 652 /*
570 * This entire block here tries to find variable pairings, 653 * This entire block here tries to find variable pairings,
571 * 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
… …
573 * 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,
574 * any spaces there don't count. 657 * any spaces there don't count.
575 */ 658 */
576 while (*bp2 && bp2 <= endline) 659 while (*bp2 && bp2 <= endline)
577 { 660 {
578 bp4 = NULL;
579 gotspace = 0; 661 gotspace = 0;
580 gotquote = 0; 662 gotquote = 0;
581 663
582 /* find the first quote */ 664 /* find the first quote */
583 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) 665 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
… …
640 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);
641 723
642 bp2 = bp3 + 1; 724 bp2 = bp3 + 1;
643 } 725 }
644 726
645 if (at->clone.nrof) 727 if (at->nrof)
646 { 728 {
647 if (at_spell) 729 if (at_spell)
648 insert_ob_in_ob (arch_to_object (at_spell), tmp); 730 tmp->insert (at_spell->instance ());
649 731
650 tmp->x = op->x; 732 tmp->x = op->x;
651 tmp->y = op->y; 733 tmp->y = op->y;
734 tmp->map = op->map;
652 735
653 if (set_nrof) 736 if (set_nrof)
654 tmp->nrof = nrof; 737 tmp->nrof = nrof;
655 738
656 tmp->map = op->map; 739 op->insert (tmp);
657
658 tmp = insert_ob_in_ob (tmp, op);
659 esrv_send_item (op, tmp);
660 740
661 /* 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. */
662 dm_stack_push (op->contr, tmp->count); 742 dm_stack_push (op->contr, tmp->count);
663 743
664 return 1; 744 return 1;
665 } 745 }
666 else 746 else
667 { 747 {
668 for (i = 0; i < (set_nrof ? nrof : 1); i++) 748 for (i = 0; i < (set_nrof ? nrof : 1); i++)
669 { 749 {
670 archetype *atmp;
671 object *prev = 0, *head = 0; 750 object *prev = 0, *head = 0;
672 751
673 for (atmp = at; atmp; atmp = atmp->more) 752 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
674 { 753 {
675 object *dup = arch_to_object (atmp); 754 object *dup = atmp->instance ();
676 755
677 if (at_spell) 756 if (at_spell)
678 insert_ob_in_ob (arch_to_object (at_spell), dup); 757 insert_ob_in_ob (at_spell->instance (), dup);
679 758
680 /* 759 /*
681 * The head is what contains all the important bits, 760 * The head is what contains all the important bits,
682 * so just copying it over should be fine. 761 * so just copying it over should be fine.
683 */ 762 */
… …
685 { 764 {
686 head = dup; 765 head = dup;
687 tmp->copy_to (dup); 766 tmp->copy_to (dup);
688 } 767 }
689 768
690 if (settings.real_wiz == FALSE)
691 SET_FLAG (dup, FLAG_WAS_WIZ);
692
693 dup->x = op->x + dup->arch->clone.x; 769 dup->x = op->x + dup->arch->x;
694 dup->y = op->y + dup->arch->clone.y; 770 dup->y = op->y + dup->arch->y;
695 dup->map = op->map; 771 dup->map = op->map;
696 772
697 if (head != dup) 773 if (head != dup)
698 { 774 {
699 dup->head = head; 775 dup->head = head;
… …
701 } 777 }
702 778
703 prev = dup; 779 prev = dup;
704 } 780 }
705 781
706 if (QUERY_FLAG (head, FLAG_ALIVE)) 782 if (head->flag [FLAG_ALIVE])
707 { 783 {
708 object *check = head; 784 object *check = head;
709 int size_x = 0; 785 int size_x = 0;
710 int size_y = 0; 786 int size_y = 0;
711 787
712 while (check) 788 while (check)
713 { 789 {
714 size_x = MAX (size_x, check->arch->clone.x); 790 size_x = max (size_x, check->arch->x);
715 size_y = MAX (size_y, check->arch->clone.y); 791 size_y = max (size_y, check->arch->y);
716 check = check->more; 792 check = check->more;
717 } 793 }
718 794
719 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))
720 { 796 {
… …
746 /* 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
747 * things like rods have nrof 0, we want to cover those. 823 * things like rods have nrof 0, we want to cover those.
748 */ 824 */
749 dm_stack_push (op->contr, head->count); 825 dm_stack_push (op->contr, head->count);
750 826
751 if (at->clone.randomitems != NULL && !at_spell) 827 if (at->randomitems && !at_spell)
752 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 828 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
753
754 esrv_send_item (op, head);
755 } 829 }
756 830
757 /* free the one we used to copy */ 831 /* free the one we used to copy */
758 tmp->destroy (); 832 tmp->destroy ();
759 } 833 }
… …
766 */ 840 */
767 841
768int 842int
769command_inventory (object *op, char *params) 843command_inventory (object *op, char *params)
770{ 844{
845 int i;
771 object *tmp; 846 object *tmp;
772 int i;
773 847
774 if (!params) 848 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
775 { 849 {
776 inventory (op, NULL); 850 op->contr->failmsg ("Inventory of what object (nr)?");
777 return 0; 851 return 1;
778 }
779
780 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
781 { 852 }
782 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
783 return 1;
784 }
785 853
786 inventory (op, tmp); 854 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
855
787 return 1; 856 return 1;
788} 857}
789 858
790/* just show player's their skills for now. Dm's can 859/* just show player's their skills for now. Dm's can
791 * already see skills w/ inventory command - b.t. 860 * already see skills w/ inventory command - b.t.
… …
809 878
810 char *dump = dump_object (tmp); 879 char *dump = dump_object (tmp);
811 new_draw_info (NDI_UNIQUE, 0, op, dump); 880 new_draw_info (NDI_UNIQUE, 0, op, dump);
812 free (dump); 881 free (dump);
813 882
814 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 883 if (tmp->flag [FLAG_OBJ_ORIGINAL])
815 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 884 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
816 885
817 return 1;
818}
819
820/**
821 * When DM is possessing a monster, flip aggression on and off, to allow
822 * better motion.
823 */
824int
825command_mon_aggr (object *op, char *params)
826{
827 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
828 {
829 op->enemy = NULL;
830 SET_FLAG (op, FLAG_UNAGGRESSIVE);
831 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
832 }
833 else
834 {
835 CLEAR_FLAG (op, FLAG_FRIENDLY);
836 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
837 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
838 }
839
840 return 1;
841}
842
843/** DM can possess a monster. Basically, this tricks the client into thinking
844 * a given monster, is actually the player it controls. This allows a DM
845 * to inhabit a monster's body, and run around the game with it.
846 * This function is severely broken - it has tons of hardcoded values,
847 */
848int
849command_possess (object *op, char *params)
850{
851 object *victim, *curinv, *nextinv;
852 player *pl;
853 int i;
854 char buf[MAX_BUF];
855
856 victim = NULL;
857 if (params != NULL)
858 {
859 if (sscanf (params, "%d", &i))
860 victim = find_object (i);
861 else if (sscanf (params, "%s", buf))
862 victim = find_object_name (buf);
863 }
864 if (victim == NULL)
865 {
866 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
867 return 1;
868 }
869
870 if (victim == op)
871 {
872 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
873 return 1;
874 }
875
876 /* clear out the old inventory */
877 curinv = op->inv;
878 while (curinv != NULL)
879 {
880 nextinv = curinv->below;
881 esrv_del_item (op->contr, curinv->count);
882 curinv = nextinv;
883 }
884
885 /* make the switch */
886 pl = op->contr;
887 victim->contr = pl;
888 pl->ob = victim;
889 victim->type = PLAYER;
890 SET_FLAG (victim, FLAG_WIZ);
891
892 /* send the inventory to the client */
893 curinv = victim->inv;
894 while (curinv != NULL)
895 {
896 nextinv = curinv->below;
897 esrv_send_item (victim, curinv);
898 curinv = nextinv;
899 }
900 /* basic patchup */
901 /* The use of hard coded values is terrible. Note
902 * that really, to be fair, this shouldn't get changed at
903 * all - if you are possessing a kobold, you should have the
904 * same limitations. As it is, as more body locations are added,
905 * this will give this player more locations than perhaps
906 * they should be allowed.
907 */
908 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
909 if (i == 1 || i == 6 || i == 8 || i == 9)
910 victim->body_info[i] = 2;
911 else
912 victim->body_info[i] = 1;
913
914 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
915 esrv_send_inventory (victim, victim);
916
917 victim->update_stats ();
918
919 do_some_living (victim);
920 return 1; 886 return 1;
921} 887}
922 888
923int 889int
924command_patch (object *op, char *params) 890command_patch (object *op, char *params)
… …
939 return 1; 905 return 1;
940 } 906 }
941 907
942 if ((arg2 = strchr (arg, ' '))) 908 if ((arg2 = strchr (arg, ' ')))
943 arg2++; 909 arg2++;
944 if (settings.real_wiz == FALSE) 910
945 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
946 if (set_variable (tmp, arg) == -1) 911 if (set_variable (tmp, arg) == -1)
947 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);
948 else 913 else
949 {
950 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);
951 }
952 915
953 return 1; 916 return 1;
954} 917}
955 918
956int 919int
… …
970 { 933 {
971 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!");
972 return 1; 935 return 1;
973 } 936 }
974 937
975 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 938 if (tmp->flag [FLAG_REMOVED])
976 { 939 {
977 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));
978 return 1; 941 return 1;
979 } 942 }
980 943
… …
1019 */ 982 */
1020int 983int
1021command_addexp (object *op, char *params) 984command_addexp (object *op, char *params)
1022{ 985{
1023 char buf[MAX_BUF], skill[MAX_BUF]; 986 char buf[MAX_BUF], skill[MAX_BUF];
1024 int i, q; 987 int q;
988 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1025 object *skillob = NULL; 989 object *skillob = NULL;
1026 990
1027 skill[0] = '\0'; 991 skill[0] = '\0';
1028 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))
1029 { 993 {
1030 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>].");
1031 return 1; 995 return 1;
1032 } 996 }
1033 997
… …
1051 1015
1052 pl->ob->stats.exp += i; 1016 pl->ob->stats.exp += i;
1053 calc_perm_exp (pl->ob); 1017 calc_perm_exp (pl->ob);
1054 player_lvl_adj (pl->ob, NULL); 1018 player_lvl_adj (pl->ob, NULL);
1055 1019
1056 if (settings.real_wiz == FALSE)
1057 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1058
1059 return 1; 1020 return 1;
1060 } 1021 }
1061 1022
1062 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1023 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1063 return 1; 1024 return 1;
… …
1072/**************************************************************************/ 1033/**************************************************************************/
1073 1034
1074int 1035int
1075command_stats (object *op, char *params) 1036command_stats (object *op, char *params)
1076{ 1037{
1077 char thing[20];
1078 char buf[MAX_BUF]; 1038 char buf[MAX_BUF];
1079 1039
1080 thing[0] = '\0'; 1040 if (params == NULL || params[0] == '\0')
1081 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1082 { 1041 {
1083 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1042 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1084 return 1; 1043 return 1;
1085 } 1044 }
1086 1045
1087 for_all_players (pl) 1046 for_all_players (pl)
1088 if (!strcmp (pl->ob->name, thing)) 1047 if (!strcmp (&pl->ob->name, params))
1089 { 1048 {
1090 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);
1091 new_draw_info (NDI_UNIQUE, 0, op, buf); 1050 new_draw_info (NDI_UNIQUE, 0, op, buf);
1092 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);
1093 new_draw_info (NDI_UNIQUE, 0, op, buf); 1052 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
1111int 1070int
1112command_abil (object *op, char *params) 1071command_abil (object *op, char *params)
1113{ 1072{
1114 char thing[20], thing2[20]; 1073 char thing[20], thing2[20];
1115 int iii; 1074 int iii;
1116 player *pl;
1117 char buf[MAX_BUF]; 1075 char buf[MAX_BUF];
1118 1076
1119 iii = 0; 1077 iii = 0;
1120 thing[0] = '\0'; 1078 thing[0] = '\0';
1121 thing2[0] = '\0'; 1079 thing2[0] = '\0';
… …
1137 return 1; 1095 return 1;
1138 } 1096 }
1139 1097
1140 for_all_players (pl) 1098 for_all_players (pl)
1141 { 1099 {
1142 if (!strcmp (pl->ob->name, thing)) 1100 if (!strcmp (&pl->ob->name, thing))
1143 { 1101 {
1144 if (settings.real_wiz == FALSE)
1145 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1146 if (!strcmp ("str", thing2))
1147 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;
1148 if (!strcmp ("dex", thing2))
1149 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;
1150 if (!strcmp ("con", thing2))
1151 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;
1152 if (!strcmp ("wis", thing2))
1153 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;
1154 if (!strcmp ("cha", thing2))
1155 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;
1156 if (!strcmp ("int", thing2))
1157 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;
1158 if (!strcmp ("pow", thing2))
1159 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
1160 sprintf (buf, "%s has been altered.", &pl->ob->name); 1110 sprintf (buf, "%s has been altered.", &pl->ob->name);
1161 new_draw_info (NDI_UNIQUE, 0, op, buf); 1111 new_draw_info (NDI_UNIQUE, 0, op, buf);
1162 pl->ob->update_stats (); 1112 pl->ob->update_stats ();
1163 return 1; 1113 return 1;
1164 } 1114 }
… …
1168 return 1; 1118 return 1;
1169} 1119}
1170 1120
1171int 1121int
1172command_nowiz (object *op, char *params) 1122command_nowiz (object *op, char *params)
1173{ /* 'noadm' is alias */ 1123{ /* 'nodm' is alias */
1174 CLEAR_FLAG (op, FLAG_WIZ); 1124 op->clr_flag (FLAG_WIZ);
1175 CLEAR_FLAG (op, FLAG_WIZPASS); 1125 op->clr_flag (FLAG_WIZPASS);
1176 CLEAR_FLAG (op, FLAG_WIZCAST); 1126 op->clr_flag (FLAG_WIZCAST);
1127 op->clr_flag (FLAG_WIZLOOK);
1128 op->contr->do_los = 1;
1177 1129
1178 if (settings.real_wiz == TRUE)
1179 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1180 if (op->contr->hidden) 1130 if (op->contr->hidden)
1181 { 1131 {
1182 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");
1183 op->map->players++; 1133 op->map->players++;
1184 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);
1185 op->contr->hidden = 0; 1135 op->contr->hidden = 0;
1186 op->invisible = 1; 1136 op->invisible = 1;
1187 } 1137 }
1188 else 1138 else
1189 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
1190 return 1; 1141 return 1;
1191} 1142}
1192 1143
1193/** 1144/**
1194 * object *op is trying to become dm. 1145 * object *op is trying to become dm.
… …
1231 } 1182 }
1232 fclose (dmfile); 1183 fclose (dmfile);
1233 return (0); 1184 return (0);
1234} 1185}
1235 1186
1236int 1187static int
1237do_wizard_dm (object *op, char *params, int silent) 1188do_wizard_dm (object *op, char *params, int silent)
1238{ 1189{
1239 if (!op->contr) 1190 if (!op->contr)
1240 return 0; 1191 return 0;
1241 1192
1242 if (QUERY_FLAG (op, FLAG_WIZ)) 1193 if (op->flag [FLAG_WIZ])
1243 { 1194 {
1244 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!");
1245 return 0; 1196 return 0;
1246 } 1197 }
1247 1198
1248 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1199 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1249 { 1200 {
1250 SET_FLAG (op, FLAG_WIZ); 1201 op->set_flag (FLAG_WIZ);
1251 SET_FLAG (op, FLAG_WAS_WIZ); 1202 op->set_flag (FLAG_WIZPASS);
1252 SET_FLAG (op, FLAG_WIZPASS); 1203 op->set_flag (FLAG_WIZCAST);
1253 SET_FLAG (op, FLAG_WIZCAST); 1204 op->set_flag (FLAG_WIZLOOK);
1205 op->contr->do_los = 1;
1206
1254 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!");
1255 /*
1256 * Remove setting flying here - that won't work, because next
1257 * fix_player() is called that will get cleared - proper solution
1258 * is probably something like a wiz_force which gives that and any
1259 * other desired abilities.
1260 */
1261 clear_los (op);
1262 op->contr->write_buf[0] = '\0'; 1208 op->contr->write_buf[0] = '\0';
1263 1209
1264 if (!silent) 1210 if (!silent)
1265 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!");
1266 1212
… …
1293command_invisible (object *op, char *params) 1239command_invisible (object *op, char *params)
1294{ 1240{
1295 if (op) 1241 if (op)
1296 { 1242 {
1297 op->invisible += 100; 1243 op->invisible += 100;
1298 update_object (op, UP_OBJ_FACE); 1244 update_object (op, UP_OBJ_CHANGE);
1299 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1245 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1300 } 1246 }
1301 1247
1302 return 0; 1248 return 0;
1303} 1249}
… …
1306 * Returns spell object (from archetypes) by name. 1252 * Returns spell object (from archetypes) by name.
1307 * Returns NULL if 0 or more than one spell matches. 1253 * Returns NULL if 0 or more than one spell matches.
1308 * Used for wizard's learn spell/prayer. 1254 * Used for wizard's learn spell/prayer.
1309 * 1255 *
1310 * op is the player issuing the command. 1256 * op is the player issuing the command.
1311 *
1312 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1313 * anymore (but may still be present in some player's inventories and thus
1314 * cannot be removed). We have to ignore them here since they have the same
1315 * name than other "spell_xxx" archetypes and would always conflict.
1316 */ 1257 */
1317static object * 1258static object *
1318get_spell_by_name (object *op, const char *spell_name) 1259get_spell_by_name (object *op, shstr_cmp spell_name)
1319{ 1260{
1320 archetype *ar;
1321 archetype *found;
1322 int conflict_found;
1323 size_t spell_name_length;
1324
1325 /* First check for full name matches. */ 1261 /* First check for full name matches. */
1326 conflict_found = 0; 1262 int conflict_found = 0;
1327 found = NULL; 1263 archetype *found = 0;
1328 for (ar = first_archetype; ar != NULL; ar = ar->next) 1264
1265 for_all_archetypes (at)
1329 { 1266 {
1330 if (ar->clone.type != SPELL) 1267 if (at->type != SPELL)
1331 continue; 1268 continue;
1332 1269
1333 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1270 if (at->object::name != spell_name)
1334 continue; 1271 continue;
1335 1272
1336 if (strcmp (ar->clone.name, spell_name) != 0)
1337 continue;
1338
1339 if (found != NULL) 1273 if (found)
1340 { 1274 {
1341 if (!conflict_found) 1275 if (!conflict_found)
1342 { 1276 {
1343 conflict_found = 1; 1277 conflict_found = 1;
1344 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);
1345 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1279 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1346 } 1280 }
1281
1347 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1282 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1348 continue; 1283 return 0;
1349 } 1284 }
1350 1285
1351 found = ar; 1286 found = at;
1352 } 1287 }
1353
1354 /* No match if more more than one archetype matches. */
1355 if (conflict_found)
1356 return NULL;
1357 1288
1358 /* Return if exactly one archetype matches. */ 1289 /* Return if exactly one archetype matches. */
1359 if (found != NULL) 1290 if (found)
1360 return arch_to_object (found); 1291 return found->instance ();
1361
1362 /* No full match found: now check for partial matches. */
1363 spell_name_length = strlen (spell_name);
1364 conflict_found = 0;
1365 found = NULL;
1366 for (ar = first_archetype; ar != NULL; ar = ar->next)
1367 {
1368 if (ar->clone.type != SPELL)
1369 continue;
1370
1371 if (strncmp (ar->name, "spelldirect_", 12) == 0)
1372 continue;
1373
1374 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0)
1375 continue;
1376
1377 if (found != NULL)
1378 {
1379 if (!conflict_found)
1380 {
1381 conflict_found = 1;
1382 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1383 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name);
1384 }
1385 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name);
1386 continue;
1387 }
1388
1389 found = ar;
1390 }
1391
1392 /* No match if more more than one archetype matches. */
1393 if (conflict_found)
1394 return NULL;
1395
1396 /* Return if exactly one archetype matches. */
1397 if (found != NULL)
1398 return arch_to_object (found);
1399 1292
1400 /* No spell found: just print an error message. */ 1293 /* No spell found: just print an error message. */
1401 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
1402 return NULL; 1296 return 0;
1403} 1297}
1404 1298
1405static int 1299static int
1406command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1300command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1407{ 1301{
… …
1459 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);
1460 return 0; 1354 return 0;
1461 } 1355 }
1462 1356
1463 do_forget_spell (op, spell->name); 1357 do_forget_spell (op, spell->name);
1464 return 1;
1465}
1466
1467/**
1468 * Lists all plugins currently loaded with their IDs and full names.
1469 */
1470int
1471command_listplugins (object *op, char *params)
1472{
1473 plugins_display_list (op);
1474 return 1;
1475}
1476
1477/**
1478 * Loads the given plugin. The DM specifies the name of the library to load (no
1479 * pathname is needed). Do not ever attempt to load the same plugin more than
1480 * once at a time, or bad things could happen.
1481 */
1482int
1483command_loadplugin (object *op, char *params)
1484{
1485 char buf[MAX_BUF];
1486
1487 if (params == NULL)
1488 {
1489 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1490 return 1;
1491 }
1492
1493 strcpy (buf, LIBDIR);
1494 strcat (buf, "/plugins/");
1495 strcat (buf, params);
1496 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1497 if (plugins_init_plugin (buf) == 0)
1498 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1499 else
1500 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1501 return 1;
1502}
1503
1504/**
1505 * Unloads the given plugin. The DM specified the ID of the library to unload.
1506 * Note that some things may behave strangely if the correct plugins are not
1507 * loaded.
1508 */
1509int
1510command_unloadplugin (object *op, char *params)
1511{
1512 if (params == NULL)
1513 {
1514 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1515 return 1;
1516 }
1517
1518 if (plugins_remove_plugin (params) == 0)
1519 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1520 else
1521 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1522 return 1; 1358 return 1;
1523} 1359}
1524 1360
1525/** 1361/**
1526 * A players wants to become DM and hide. 1362 * A players wants to become DM and hide.
… …
1534 return 0; 1370 return 0;
1535 1371
1536 do_wizard_hide (op, 1); 1372 do_wizard_hide (op, 1);
1537 1373
1538 return 1; 1374 return 1;
1539}
1540
1541void
1542dm_stack_pop (player *pl)
1543{
1544 if (!pl->stack_items || !pl->stack_position)
1545 {
1546 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1547 return;
1548 }
1549
1550 pl->stack_position--;
1551 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1552}
1553
1554/**
1555 * Get current stack top item for player.
1556 * Returns NULL if no stacked item.
1557 * If stacked item disappeared (freed), remove it.
1558 *
1559 * Ryo, august 2004
1560 */
1561object *
1562dm_stack_peek (player *pl)
1563{
1564 object *ob;
1565
1566 if (!pl->stack_position)
1567 {
1568 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1569 return NULL;
1570 }
1571
1572 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1573 if (!ob)
1574 {
1575 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1576 dm_stack_pop (pl);
1577 return NULL;
1578 }
1579
1580 return ob;
1581}
1582
1583/**
1584 * Push specified item on player stack.
1585 * Inform player of position.
1586 * Initializes variables if needed.
1587 */
1588void
1589dm_stack_push (player *pl, tag_t item)
1590{
1591 if (!pl->stack_items)
1592 {
1593 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1594 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1595 }
1596
1597 if (pl->stack_position == STACK_SIZE)
1598 {
1599 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1600 return;
1601 }
1602
1603 pl->stack_items[pl->stack_position] = item;
1604 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1605 pl->stack_position++;
1606}
1607
1608/**
1609 * Checks 'params' for object code.
1610 *
1611 * Can be:
1612 * * empty => get current object stack top for player
1613 * * number => get item with that tag, stack it for future use
1614 * * $number => get specified stack item
1615 * * "me" => player himself
1616 *
1617 * At function exit, params points to first non-object char
1618 *
1619 * 'from', if not NULL, contains at exit:
1620 * * STACK_FROM_NONE => object not found
1621 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1622 * * STACK_FROM_STACK => item from somewhere in the stack
1623 * * STACK_FROM_NUMBER => item by number, pushed on stack
1624 *
1625 * Ryo, august 2004
1626 */
1627object *
1628get_dm_object (player *pl, char **params, int *from)
1629{
1630 int item_tag, item_position;
1631 object *ob;
1632
1633 if (!pl)
1634 return NULL;
1635
1636 if (!params || !*params || **params == '\0')
1637 {
1638 if (from)
1639 *from = STACK_FROM_TOP;
1640 /* No parameter => get stack item */
1641 return dm_stack_peek (pl);
1642 }
1643
1644 /* Let's clean white spaces */
1645 while (**params == ' ')
1646 (*params)++;
1647
1648 /* Next case: number => item tag */
1649 if (sscanf (*params, "%d", &item_tag))
1650 {
1651 /* Move parameter to next item */
1652 while (isdigit (**params))
1653 (*params)++;
1654
1655 /* And skip blanks, too */
1656 while (**params == ' ')
1657 (*params)++;
1658
1659 /* Get item */
1660 ob = find_object (item_tag);
1661 if (!ob)
1662 {
1663 if (from)
1664 *from = STACK_FROM_NONE;
1665 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1666 return NULL;
1667 }
1668
1669 /* Got one, let's push it on stack */
1670 dm_stack_push (pl, item_tag);
1671 if (from)
1672 *from = STACK_FROM_NUMBER;
1673 return ob;
1674 }
1675
1676 /* Next case: $number => stack item */
1677 if (sscanf (*params, "$%d", &item_position))
1678 {
1679 /* Move parameter to next item */
1680 (*params)++;
1681
1682 while (isdigit (**params))
1683 (*params)++;
1684 while (**params == ' ')
1685 (*params)++;
1686
1687 if (item_position >= pl->stack_position)
1688 {
1689 if (from)
1690 *from = STACK_FROM_NONE;
1691 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1692 return NULL;
1693 }
1694
1695 ob = find_object (pl->stack_items[item_position]);
1696 if (!ob)
1697 {
1698 if (from)
1699 *from = STACK_FROM_NONE;
1700 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1701 return NULL;
1702 }
1703
1704 if (from)
1705 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1706 return ob;
1707 }
1708
1709 /* Next case: 'me' => return pl->ob */
1710 if (!strncmp (*params, "me", 2))
1711 {
1712 if (from)
1713 *from = STACK_FROM_NUMBER;
1714 dm_stack_push (pl, pl->ob->count);
1715
1716 /* Skip to next token */
1717 (*params) += 2;
1718 while (**params == ' ')
1719 (*params)++;
1720
1721 return pl->ob;
1722 }
1723
1724 /* Last case: get stack top */
1725 if (from)
1726 *from = STACK_FROM_TOP;
1727 return dm_stack_peek (pl);
1728} 1375}
1729 1376
1730/** 1377/**
1731 * Pop the stack top. 1378 * Pop the stack top.
1732 */ 1379 */
… …
1792} 1439}
1793 1440
1794int 1441int
1795command_insert_into (object *op, char *params) 1442command_insert_into (object *op, char *params)
1796{ 1443{
1797 object *left, *right, *inserted; 1444 object *left, *right;
1798 int left_from, right_from; 1445 int left_from, right_from;
1799 1446
1800 left = get_dm_object (op->contr, &params, &left_from); 1447 left = get_dm_object (op->contr, &params, &left_from);
1801 if (!left) 1448 if (!left)
1802 { 1449 {
… …
1845 { 1492 {
1846 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!");
1847 return 0; 1494 return 0;
1848 } 1495 }
1849 1496
1850 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1497 if (!right->flag [FLAG_REMOVED])
1851 right->remove (); 1498 right->remove ();
1499
1852 inserted = insert_ob_in_ob (right, left); 1500 object *inserted = insert_ob_in_ob (right, left);
1853 if (left->type == PLAYER)
1854 if (inserted == right)
1855 esrv_send_item (left, right);
1856 else
1857 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1858 1501
1859 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));
1860 1503
1861 return 0; 1504 return 0;
1862 1505

Diff Legend

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