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.29 by root, Fri Jan 5 10:50:47 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 (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
18 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
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 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>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <sproto.h> 26#include <sproto.h>
26#include <spells.h> 27#include <spells.h>
27#include <treasure.h> 28#include <treasure.h>
… …
33/* Values for 'from' field of get_dm_object */ 34/* Values for 'from' field of get_dm_object */
34#define STACK_FROM_NONE 0 /* Item was not found */ 35#define STACK_FROM_NONE 0 /* Item was not found */
35#define STACK_FROM_TOP 1 /* Item is stack top */ 36#define STACK_FROM_TOP 1 /* Item is stack top */
36#define STACK_FROM_STACK 2 /* Item is somewhere in stack */ 37#define STACK_FROM_STACK 2 /* Item is somewhere in stack */
37#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) */
38
39 39
40/** 40/**
41 * 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
42 * it out to a seperate function. name is the person 42 * it out to a seperate function. name is the person
43 * being saught, rq is who is looking for them. This 43 * being saught, rq is who is looking for them. This
… …
70 70
71 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 71 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
72 return 0; 72 return 0;
73} 73}
74 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
75/** 264/**
76 * Actually hides specified player (obviously a DM). 265 * Actually hides specified player (obviously a DM).
77 * 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,
78 * else they just think someone left/entered. 267 * else they just think someone left/entered.
79 */ 268 */
80void 269static void
81do_wizard_hide (object *op, int silent_dm) 270do_wizard_hide (object *op, int silent_dm)
82{ 271{
83 if (op->contr->hidden) 272 if (op->contr->hidden)
84 { 273 {
85 op->contr->hidden = 0; 274 op->contr->hidden = 0;
86 op->invisible = 1; 275 op->invisible = 1;
87 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");
88 op->map->players++; 277 op->map->players++;
89 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
90 if (!silent_dm) 280 if (!silent_dm)
91 {
92 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!");
93 }
94 } 282 }
95 else 283 else
96 { 284 {
97 op->contr->hidden = 1; 285 op->contr->hidden = 1;
98 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.");
99 op->map->players--; 287 op->map->players--;
288
100 if (!silent_dm) 289 if (!silent_dm)
101 {
102 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..");
103 } 291
104 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);
105 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);
106 } 294 }
107} 295}
108 296
… …
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/**
178 * Add player's IP to ban_file and kick them off the server
179 * I know most people have dynamic IPs but this is more of a short term
180 * solution if they have to get a new IP to play maybe they'll calm down.
181 * This uses the banish_file in the local directory *not* the ban_file
182 * The action is logged with a ! for easy searching. -tm
183 */
184int
185command_banish (object *op, char *params)
186{
187 player *pl;
188 FILE *banishfile;
189 char buf[MAX_BUF];
190 time_t now;
191
192 if (!params)
193 {
194 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
195 return 1;
196 }
197
198 pl = get_other_player_from_name (op, params);
199 if (!pl)
200 return 1;
201
202 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
203
204 if ((banishfile = fopen (buf, "a")) == NULL)
205 {
206 LOG (llevDebug, "Could not find file banish_file.\n");
207 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
208 return 0;
209 }
210
211 now = time (NULL);
212 /*
213 * Record this as a comment - then we don't have to worry about changing
214 * the parsing code.
215 */
216 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
217 fprintf (banishfile, "*@%s\n", pl->ns->host);
218 fclose (banishfile);
219
220 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
221 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
222 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
223 command_kick (op, (char *) &pl->ob->name);
224 return 1;
225}
226
227int
228command_kick (object *op, char *params)
229{
230 for_all_players (pl)
231 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
232 {
233 object *op = pl->ob;
234
235 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
236 {
237 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
238 strcpy (op->contr->killer, "kicked");
239 }
240
241 pl->ns->destroy ();
242 }
243
244 return 1;
245}
246
247//TODO
248#if 0
249int
250command_save_overlay (object *op, char *params)
251{
252 if (!op)
253 return 0;
254
255 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
256 {
257 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't force an overlay save.");
258 return 1;
259 }
260
261 new_save_map (op->map, 2);
262 new_save_map (op->map, 0);
263 new_draw_info (NDI_UNIQUE, 0, op, "Current map has been saved as an" " overlay.");
264
265 ready_map_name (op->map->path, 0);
266
267 return 1;
268}
269#endif
270
271int
272command_shutdown (object *op, char *params)
273{
274 if (op && !QUERY_FLAG (op, FLAG_WIZ))
275 {
276 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
277 return 1;
278 }
279
280 cleanup ("dm initiated shutdown", 0);
281
282 /* not reached */
283 return 1; 362 return 1;
284} 363}
285 364
286int 365int
287command_freeze (object *op, char *params) 366command_freeze (object *op, char *params)
… …
344 /* we have nowhere to send the prisoner.... */ 423 /* we have nowhere to send the prisoner.... */
345 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");
346 return 0; 425 return 0;
347 } 426 }
348 427
349 pl->ob->enter_exit (dummy); 428 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
350 dummy->destroy (); 429 dummy->destroy ();
430
351 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.");
352 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 432 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
353 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);
354 return 1; 434 return 1;
355} 435}
356 436
357int 437int
358command_summon (object *op, char *params) 438command_summon (object *op, char *params)
359{ 439{
360 int i; 440 int i;
361 object *dummy;
362 player *pl; 441 player *pl;
363 442
364 if (!op) 443 if (!op)
365 return 0; 444 return 0;
366 445
… …
372 451
373 pl = get_other_player_from_name (op, params); 452 pl = get_other_player_from_name (op, params);
374 if (!pl) 453 if (!pl)
375 return 1; 454 return 1;
376 455
377 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);
378 if (i == -1) 461 if (i == -1)
379 { 462 {
380 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.");
381 return 1; 464 return 1;
382 } 465 }
383 466
384 dummy = object::create (); 467 nx += freearr_x [i];
385 EXIT_PATH (dummy) = op->map->path; 468 ny += freearr_y [i];
386 EXIT_X (dummy) = op->x + freearr_x[i]; 469
387 EXIT_Y (dummy) = op->y + freearr_y[i]; 470 if (!xy_normalise (m, nx, ny))
388 pl->ob->enter_exit (dummy); 471 {
389 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);
390 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 477 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
391 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 478 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
392 479
393 return 1;
394}
395
396/**
397 * Teleport next to target player.
398 */
399
400/* mids 01/16/2002 */
401int
402command_teleport (object *op, char *params)
403{
404 int i;
405 object *dummy;
406 player *pl;
407
408 if (!op)
409 return 0;
410
411 if (params == NULL)
412 {
413 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
414 return 1;
415 }
416
417 pl = get_other_player_from_name (op, params);
418 if (!pl)
419 return 1;
420
421 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
422 if (i == -1)
423 {
424 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
425 return 1;
426 }
427
428 dummy = object::create ();
429 EXIT_PATH (dummy) = pl->ob->map->path;
430 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
431 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
432 op->enter_exit (dummy);
433 dummy->destroy ();
434 if (!op->contr->hidden)
435 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
436 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
437 return 1; 480 return 1;
438} 481}
439 482
440/** 483/**
441 * This function is a real mess, because we're stucking getting 484 * This function is a real mess, because we're stucking getting
… …
455int 498int
456command_create (object *op, char *params) 499command_create (object *op, char *params)
457{ 500{
458 object *tmp = NULL; 501 object *tmp = NULL;
459 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;
460 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline; 503 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *endline;
461 archetype *at, *at_spell = NULL; 504 archetype *at, *at_spell = NULL;
462 artifact *art = NULL; 505 artifact *art = NULL;
463 506
464 if (!op) 507 if (!op)
465 return 0; 508 return 0;
… …
531 * we also set up spell_name which is only 574 * we also set up spell_name which is only
532 * the first word. 575 * the first word.
533 */ 576 */
534 577
535 at_spell = archetype::find (cp); 578 at_spell = archetype::find (cp);
536 if (!at_spell || at_spell->clone.type != SPELL) 579 if (!at_spell || at_spell->type != SPELL)
537 at_spell = find_archetype_by_object_name (cp); 580 at_spell = find_archetype_by_object_name (cp);
538 if (!at_spell || at_spell->clone.type != SPELL) 581 if (!at_spell || at_spell->type != SPELL)
539 { 582 {
540 strcpy (spell_name, cp); 583 assign (spell_name, cp);
541 fsp = strchr (spell_name, ' '); 584 fsp = strchr (spell_name, ' ');
542 if (fsp) 585 if (fsp)
543 { 586 {
544 *fsp = 0; 587 *fsp = 0;
545 fsp++; 588 fsp++;
546 at_spell = archetype::find (spell_name); 589 at_spell = archetype::find (spell_name);
547 590
548 /* Got a spell, update the first string pointer */ 591 /* Got a spell, update the first string pointer */
549 if (at_spell && at_spell->clone.type == SPELL) 592 if (at_spell && at_spell->type == SPELL)
550 bp2 = cp + strlen (spell_name) + 1; 593 bp2 = cp + strlen (spell_name) + 1;
551 else 594 else
552 at_spell = NULL; 595 at_spell = NULL;
553 } 596 }
554 } 597 }
… …
556 /* OK - we didn't find a spell - presume the 'of' 599 /* OK - we didn't find a spell - presume the 'of'
557 * in this case means its an artifact. 600 * in this case means its an artifact.
558 */ 601 */
559 if (!at_spell) 602 if (!at_spell)
560 { 603 {
561 if (find_artifactlist (at->clone.type) == NULL) 604 if (find_artifactlist (at->type) == NULL)
562 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);
563 else 606 else
564 { 607 {
565 art = find_artifactlist (at->clone.type)->items; 608 art = find_artifactlist (at->type)->items;
566 609
567 do 610 while (art)
568 { 611 {
569 if (!strcmp (art->item->name, cp)) 612 if (!strcmp (&art->item->name, cp))
570 break; 613 break;
614
571 art = art->next; 615 art = art->next;
572 } 616 }
573 while (art != NULL);
574 617
575 if (!art) 618 if (!art)
576 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);
577 } 620 }
578 621
579 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);
580 } 623 }
581 } /* if cp */ 624 } /* if cp */
582 625
583 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 626 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
584 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 627 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
585 { 628 {
586 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);
587 return 1; 630 return 1;
588 } 631 }
589 632
590 /* 633 /*
591 * 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,
592 * just create one object, do all the processing, and then determine 635 * just create one object, do all the processing, and then determine
593 * 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.
594 */ 637 */
595 tmp = arch_to_object (at); 638 tmp = at->instance ();
596
597 if (settings.real_wiz == FALSE)
598 SET_FLAG (tmp, FLAG_WAS_WIZ);
599 639
600 if (set_magic) 640 if (set_magic)
601 set_abs_magic (tmp, magic); 641 set_abs_magic (tmp, magic);
602 642
603 if (art) 643 if (art)
604 give_artifact_abilities (tmp, art->item); 644 give_artifact_abilities (tmp, art->item);
605 645
606 if (need_identify (tmp)) 646 if (tmp->need_identify ())
607 { 647 {
608 SET_FLAG (tmp, FLAG_IDENTIFIED); 648 tmp->set_flag (FLAG_IDENTIFIED);
609 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 649 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
610 } 650 }
611 651
612 /* 652 /*
613 * This entire block here tries to find variable pairings, 653 * This entire block here tries to find variable pairings,
614 * 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
… …
616 * 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,
617 * any spaces there don't count. 657 * any spaces there don't count.
618 */ 658 */
619 while (*bp2 && bp2 <= endline) 659 while (*bp2 && bp2 <= endline)
620 { 660 {
621 bp4 = NULL;
622 gotspace = 0; 661 gotspace = 0;
623 gotquote = 0; 662 gotquote = 0;
624 663
625 /* find the first quote */ 664 /* find the first quote */
626 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) 665 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
… …
683 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);
684 723
685 bp2 = bp3 + 1; 724 bp2 = bp3 + 1;
686 } 725 }
687 726
688 if (at->clone.nrof) 727 if (at->nrof)
689 { 728 {
690 if (at_spell) 729 if (at_spell)
691 insert_ob_in_ob (arch_to_object (at_spell), tmp); 730 tmp->insert (at_spell->instance ());
692 731
693 tmp->x = op->x; 732 tmp->x = op->x;
694 tmp->y = op->y; 733 tmp->y = op->y;
734 tmp->map = op->map;
695 735
696 if (set_nrof) 736 if (set_nrof)
697 tmp->nrof = nrof; 737 tmp->nrof = nrof;
698 738
699 tmp->map = op->map; 739 op->insert (tmp);
700
701 tmp = insert_ob_in_ob (tmp, op);
702 esrv_send_item (op, tmp);
703 740
704 /* 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. */
705 dm_stack_push (op->contr, tmp->count); 742 dm_stack_push (op->contr, tmp->count);
706 743
707 return 1; 744 return 1;
708 } 745 }
709 else 746 else
710 { 747 {
711 for (i = 0; i < (set_nrof ? nrof : 1); i++) 748 for (i = 0; i < (set_nrof ? nrof : 1); i++)
712 { 749 {
713 archetype *atmp;
714 object *prev = 0, *head = 0; 750 object *prev = 0, *head = 0;
715 751
716 for (atmp = at; atmp; atmp = atmp->more) 752 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
717 { 753 {
718 object *dup = arch_to_object (atmp); 754 object *dup = atmp->instance ();
719 755
720 if (at_spell) 756 if (at_spell)
721 insert_ob_in_ob (arch_to_object (at_spell), dup); 757 insert_ob_in_ob (at_spell->instance (), dup);
722 758
723 /* 759 /*
724 * The head is what contains all the important bits, 760 * The head is what contains all the important bits,
725 * so just copying it over should be fine. 761 * so just copying it over should be fine.
726 */ 762 */
… …
728 { 764 {
729 head = dup; 765 head = dup;
730 tmp->copy_to (dup); 766 tmp->copy_to (dup);
731 } 767 }
732 768
733 if (settings.real_wiz == FALSE)
734 SET_FLAG (dup, FLAG_WAS_WIZ);
735
736 dup->x = op->x + dup->arch->clone.x; 769 dup->x = op->x + dup->arch->x;
737 dup->y = op->y + dup->arch->clone.y; 770 dup->y = op->y + dup->arch->y;
738 dup->map = op->map; 771 dup->map = op->map;
739 772
740 if (head != dup) 773 if (head != dup)
741 { 774 {
742 dup->head = head; 775 dup->head = head;
… …
744 } 777 }
745 778
746 prev = dup; 779 prev = dup;
747 } 780 }
748 781
749 if (QUERY_FLAG (head, FLAG_ALIVE)) 782 if (head->flag [FLAG_ALIVE])
750 { 783 {
751 object *check = head; 784 object *check = head;
752 int size_x = 0; 785 int size_x = 0;
753 int size_y = 0; 786 int size_y = 0;
754 787
755 while (check) 788 while (check)
756 { 789 {
757 size_x = MAX (size_x, check->arch->clone.x); 790 size_x = max (size_x, check->arch->x);
758 size_y = MAX (size_y, check->arch->clone.y); 791 size_y = max (size_y, check->arch->y);
759 check = check->more; 792 check = check->more;
760 } 793 }
761 794
762 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))
763 { 796 {
… …
789 /* 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
790 * things like rods have nrof 0, we want to cover those. 823 * things like rods have nrof 0, we want to cover those.
791 */ 824 */
792 dm_stack_push (op->contr, head->count); 825 dm_stack_push (op->contr, head->count);
793 826
794 if (at->clone.randomitems != NULL && !at_spell) 827 if (at->randomitems && !at_spell)
795 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 828 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
796
797 esrv_send_item (op, head);
798 } 829 }
799 830
800 /* free the one we used to copy */ 831 /* free the one we used to copy */
801 tmp->destroy (); 832 tmp->destroy ();
802 } 833 }
… …
809 */ 840 */
810 841
811int 842int
812command_inventory (object *op, char *params) 843command_inventory (object *op, char *params)
813{ 844{
845 int i;
814 object *tmp; 846 object *tmp;
815 int i;
816 847
817 if (!params) 848 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
818 { 849 {
819 inventory (op, NULL); 850 op->contr->failmsg ("Inventory of what object (nr)?");
820 return 0; 851 return 1;
821 }
822
823 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
824 { 852 }
825 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
826 return 1;
827 }
828 853
829 inventory (op, tmp); 854 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
855
830 return 1; 856 return 1;
831} 857}
832 858
833/* just show player's their skills for now. Dm's can 859/* just show player's their skills for now. Dm's can
834 * already see skills w/ inventory command - b.t. 860 * already see skills w/ inventory command - b.t.
… …
852 878
853 char *dump = dump_object (tmp); 879 char *dump = dump_object (tmp);
854 new_draw_info (NDI_UNIQUE, 0, op, dump); 880 new_draw_info (NDI_UNIQUE, 0, op, dump);
855 free (dump); 881 free (dump);
856 882
857 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 883 if (tmp->flag [FLAG_OBJ_ORIGINAL])
858 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 884 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
859 885
860 return 1;
861}
862
863/**
864 * When DM is possessing a monster, flip aggression on and off, to allow
865 * better motion.
866 */
867int
868command_mon_aggr (object *op, char *params)
869{
870 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
871 {
872 op->enemy = NULL;
873 SET_FLAG (op, FLAG_UNAGGRESSIVE);
874 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
875 }
876 else
877 {
878 CLEAR_FLAG (op, FLAG_FRIENDLY);
879 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
880 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
881 }
882
883 return 1;
884}
885
886/** DM can possess a monster. Basically, this tricks the client into thinking
887 * a given monster, is actually the player it controls. This allows a DM
888 * to inhabit a monster's body, and run around the game with it.
889 * This function is severely broken - it has tons of hardcoded values,
890 */
891int
892command_possess (object *op, char *params)
893{
894 object *victim, *curinv, *nextinv;
895 player *pl;
896 int i;
897 char buf[MAX_BUF];
898
899 victim = NULL;
900 if (params != NULL)
901 {
902 if (sscanf (params, "%d", &i))
903 victim = find_object (i);
904 else if (sscanf (params, "%s", buf))
905 victim = find_object_name (buf);
906 }
907 if (victim == NULL)
908 {
909 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
910 return 1;
911 }
912
913 if (victim == op)
914 {
915 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
916 return 1;
917 }
918
919 /* clear out the old inventory */
920 curinv = op->inv;
921 while (curinv != NULL)
922 {
923 nextinv = curinv->below;
924 esrv_del_item (op->contr, curinv->count);
925 curinv = nextinv;
926 }
927
928 /* make the switch */
929 pl = op->contr;
930 victim->contr = pl;
931 pl->ob = victim;
932 victim->type = PLAYER;
933 SET_FLAG (victim, FLAG_WIZ);
934
935 /* send the inventory to the client */
936 curinv = victim->inv;
937 while (curinv != NULL)
938 {
939 nextinv = curinv->below;
940 esrv_send_item (victim, curinv);
941 curinv = nextinv;
942 }
943 /* basic patchup */
944 /* The use of hard coded values is terrible. Note
945 * that really, to be fair, this shouldn't get changed at
946 * all - if you are possessing a kobold, you should have the
947 * same limitations. As it is, as more body locations are added,
948 * this will give this player more locations than perhaps
949 * they should be allowed.
950 */
951 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
952 if (i == 1 || i == 6 || i == 8 || i == 9)
953 victim->body_info[i] = 2;
954 else
955 victim->body_info[i] = 1;
956
957 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
958 esrv_send_inventory (victim, victim);
959
960 victim->update_stats ();
961
962 do_some_living (victim);
963 return 1; 886 return 1;
964} 887}
965 888
966int 889int
967command_patch (object *op, char *params) 890command_patch (object *op, char *params)
… …
982 return 1; 905 return 1;
983 } 906 }
984 907
985 if ((arg2 = strchr (arg, ' '))) 908 if ((arg2 = strchr (arg, ' ')))
986 arg2++; 909 arg2++;
987 if (settings.real_wiz == FALSE) 910
988 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
989 if (set_variable (tmp, arg) == -1) 911 if (set_variable (tmp, arg) == -1)
990 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);
991 else 913 else
992 {
993 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);
994 }
995 915
996 return 1; 916 return 1;
997} 917}
998 918
999int 919int
… …
1013 { 933 {
1014 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!");
1015 return 1; 935 return 1;
1016 } 936 }
1017 937
1018 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 938 if (tmp->flag [FLAG_REMOVED])
1019 { 939 {
1020 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));
1021 return 1; 941 return 1;
1022 } 942 }
1023 943
… …
1048 968
1049 if (from != STACK_FROM_STACK) 969 if (from != STACK_FROM_STACK)
1050 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 970 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1051 dm_stack_pop (op->contr); 971 dm_stack_pop (op->contr);
1052 972
1053 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1054 {
1055 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1056 tmp->remove ();
1057 }
1058
1059 if (tmp->head) 973 if (tmp->head)
1060 tmp = tmp->head; 974 tmp = tmp->head;
1061 975
1062 tmp->destroy (); 976 tmp->destroy ();
1063 return 1; 977 return 1;
… …
1068 */ 982 */
1069int 983int
1070command_addexp (object *op, char *params) 984command_addexp (object *op, char *params)
1071{ 985{
1072 char buf[MAX_BUF], skill[MAX_BUF]; 986 char buf[MAX_BUF], skill[MAX_BUF];
1073 int i, q; 987 int q;
988 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1074 object *skillob = NULL; 989 object *skillob = NULL;
1075 990
1076 skill[0] = '\0'; 991 skill[0] = '\0';
1077 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))
1078 { 993 {
1079 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>].");
1080 return 1; 995 return 1;
1081 } 996 }
1082 997
… …
1100 1015
1101 pl->ob->stats.exp += i; 1016 pl->ob->stats.exp += i;
1102 calc_perm_exp (pl->ob); 1017 calc_perm_exp (pl->ob);
1103 player_lvl_adj (pl->ob, NULL); 1018 player_lvl_adj (pl->ob, NULL);
1104 1019
1105 if (settings.real_wiz == FALSE)
1106 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1107
1108 return 1; 1020 return 1;
1109 } 1021 }
1110 1022
1111 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1023 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1112 return 1; 1024 return 1;
… …
1121/**************************************************************************/ 1033/**************************************************************************/
1122 1034
1123int 1035int
1124command_stats (object *op, char *params) 1036command_stats (object *op, char *params)
1125{ 1037{
1126 char thing[20];
1127 char buf[MAX_BUF]; 1038 char buf[MAX_BUF];
1128 1039
1129 thing[0] = '\0'; 1040 if (params == NULL || params[0] == '\0')
1130 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1131 { 1041 {
1132 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1042 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1133 return 1; 1043 return 1;
1134 } 1044 }
1135 1045
1136 for_all_players (pl) 1046 for_all_players (pl)
1137 if (!strcmp (pl->ob->name, thing)) 1047 if (!strcmp (&pl->ob->name, params))
1138 { 1048 {
1139 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);
1140 new_draw_info (NDI_UNIQUE, 0, op, buf); 1050 new_draw_info (NDI_UNIQUE, 0, op, buf);
1141 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);
1142 new_draw_info (NDI_UNIQUE, 0, op, buf); 1052 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
1160int 1070int
1161command_abil (object *op, char *params) 1071command_abil (object *op, char *params)
1162{ 1072{
1163 char thing[20], thing2[20]; 1073 char thing[20], thing2[20];
1164 int iii; 1074 int iii;
1165 player *pl;
1166 char buf[MAX_BUF]; 1075 char buf[MAX_BUF];
1167 1076
1168 iii = 0; 1077 iii = 0;
1169 thing[0] = '\0'; 1078 thing[0] = '\0';
1170 thing2[0] = '\0'; 1079 thing2[0] = '\0';
… …
1186 return 1; 1095 return 1;
1187 } 1096 }
1188 1097
1189 for_all_players (pl) 1098 for_all_players (pl)
1190 { 1099 {
1191 if (!strcmp (pl->ob->name, thing)) 1100 if (!strcmp (&pl->ob->name, thing))
1192 { 1101 {
1193 if (settings.real_wiz == FALSE)
1194 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1195 if (!strcmp ("str", thing2))
1196 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;
1197 if (!strcmp ("dex", thing2))
1198 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;
1199 if (!strcmp ("con", thing2))
1200 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;
1201 if (!strcmp ("wis", thing2))
1202 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;
1203 if (!strcmp ("cha", thing2))
1204 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;
1205 if (!strcmp ("int", thing2))
1206 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;
1207 if (!strcmp ("pow", thing2))
1208 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
1209 sprintf (buf, "%s has been altered.", &pl->ob->name); 1110 sprintf (buf, "%s has been altered.", &pl->ob->name);
1210 new_draw_info (NDI_UNIQUE, 0, op, buf); 1111 new_draw_info (NDI_UNIQUE, 0, op, buf);
1211 pl->ob->update_stats (); 1112 pl->ob->update_stats ();
1212 return 1; 1113 return 1;
1213 } 1114 }
… …
1217 return 1; 1118 return 1;
1218} 1119}
1219 1120
1220int 1121int
1221command_nowiz (object *op, char *params) 1122command_nowiz (object *op, char *params)
1222{ /* 'noadm' is alias */ 1123{ /* 'nodm' is alias */
1223 CLEAR_FLAG (op, FLAG_WIZ); 1124 op->clr_flag (FLAG_WIZ);
1224 CLEAR_FLAG (op, FLAG_WIZPASS); 1125 op->clr_flag (FLAG_WIZPASS);
1225 CLEAR_FLAG (op, FLAG_WIZCAST); 1126 op->clr_flag (FLAG_WIZCAST);
1127 op->clr_flag (FLAG_WIZLOOK);
1128 op->contr->do_los = 1;
1226 1129
1227 if (settings.real_wiz == TRUE)
1228 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1229 if (op->contr->hidden) 1130 if (op->contr->hidden)
1230 { 1131 {
1231 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");
1232 op->map->players++; 1133 op->map->players++;
1233 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);
1234 op->contr->hidden = 0; 1135 op->contr->hidden = 0;
1235 op->invisible = 1; 1136 op->invisible = 1;
1236 } 1137 }
1237 else 1138 else
1238 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
1239 return 1; 1141 return 1;
1240} 1142}
1241 1143
1242/** 1144/**
1243 * object *op is trying to become dm. 1145 * object *op is trying to become dm.
… …
1280 } 1182 }
1281 fclose (dmfile); 1183 fclose (dmfile);
1282 return (0); 1184 return (0);
1283} 1185}
1284 1186
1285int 1187static int
1286do_wizard_dm (object *op, char *params, int silent) 1188do_wizard_dm (object *op, char *params, int silent)
1287{ 1189{
1288 if (!op->contr) 1190 if (!op->contr)
1289 return 0; 1191 return 0;
1290 1192
1291 if (QUERY_FLAG (op, FLAG_WIZ)) 1193 if (op->flag [FLAG_WIZ])
1292 { 1194 {
1293 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!");
1294 return 0; 1196 return 0;
1295 } 1197 }
1296 1198
1297 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1199 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1298 { 1200 {
1299 SET_FLAG (op, FLAG_WIZ); 1201 op->set_flag (FLAG_WIZ);
1300 SET_FLAG (op, FLAG_WAS_WIZ); 1202 op->set_flag (FLAG_WIZPASS);
1301 SET_FLAG (op, FLAG_WIZPASS); 1203 op->set_flag (FLAG_WIZCAST);
1302 SET_FLAG (op, FLAG_WIZCAST); 1204 op->set_flag (FLAG_WIZLOOK);
1205 op->contr->do_los = 1;
1206
1303 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!");
1304 /*
1305 * Remove setting flying here - that won't work, because next
1306 * fix_player() is called that will get cleared - proper solution
1307 * is probably something like a wiz_force which gives that and any
1308 * other desired abilities.
1309 */
1310 clear_los (op);
1311 op->contr->write_buf[0] = '\0'; 1208 op->contr->write_buf[0] = '\0';
1312 1209
1313 if (!silent) 1210 if (!silent)
1314 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!");
1315 1212
… …
1342command_invisible (object *op, char *params) 1239command_invisible (object *op, char *params)
1343{ 1240{
1344 if (op) 1241 if (op)
1345 { 1242 {
1346 op->invisible += 100; 1243 op->invisible += 100;
1347 update_object (op, UP_OBJ_FACE); 1244 update_object (op, UP_OBJ_CHANGE);
1348 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1245 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1349 } 1246 }
1350 1247
1351 return 0; 1248 return 0;
1352} 1249}
… …
1355 * Returns spell object (from archetypes) by name. 1252 * Returns spell object (from archetypes) by name.
1356 * Returns NULL if 0 or more than one spell matches. 1253 * Returns NULL if 0 or more than one spell matches.
1357 * Used for wizard's learn spell/prayer. 1254 * Used for wizard's learn spell/prayer.
1358 * 1255 *
1359 * op is the player issuing the command. 1256 * op is the player issuing the command.
1360 *
1361 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1362 * anymore (but may still be present in some player's inventories and thus
1363 * cannot be removed). We have to ignore them here since they have the same
1364 * name than other "spell_xxx" archetypes and would always conflict.
1365 */ 1257 */
1366static object * 1258static object *
1367get_spell_by_name (object *op, const char *spell_name) 1259get_spell_by_name (object *op, shstr_cmp spell_name)
1368{ 1260{
1369 archetype *ar;
1370 archetype *found;
1371 int conflict_found;
1372 size_t spell_name_length;
1373
1374 /* First check for full name matches. */ 1261 /* First check for full name matches. */
1375 conflict_found = 0; 1262 int conflict_found = 0;
1376 found = NULL; 1263 archetype *found = 0;
1377 for (ar = first_archetype; ar != NULL; ar = ar->next) 1264
1265 for_all_archetypes (at)
1378 { 1266 {
1379 if (ar->clone.type != SPELL) 1267 if (at->type != SPELL)
1380 continue; 1268 continue;
1381 1269
1382 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1270 if (at->object::name != spell_name)
1383 continue; 1271 continue;
1384 1272
1385 if (strcmp (ar->clone.name, spell_name) != 0)
1386 continue;
1387
1388 if (found != NULL) 1273 if (found)
1389 { 1274 {
1390 if (!conflict_found) 1275 if (!conflict_found)
1391 { 1276 {
1392 conflict_found = 1; 1277 conflict_found = 1;
1393 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);
1394 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1279 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1395 } 1280 }
1281
1396 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1282 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1397 continue; 1283 return 0;
1398 } 1284 }
1399 1285
1400 found = ar; 1286 found = at;
1401 } 1287 }
1402
1403 /* No match if more more than one archetype matches. */
1404 if (conflict_found)
1405 return NULL;
1406 1288
1407 /* Return if exactly one archetype matches. */ 1289 /* Return if exactly one archetype matches. */
1408 if (found != NULL) 1290 if (found)
1409 return arch_to_object (found); 1291 return found->instance ();
1410
1411 /* No full match found: now check for partial matches. */
1412 spell_name_length = strlen (spell_name);
1413 conflict_found = 0;
1414 found = NULL;
1415 for (ar = first_archetype; ar != NULL; ar = ar->next)
1416 {
1417 if (ar->clone.type != SPELL)
1418 continue;
1419
1420 if (strncmp (ar->name, "spelldirect_", 12) == 0)
1421 continue;
1422
1423 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0)
1424 continue;
1425
1426 if (found != NULL)
1427 {
1428 if (!conflict_found)
1429 {
1430 conflict_found = 1;
1431 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1432 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name);
1433 }
1434 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name);
1435 continue;
1436 }
1437
1438 found = ar;
1439 }
1440
1441 /* No match if more more than one archetype matches. */
1442 if (conflict_found)
1443 return NULL;
1444
1445 /* Return if exactly one archetype matches. */
1446 if (found != NULL)
1447 return arch_to_object (found);
1448 1292
1449 /* No spell found: just print an error message. */ 1293 /* No spell found: just print an error message. */
1450 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
1451 return NULL; 1296 return 0;
1452} 1297}
1453 1298
1454static int 1299static int
1455command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1300command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1456{ 1301{
… …
1500 { 1345 {
1501 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?");
1502 return 0; 1347 return 0;
1503 } 1348 }
1504 1349
1505 spell = lookup_spell_by_name (op, params); 1350 spell = op->find_spell (params);
1506 if (spell == NULL) 1351 if (spell == NULL)
1507 { 1352 {
1508 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);
1509 return 0; 1354 return 0;
1510 } 1355 }
1511 1356
1512 do_forget_spell (op, spell->name); 1357 do_forget_spell (op, spell->name);
1513 return 1;
1514}
1515
1516/**
1517 * Lists all plugins currently loaded with their IDs and full names.
1518 */
1519int
1520command_listplugins (object *op, char *params)
1521{
1522 plugins_display_list (op);
1523 return 1;
1524}
1525
1526/**
1527 * Loads the given plugin. The DM specifies the name of the library to load (no
1528 * pathname is needed). Do not ever attempt to load the same plugin more than
1529 * once at a time, or bad things could happen.
1530 */
1531int
1532command_loadplugin (object *op, char *params)
1533{
1534 char buf[MAX_BUF];
1535
1536 if (params == NULL)
1537 {
1538 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1539 return 1;
1540 }
1541
1542 strcpy (buf, LIBDIR);
1543 strcat (buf, "/plugins/");
1544 strcat (buf, params);
1545 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1546 if (plugins_init_plugin (buf) == 0)
1547 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1548 else
1549 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1550 return 1;
1551}
1552
1553/**
1554 * Unloads the given plugin. The DM specified the ID of the library to unload.
1555 * Note that some things may behave strangely if the correct plugins are not
1556 * loaded.
1557 */
1558int
1559command_unloadplugin (object *op, char *params)
1560{
1561 if (params == NULL)
1562 {
1563 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1564 return 1;
1565 }
1566
1567 if (plugins_remove_plugin (params) == 0)
1568 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1569 else
1570 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1571 return 1; 1358 return 1;
1572} 1359}
1573 1360
1574/** 1361/**
1575 * A players wants to become DM and hide. 1362 * A players wants to become DM and hide.
… …
1583 return 0; 1370 return 0;
1584 1371
1585 do_wizard_hide (op, 1); 1372 do_wizard_hide (op, 1);
1586 1373
1587 return 1; 1374 return 1;
1588}
1589
1590void
1591dm_stack_pop (player *pl)
1592{
1593 if (!pl->stack_items || !pl->stack_position)
1594 {
1595 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1596 return;
1597 }
1598
1599 pl->stack_position--;
1600 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1601}
1602
1603/**
1604 * Get current stack top item for player.
1605 * Returns NULL if no stacked item.
1606 * If stacked item disappeared (freed), remove it.
1607 *
1608 * Ryo, august 2004
1609 */
1610object *
1611dm_stack_peek (player *pl)
1612{
1613 object *ob;
1614
1615 if (!pl->stack_position)
1616 {
1617 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1618 return NULL;
1619 }
1620
1621 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1622 if (!ob)
1623 {
1624 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1625 dm_stack_pop (pl);
1626 return NULL;
1627 }
1628
1629 return ob;
1630}
1631
1632/**
1633 * Push specified item on player stack.
1634 * Inform player of position.
1635 * Initializes variables if needed.
1636 */
1637void
1638dm_stack_push (player *pl, tag_t item)
1639{
1640 if (!pl->stack_items)
1641 {
1642 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1643 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1644 }
1645
1646 if (pl->stack_position == STACK_SIZE)
1647 {
1648 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1649 return;
1650 }
1651
1652 pl->stack_items[pl->stack_position] = item;
1653 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1654 pl->stack_position++;
1655}
1656
1657/**
1658 * Checks 'params' for object code.
1659 *
1660 * Can be:
1661 * * empty => get current object stack top for player
1662 * * number => get item with that tag, stack it for future use
1663 * * $number => get specified stack item
1664 * * "me" => player himself
1665 *
1666 * At function exit, params points to first non-object char
1667 *
1668 * 'from', if not NULL, contains at exit:
1669 * * STACK_FROM_NONE => object not found
1670 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1671 * * STACK_FROM_STACK => item from somewhere in the stack
1672 * * STACK_FROM_NUMBER => item by number, pushed on stack
1673 *
1674 * Ryo, august 2004
1675 */
1676object *
1677get_dm_object (player *pl, char **params, int *from)
1678{
1679 int item_tag, item_position;
1680 object *ob;
1681
1682 if (!pl)
1683 return NULL;
1684
1685 if (!params || !*params || **params == '\0')
1686 {
1687 if (from)
1688 *from = STACK_FROM_TOP;
1689 /* No parameter => get stack item */
1690 return dm_stack_peek (pl);
1691 }
1692
1693 /* Let's clean white spaces */
1694 while (**params == ' ')
1695 (*params)++;
1696
1697 /* Next case: number => item tag */
1698 if (sscanf (*params, "%d", &item_tag))
1699 {
1700 /* Move parameter to next item */
1701 while (isdigit (**params))
1702 (*params)++;
1703
1704 /* And skip blanks, too */
1705 while (**params == ' ')
1706 (*params)++;
1707
1708 /* Get item */
1709 ob = find_object (item_tag);
1710 if (!ob)
1711 {
1712 if (from)
1713 *from = STACK_FROM_NONE;
1714 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1715 return NULL;
1716 }
1717
1718 /* Got one, let's push it on stack */
1719 dm_stack_push (pl, item_tag);
1720 if (from)
1721 *from = STACK_FROM_NUMBER;
1722 return ob;
1723 }
1724
1725 /* Next case: $number => stack item */
1726 if (sscanf (*params, "$%d", &item_position))
1727 {
1728 /* Move parameter to next item */
1729 (*params)++;
1730
1731 while (isdigit (**params))
1732 (*params)++;
1733 while (**params == ' ')
1734 (*params)++;
1735
1736 if (item_position >= pl->stack_position)
1737 {
1738 if (from)
1739 *from = STACK_FROM_NONE;
1740 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1741 return NULL;
1742 }
1743
1744 ob = find_object (pl->stack_items[item_position]);
1745 if (!ob)
1746 {
1747 if (from)
1748 *from = STACK_FROM_NONE;
1749 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1750 return NULL;
1751 }
1752
1753 if (from)
1754 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1755 return ob;
1756 }
1757
1758 /* Next case: 'me' => return pl->ob */
1759 if (!strncmp (*params, "me", 2))
1760 {
1761 if (from)
1762 *from = STACK_FROM_NUMBER;
1763 dm_stack_push (pl, pl->ob->count);
1764
1765 /* Skip to next token */
1766 (*params) += 2;
1767 while (**params == ' ')
1768 (*params)++;
1769
1770 return pl->ob;
1771 }
1772
1773 /* Last case: get stack top */
1774 if (from)
1775 *from = STACK_FROM_TOP;
1776 return dm_stack_peek (pl);
1777} 1375}
1778 1376
1779/** 1377/**
1780 * Pop the stack top. 1378 * Pop the stack top.
1781 */ 1379 */
… …
1841} 1439}
1842 1440
1843int 1441int
1844command_insert_into (object *op, char *params) 1442command_insert_into (object *op, char *params)
1845{ 1443{
1846 object *left, *right, *inserted; 1444 object *left, *right;
1847 int left_from, right_from; 1445 int left_from, right_from;
1848 1446
1849 left = get_dm_object (op->contr, &params, &left_from); 1447 left = get_dm_object (op->contr, &params, &left_from);
1850 if (!left) 1448 if (!left)
1851 { 1449 {
… …
1894 { 1492 {
1895 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!");
1896 return 0; 1494 return 0;
1897 } 1495 }
1898 1496
1899 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1497 if (!right->flag [FLAG_REMOVED])
1900 right->remove (); 1498 right->remove ();
1499
1901 inserted = insert_ob_in_ob (right, left); 1500 object *inserted = insert_ob_in_ob (right, left);
1902 if (left->type == PLAYER)
1903 if (inserted == right)
1904 esrv_send_item (left, right);
1905 else
1906 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1907 1501
1908 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));
1909 1503
1910 return 0; 1504 return 0;
1911 1505

Diff Legend

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