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.27 by root, Sat Dec 23 13:56:25 2006 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#ifndef __CEXTRACT__
26# include <sproto.h> 26#include <sproto.h>
27#endif
28#include <spells.h> 27#include <spells.h>
29#include <treasure.h> 28#include <treasure.h>
30#include <skills.h> 29#include <skills.h>
31 30
32/** Defines for DM item stack **/ 31/** Defines for DM item stack **/
… …
35/* Values for 'from' field of get_dm_object */ 34/* Values for 'from' field of get_dm_object */
36#define STACK_FROM_NONE 0 /* Item was not found */ 35#define STACK_FROM_NONE 0 /* Item was not found */
37#define STACK_FROM_TOP 1 /* Item is stack top */ 36#define STACK_FROM_TOP 1 /* Item is stack top */
38#define STACK_FROM_STACK 2 /* Item is somewhere in stack */ 37#define STACK_FROM_STACK 2 /* Item is somewhere in stack */
39#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) */
40
41 39
42/** 40/**
43 * 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
44 * it out to a seperate function. name is the person 42 * it out to a seperate function. name is the person
45 * being saught, rq is who is looking for them. This 43 * being saught, rq is who is looking for them. This
… …
72 70
73 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 71 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
74 return 0; 72 return 0;
75} 73}
76 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
77/** 264/**
78 * Actually hides specified player (obviously a DM). 265 * Actually hides specified player (obviously a DM).
79 * 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,
80 * else they just think someone left/entered. 267 * else they just think someone left/entered.
81 */ 268 */
82void 269static void
83do_wizard_hide (object *op, int silent_dm) 270do_wizard_hide (object *op, int silent_dm)
84{ 271{
85 if (op->contr->hidden) 272 if (op->contr->hidden)
86 { 273 {
87 op->contr->hidden = 0; 274 op->contr->hidden = 0;
88 op->invisible = 1; 275 op->invisible = 1;
89 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");
90 op->map->players++; 277 op->map->players++;
91 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
92 if (!silent_dm) 280 if (!silent_dm)
93 {
94 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!");
95 }
96 } 282 }
97 else 283 else
98 { 284 {
99 op->contr->hidden = 1; 285 op->contr->hidden = 1;
100 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.");
101 op->map->players--; 287 op->map->players--;
288
102 if (!silent_dm) 289 if (!silent_dm)
103 {
104 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..");
105 } 291
106 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);
107 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);
108 } 294 }
109} 295}
110 296
… …
170 { 356 {
171 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);
172 return 1; 358 return 1;
173 } 359 }
174 360
175 become_follower (ob, god); 361 ob->become_follower (god);
176 return 1;
177}
178
179/**
180 * Add player's IP to ban_file and kick them off the server
181 * I know most people have dynamic IPs but this is more of a short term
182 * solution if they have to get a new IP to play maybe they'll calm down.
183 * This uses the banish_file in the local directory *not* the ban_file
184 * The action is logged with a ! for easy searching. -tm
185 */
186int
187command_banish (object *op, char *params)
188{
189 player *pl;
190 FILE *banishfile;
191 char buf[MAX_BUF];
192 time_t now;
193
194 if (!params)
195 {
196 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
197 return 1;
198 }
199
200 pl = get_other_player_from_name (op, params);
201 if (!pl)
202 return 1;
203
204 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
205
206 if ((banishfile = fopen (buf, "a")) == NULL)
207 {
208 LOG (llevDebug, "Could not find file banish_file.\n");
209 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
210 return 0;
211 }
212
213 now = time (NULL);
214 /*
215 * Record this as a comment - then we don't have to worry about changing
216 * the parsing code.
217 */
218 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
219 fprintf (banishfile, "*@%s\n", pl->ns->host);
220 fclose (banishfile);
221
222 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
223 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
224 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
225 command_kick (op, (char *) &pl->ob->name);
226 return 1;
227}
228
229int
230command_kick (object *op, char *params)
231{
232 for_all_players (pl)
233 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
234 {
235 object *op = pl->ob;
236
237 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
238 {
239 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
240 strcpy (op->contr->killer, "kicked");
241 }
242
243 pl->ns->destroy ();
244 }
245
246 return 1;
247}
248
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
270int
271command_shutdown (object *op, char *params)
272{
273 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
274 {
275 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
276 return 1;
277 }
278
279 cleanup ();
280 /* not reached */
281 return 1; 362 return 1;
282} 363}
283 364
284int 365int
285command_freeze (object *op, char *params) 366command_freeze (object *op, char *params)
… …
323 object *dummy; 404 object *dummy;
324 player *pl; 405 player *pl;
325 406
326 if (!op) 407 if (!op)
327 return 0; 408 return 0;
409
328 if (params == NULL) 410 if (params == NULL)
329 { 411 {
330 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 412 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
331 return 1; 413 return 1;
332 } 414 }
415
333 pl = get_other_player_from_name (op, params); 416 pl = get_other_player_from_name (op, params);
334 if (!pl) 417 if (!pl)
335 return 1; 418 return 1;
419
336 dummy = get_jail_exit (pl->ob); 420 dummy = get_jail_exit (pl->ob);
337 if (!dummy) 421 if (!dummy)
338 { 422 {
339 /* we have nowhere to send the prisoner.... */ 423 /* we have nowhere to send the prisoner.... */
340 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");
341 return 0; 425 return 0;
342 } 426 }
343 enter_exit (pl->ob, dummy); 427
428 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
344 dummy->destroy (); 429 dummy->destroy ();
430
345 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.");
346 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 432 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
347 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);
348 return 1; 434 return 1;
349} 435}
350 436
351int 437int
352command_summon (object *op, char *params) 438command_summon (object *op, char *params)
353{ 439{
354 int i; 440 int i;
355 object *dummy;
356 player *pl; 441 player *pl;
357 442
358 if (!op) 443 if (!op)
359 return 0; 444 return 0;
360 445
… …
366 451
367 pl = get_other_player_from_name (op, params); 452 pl = get_other_player_from_name (op, params);
368 if (!pl) 453 if (!pl)
369 return 1; 454 return 1;
370 455
371 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);
372 if (i == -1) 461 if (i == -1)
373 { 462 {
374 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.");
375 return 1; 464 return 1;
376 } 465 }
377 466
378 dummy = object::create (); 467 nx += freearr_x [i];
379 EXIT_PATH (dummy) = op->map->path; 468 ny += freearr_y [i];
380 EXIT_X (dummy) = op->x + freearr_x[i]; 469
381 EXIT_Y (dummy) = op->y + freearr_y[i]; 470 if (!xy_normalise (m, nx, ny))
382 enter_exit (pl->ob, dummy); 471 {
383 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);
384 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 477 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
385 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 478 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
386 479
387 return 1;
388}
389
390/**
391 * Teleport next to target player.
392 */
393
394/* mids 01/16/2002 */
395int
396command_teleport (object *op, char *params)
397{
398 int i;
399 object *dummy;
400 player *pl;
401
402 if (!op)
403 return 0;
404
405 if (params == NULL)
406 {
407 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
408 return 1;
409 }
410
411 pl = get_other_player_from_name (op, params);
412 if (!pl)
413 return 1;
414
415 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
416 if (i == -1)
417 {
418 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
419 return 1;
420 }
421
422 dummy = object::create ();
423 EXIT_PATH (dummy) = pl->ob->map->path;
424 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
425 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
426 enter_exit (op, dummy);
427 dummy->destroy ();
428 if (!op->contr->hidden)
429 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
430 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
431 return 1; 480 return 1;
432} 481}
433 482
434/** 483/**
435 * This function is a real mess, because we're stucking getting 484 * This function is a real mess, because we're stucking getting
… …
449int 498int
450command_create (object *op, char *params) 499command_create (object *op, char *params)
451{ 500{
452 object *tmp = NULL; 501 object *tmp = NULL;
453 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;
454 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline; 503 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *endline;
455 archetype *at, *at_spell = NULL; 504 archetype *at, *at_spell = NULL;
456 artifact *art = NULL; 505 artifact *art = NULL;
457 506
458 if (!op) 507 if (!op)
459 return 0; 508 return 0;
… …
525 * we also set up spell_name which is only 574 * we also set up spell_name which is only
526 * the first word. 575 * the first word.
527 */ 576 */
528 577
529 at_spell = archetype::find (cp); 578 at_spell = archetype::find (cp);
530 if (!at_spell || at_spell->clone.type != SPELL) 579 if (!at_spell || at_spell->type != SPELL)
531 at_spell = find_archetype_by_object_name (cp); 580 at_spell = find_archetype_by_object_name (cp);
532 if (!at_spell || at_spell->clone.type != SPELL) 581 if (!at_spell || at_spell->type != SPELL)
533 { 582 {
534 strcpy (spell_name, cp); 583 assign (spell_name, cp);
535 fsp = strchr (spell_name, ' '); 584 fsp = strchr (spell_name, ' ');
536 if (fsp) 585 if (fsp)
537 { 586 {
538 *fsp = 0; 587 *fsp = 0;
539 fsp++; 588 fsp++;
540 at_spell = archetype::find (spell_name); 589 at_spell = archetype::find (spell_name);
541 590
542 /* Got a spell, update the first string pointer */ 591 /* Got a spell, update the first string pointer */
543 if (at_spell && at_spell->clone.type == SPELL) 592 if (at_spell && at_spell->type == SPELL)
544 bp2 = cp + strlen (spell_name) + 1; 593 bp2 = cp + strlen (spell_name) + 1;
545 else 594 else
546 at_spell = NULL; 595 at_spell = NULL;
547 } 596 }
548 } 597 }
… …
550 /* OK - we didn't find a spell - presume the 'of' 599 /* OK - we didn't find a spell - presume the 'of'
551 * in this case means its an artifact. 600 * in this case means its an artifact.
552 */ 601 */
553 if (!at_spell) 602 if (!at_spell)
554 { 603 {
555 if (find_artifactlist (at->clone.type) == NULL) 604 if (find_artifactlist (at->type) == NULL)
556 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);
557 else 606 else
558 { 607 {
559 art = find_artifactlist (at->clone.type)->items; 608 art = find_artifactlist (at->type)->items;
560 609
561 do 610 while (art)
562 { 611 {
563 if (!strcmp (art->item->name, cp)) 612 if (!strcmp (&art->item->name, cp))
564 break; 613 break;
614
565 art = art->next; 615 art = art->next;
566 } 616 }
567 while (art != NULL);
568 617
569 if (!art) 618 if (!art)
570 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);
571 } 620 }
572 621
573 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);
574 } 623 }
575 } /* if cp */ 624 } /* if cp */
576 625
577 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 626 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
578 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 627 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
579 { 628 {
580 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);
581 return 1; 630 return 1;
582 } 631 }
583 632
584 /* 633 /*
585 * 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,
586 * just create one object, do all the processing, and then determine 635 * just create one object, do all the processing, and then determine
587 * 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.
588 */ 637 */
589 tmp = arch_to_object (at); 638 tmp = at->instance ();
590
591 if (settings.real_wiz == FALSE)
592 SET_FLAG (tmp, FLAG_WAS_WIZ);
593 639
594 if (set_magic) 640 if (set_magic)
595 set_abs_magic (tmp, magic); 641 set_abs_magic (tmp, magic);
596 642
597 if (art) 643 if (art)
598 give_artifact_abilities (tmp, art->item); 644 give_artifact_abilities (tmp, art->item);
599 645
600 if (need_identify (tmp)) 646 if (tmp->need_identify ())
601 { 647 {
602 SET_FLAG (tmp, FLAG_IDENTIFIED); 648 tmp->set_flag (FLAG_IDENTIFIED);
603 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 649 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
604 } 650 }
605 651
606 /* 652 /*
607 * This entire block here tries to find variable pairings, 653 * This entire block here tries to find variable pairings,
608 * 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
… …
610 * 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,
611 * any spaces there don't count. 657 * any spaces there don't count.
612 */ 658 */
613 while (*bp2 && bp2 <= endline) 659 while (*bp2 && bp2 <= endline)
614 { 660 {
615 bp4 = NULL;
616 gotspace = 0; 661 gotspace = 0;
617 gotquote = 0; 662 gotquote = 0;
618 663
619 /* find the first quote */ 664 /* find the first quote */
620 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) 665 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
… …
677 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);
678 723
679 bp2 = bp3 + 1; 724 bp2 = bp3 + 1;
680 } 725 }
681 726
682 if (at->clone.nrof) 727 if (at->nrof)
683 { 728 {
684 if (at_spell) 729 if (at_spell)
685 insert_ob_in_ob (arch_to_object (at_spell), tmp); 730 tmp->insert (at_spell->instance ());
686 731
687 tmp->x = op->x; 732 tmp->x = op->x;
688 tmp->y = op->y; 733 tmp->y = op->y;
734 tmp->map = op->map;
689 735
690 if (set_nrof) 736 if (set_nrof)
691 tmp->nrof = nrof; 737 tmp->nrof = nrof;
692 738
693 tmp->map = op->map; 739 op->insert (tmp);
694
695 tmp = insert_ob_in_ob (tmp, op);
696 esrv_send_item (op, tmp);
697 740
698 /* 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. */
699 dm_stack_push (op->contr, tmp->count); 742 dm_stack_push (op->contr, tmp->count);
700 743
701 return 1; 744 return 1;
702 } 745 }
703 else 746 else
704 { 747 {
705 for (i = 0; i < (set_nrof ? nrof : 1); i++) 748 for (i = 0; i < (set_nrof ? nrof : 1); i++)
706 { 749 {
707 archetype *atmp;
708 object *prev = 0, *head = 0; 750 object *prev = 0, *head = 0;
709 751
710 for (atmp = at; atmp; atmp = atmp->more) 752 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
711 { 753 {
712 object *dup = arch_to_object (atmp); 754 object *dup = atmp->instance ();
713 755
714 if (at_spell) 756 if (at_spell)
715 insert_ob_in_ob (arch_to_object (at_spell), dup); 757 insert_ob_in_ob (at_spell->instance (), dup);
716 758
717 /* 759 /*
718 * The head is what contains all the important bits, 760 * The head is what contains all the important bits,
719 * so just copying it over should be fine. 761 * so just copying it over should be fine.
720 */ 762 */
… …
722 { 764 {
723 head = dup; 765 head = dup;
724 tmp->copy_to (dup); 766 tmp->copy_to (dup);
725 } 767 }
726 768
727 if (settings.real_wiz == FALSE)
728 SET_FLAG (dup, FLAG_WAS_WIZ);
729
730 dup->x = op->x + dup->arch->clone.x; 769 dup->x = op->x + dup->arch->x;
731 dup->y = op->y + dup->arch->clone.y; 770 dup->y = op->y + dup->arch->y;
732 dup->map = op->map; 771 dup->map = op->map;
733 772
734 if (head != dup) 773 if (head != dup)
735 { 774 {
736 dup->head = head; 775 dup->head = head;
… …
738 } 777 }
739 778
740 prev = dup; 779 prev = dup;
741 } 780 }
742 781
743 if (QUERY_FLAG (head, FLAG_ALIVE)) 782 if (head->flag [FLAG_ALIVE])
744 { 783 {
745 object *check = head; 784 object *check = head;
746 int size_x = 0; 785 int size_x = 0;
747 int size_y = 0; 786 int size_y = 0;
748 787
749 while (check) 788 while (check)
750 { 789 {
751 size_x = MAX (size_x, check->arch->clone.x); 790 size_x = max (size_x, check->arch->x);
752 size_y = MAX (size_y, check->arch->clone.y); 791 size_y = max (size_y, check->arch->y);
753 check = check->more; 792 check = check->more;
754 } 793 }
755 794
756 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))
757 { 796 {
… …
783 /* 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
784 * things like rods have nrof 0, we want to cover those. 823 * things like rods have nrof 0, we want to cover those.
785 */ 824 */
786 dm_stack_push (op->contr, head->count); 825 dm_stack_push (op->contr, head->count);
787 826
788 if (at->clone.randomitems != NULL && !at_spell) 827 if (at->randomitems && !at_spell)
789 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 828 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
790
791 esrv_send_item (op, head);
792 } 829 }
793 830
794 /* free the one we used to copy */ 831 /* free the one we used to copy */
795 tmp->destroy (); 832 tmp->destroy ();
796 } 833 }
… …
803 */ 840 */
804 841
805int 842int
806command_inventory (object *op, char *params) 843command_inventory (object *op, char *params)
807{ 844{
845 int i;
808 object *tmp; 846 object *tmp;
809 int i;
810 847
811 if (!params) 848 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
812 { 849 {
813 inventory (op, NULL); 850 op->contr->failmsg ("Inventory of what object (nr)?");
814 return 0; 851 return 1;
815 }
816
817 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
818 { 852 }
819 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
820 return 1;
821 }
822 853
823 inventory (op, tmp); 854 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
855
824 return 1; 856 return 1;
825} 857}
826 858
827/* just show player's their skills for now. Dm's can 859/* just show player's their skills for now. Dm's can
828 * already see skills w/ inventory command - b.t. 860 * already see skills w/ inventory command - b.t.
… …
846 878
847 char *dump = dump_object (tmp); 879 char *dump = dump_object (tmp);
848 new_draw_info (NDI_UNIQUE, 0, op, dump); 880 new_draw_info (NDI_UNIQUE, 0, op, dump);
849 free (dump); 881 free (dump);
850 882
851 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 883 if (tmp->flag [FLAG_OBJ_ORIGINAL])
852 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 884 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
853 885
854 return 1;
855}
856
857/**
858 * When DM is possessing a monster, flip aggression on and off, to allow
859 * better motion.
860 */
861int
862command_mon_aggr (object *op, char *params)
863{
864 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
865 {
866 op->enemy = NULL;
867 SET_FLAG (op, FLAG_UNAGGRESSIVE);
868 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
869 }
870 else
871 {
872 CLEAR_FLAG (op, FLAG_FRIENDLY);
873 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
874 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
875 }
876
877 return 1;
878}
879
880/** DM can possess a monster. Basically, this tricks the client into thinking
881 * a given monster, is actually the player it controls. This allows a DM
882 * to inhabit a monster's body, and run around the game with it.
883 * This function is severely broken - it has tons of hardcoded values,
884 */
885int
886command_possess (object *op, char *params)
887{
888 object *victim, *curinv, *nextinv;
889 player *pl;
890 int i;
891 char buf[MAX_BUF];
892
893 victim = NULL;
894 if (params != NULL)
895 {
896 if (sscanf (params, "%d", &i))
897 victim = find_object (i);
898 else if (sscanf (params, "%s", buf))
899 victim = find_object_name (buf);
900 }
901 if (victim == NULL)
902 {
903 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
904 return 1;
905 }
906
907 if (victim == op)
908 {
909 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
910 return 1;
911 }
912
913 /* clear out the old inventory */
914 curinv = op->inv;
915 while (curinv != NULL)
916 {
917 nextinv = curinv->below;
918 esrv_del_item (op->contr, curinv->count);
919 curinv = nextinv;
920 }
921
922 /* make the switch */
923 pl = op->contr;
924 victim->contr = pl;
925 pl->ob = victim;
926 victim->type = PLAYER;
927 SET_FLAG (victim, FLAG_WIZ);
928
929 /* send the inventory to the client */
930 curinv = victim->inv;
931 while (curinv != NULL)
932 {
933 nextinv = curinv->below;
934 esrv_send_item (victim, curinv);
935 curinv = nextinv;
936 }
937 /* basic patchup */
938 /* The use of hard coded values is terrible. Note
939 * that really, to be fair, this shouldn't get changed at
940 * all - if you are possessing a kobold, you should have the
941 * same limitations. As it is, as more body locations are added,
942 * this will give this player more locations than perhaps
943 * they should be allowed.
944 */
945 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
946 if (i == 1 || i == 6 || i == 8 || i == 9)
947 victim->body_info[i] = 2;
948 else
949 victim->body_info[i] = 1;
950
951 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
952 esrv_send_inventory (victim, victim);
953
954 victim->update_stats ();
955
956 do_some_living (victim);
957 return 1; 886 return 1;
958} 887}
959 888
960int 889int
961command_patch (object *op, char *params) 890command_patch (object *op, char *params)
… …
976 return 1; 905 return 1;
977 } 906 }
978 907
979 if ((arg2 = strchr (arg, ' '))) 908 if ((arg2 = strchr (arg, ' ')))
980 arg2++; 909 arg2++;
981 if (settings.real_wiz == FALSE) 910
982 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
983 if (set_variable (tmp, arg) == -1) 911 if (set_variable (tmp, arg) == -1)
984 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);
985 else 913 else
986 {
987 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);
988 }
989 915
990 return 1; 916 return 1;
991} 917}
992 918
993int 919int
… …
1007 { 933 {
1008 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!");
1009 return 1; 935 return 1;
1010 } 936 }
1011 937
1012 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 938 if (tmp->flag [FLAG_REMOVED])
1013 { 939 {
1014 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));
1015 return 1; 941 return 1;
1016 } 942 }
1017 943
… …
1042 968
1043 if (from != STACK_FROM_STACK) 969 if (from != STACK_FROM_STACK)
1044 /* 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 */
1045 dm_stack_pop (op->contr); 971 dm_stack_pop (op->contr);
1046 972
1047 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1048 {
1049 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1050 tmp->remove ();
1051 }
1052
1053 if (tmp->head) 973 if (tmp->head)
1054 tmp = tmp->head; 974 tmp = tmp->head;
1055 975
1056 tmp->destroy (); 976 tmp->destroy ();
1057 return 1; 977 return 1;
… …
1062 */ 982 */
1063int 983int
1064command_addexp (object *op, char *params) 984command_addexp (object *op, char *params)
1065{ 985{
1066 char buf[MAX_BUF], skill[MAX_BUF]; 986 char buf[MAX_BUF], skill[MAX_BUF];
1067 int i, q; 987 int q;
988 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1068 object *skillob = NULL; 989 object *skillob = NULL;
1069 990
1070 skill[0] = '\0'; 991 skill[0] = '\0';
1071 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))
1072 { 993 {
1073 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>].");
1074 return 1; 995 return 1;
1075 } 996 }
1076 997
… …
1094 1015
1095 pl->ob->stats.exp += i; 1016 pl->ob->stats.exp += i;
1096 calc_perm_exp (pl->ob); 1017 calc_perm_exp (pl->ob);
1097 player_lvl_adj (pl->ob, NULL); 1018 player_lvl_adj (pl->ob, NULL);
1098 1019
1099 if (settings.real_wiz == FALSE)
1100 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1101
1102 return 1; 1020 return 1;
1103 } 1021 }
1104 1022
1105 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1023 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1106 return 1; 1024 return 1;
… …
1115/**************************************************************************/ 1033/**************************************************************************/
1116 1034
1117int 1035int
1118command_stats (object *op, char *params) 1036command_stats (object *op, char *params)
1119{ 1037{
1120 char thing[20];
1121 char buf[MAX_BUF]; 1038 char buf[MAX_BUF];
1122 1039
1123 thing[0] = '\0'; 1040 if (params == NULL || params[0] == '\0')
1124 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1125 { 1041 {
1126 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1042 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1127 return 1; 1043 return 1;
1128 } 1044 }
1129 1045
1130 for_all_players (pl) 1046 for_all_players (pl)
1131 if (!strcmp (pl->ob->name, thing)) 1047 if (!strcmp (&pl->ob->name, params))
1132 { 1048 {
1133 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);
1134 new_draw_info (NDI_UNIQUE, 0, op, buf); 1050 new_draw_info (NDI_UNIQUE, 0, op, buf);
1135 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);
1136 new_draw_info (NDI_UNIQUE, 0, op, buf); 1052 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
1154int 1070int
1155command_abil (object *op, char *params) 1071command_abil (object *op, char *params)
1156{ 1072{
1157 char thing[20], thing2[20]; 1073 char thing[20], thing2[20];
1158 int iii; 1074 int iii;
1159 player *pl;
1160 char buf[MAX_BUF]; 1075 char buf[MAX_BUF];
1161 1076
1162 iii = 0; 1077 iii = 0;
1163 thing[0] = '\0'; 1078 thing[0] = '\0';
1164 thing2[0] = '\0'; 1079 thing2[0] = '\0';
… …
1180 return 1; 1095 return 1;
1181 } 1096 }
1182 1097
1183 for_all_players (pl) 1098 for_all_players (pl)
1184 { 1099 {
1185 if (!strcmp (pl->ob->name, thing)) 1100 if (!strcmp (&pl->ob->name, thing))
1186 { 1101 {
1187 if (settings.real_wiz == FALSE)
1188 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1189 if (!strcmp ("str", thing2))
1190 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;
1191 if (!strcmp ("dex", thing2))
1192 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;
1193 if (!strcmp ("con", thing2))
1194 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;
1195 if (!strcmp ("wis", thing2))
1196 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;
1197 if (!strcmp ("cha", thing2))
1198 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;
1199 if (!strcmp ("int", thing2))
1200 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;
1201 if (!strcmp ("pow", thing2))
1202 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
1203 sprintf (buf, "%s has been altered.", &pl->ob->name); 1110 sprintf (buf, "%s has been altered.", &pl->ob->name);
1204 new_draw_info (NDI_UNIQUE, 0, op, buf); 1111 new_draw_info (NDI_UNIQUE, 0, op, buf);
1205 pl->ob->update_stats (); 1112 pl->ob->update_stats ();
1206 return 1; 1113 return 1;
1207 } 1114 }
… …
1210 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1117 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1211 return 1; 1118 return 1;
1212} 1119}
1213 1120
1214int 1121int
1215command_reset (object *op, char *params)
1216{
1217 maptile *m;
1218 object *dummy = NULL, *tmp = NULL;
1219
1220 if (params == NULL)
1221 {
1222 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1223 return 1;
1224 }
1225
1226 if (strcmp (params, ".") == 0)
1227 params = op->map->path;
1228
1229 m = has_been_loaded (params);
1230 if (m == NULL)
1231 {
1232 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1233 return 1;
1234 }
1235
1236 if (m->in_memory != MAP_SWAPPED)
1237 {
1238 if (m->in_memory != MAP_IN_MEMORY)
1239 {
1240 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1241 return 0;
1242 }
1243
1244 /*
1245 * Only attempt to remove the player that is doing the reset, and not other
1246 * players or wiz's.
1247 */
1248 if (op->map == m)
1249 {
1250 dummy = object::create ();
1251 dummy->map = NULL;
1252 EXIT_X (dummy) = op->x;
1253 EXIT_Y (dummy) = op->y;
1254 EXIT_PATH (dummy) = op->map->path;
1255 op->remove ();
1256 op->map = NULL;
1257 tmp = op;
1258 }
1259 swap_map (m);
1260 }
1261
1262 if (m->in_memory == MAP_SWAPPED)
1263 {
1264 LOG (llevDebug, "Resetting map %s.\n", m->path);
1265
1266 /* setting this effectively causes an immediate reload */
1267 m->reset_time = 1;
1268 flush_old_maps ();
1269 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1270
1271 if (tmp)
1272 {
1273 enter_exit (tmp, dummy);
1274 dummy->destroy ();
1275 }
1276
1277 return 1;
1278 }
1279 else
1280 {
1281 player *pl;
1282 int playercount = 0;
1283
1284 /* Need to re-insert player if swap failed for some reason */
1285 if (tmp)
1286 {
1287 insert_ob_in_map (op, m, NULL, 0);
1288 dummy->destroy ();
1289 }
1290
1291 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1292
1293 for_all_players (pl)
1294 if (pl->ob->map == m && pl->ob != op)
1295 {
1296 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1297 playercount++;
1298 }
1299
1300 if (!playercount)
1301 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1302 return 1;
1303 }
1304}
1305
1306int
1307command_nowiz (object *op, char *params) 1122command_nowiz (object *op, char *params)
1308{ /* 'noadm' is alias */ 1123{ /* 'nodm' is alias */
1309 CLEAR_FLAG (op, FLAG_WIZ); 1124 op->clr_flag (FLAG_WIZ);
1310 CLEAR_FLAG (op, FLAG_WIZPASS); 1125 op->clr_flag (FLAG_WIZPASS);
1311 CLEAR_FLAG (op, FLAG_WIZCAST); 1126 op->clr_flag (FLAG_WIZCAST);
1127 op->clr_flag (FLAG_WIZLOOK);
1128 op->contr->do_los = 1;
1312 1129
1313 if (settings.real_wiz == TRUE)
1314 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1315 if (op->contr->hidden) 1130 if (op->contr->hidden)
1316 { 1131 {
1317 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");
1318 op->map->players++; 1133 op->map->players++;
1319 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);
1320 op->contr->hidden = 0; 1135 op->contr->hidden = 0;
1321 op->invisible = 1; 1136 op->invisible = 1;
1322 } 1137 }
1323 else 1138 else
1324 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
1325 return 1; 1141 return 1;
1326} 1142}
1327 1143
1328/** 1144/**
1329 * object *op is trying to become dm. 1145 * object *op is trying to become dm.
… …
1366 } 1182 }
1367 fclose (dmfile); 1183 fclose (dmfile);
1368 return (0); 1184 return (0);
1369} 1185}
1370 1186
1371int 1187static int
1372do_wizard_dm (object *op, char *params, int silent) 1188do_wizard_dm (object *op, char *params, int silent)
1373{ 1189{
1374 if (!op->contr) 1190 if (!op->contr)
1375 return 0; 1191 return 0;
1376 1192
1377 if (QUERY_FLAG (op, FLAG_WIZ)) 1193 if (op->flag [FLAG_WIZ])
1378 { 1194 {
1379 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!");
1380 return 0; 1196 return 0;
1381 } 1197 }
1382 1198
1383 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1199 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1384 { 1200 {
1385 SET_FLAG (op, FLAG_WIZ); 1201 op->set_flag (FLAG_WIZ);
1386 SET_FLAG (op, FLAG_WAS_WIZ); 1202 op->set_flag (FLAG_WIZPASS);
1387 SET_FLAG (op, FLAG_WIZPASS); 1203 op->set_flag (FLAG_WIZCAST);
1388 SET_FLAG (op, FLAG_WIZCAST); 1204 op->set_flag (FLAG_WIZLOOK);
1205 op->contr->do_los = 1;
1206
1389 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!");
1390 /*
1391 * Remove setting flying here - that won't work, because next
1392 * fix_player() is called that will get cleared - proper solution
1393 * is probably something like a wiz_force which gives that and any
1394 * other desired abilities.
1395 */
1396 clear_los (op);
1397 op->contr->write_buf[0] = '\0'; 1208 op->contr->write_buf[0] = '\0';
1398 1209
1399 if (!silent) 1210 if (!silent)
1400 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!");
1401 1212
… …
1428command_invisible (object *op, char *params) 1239command_invisible (object *op, char *params)
1429{ 1240{
1430 if (op) 1241 if (op)
1431 { 1242 {
1432 op->invisible += 100; 1243 op->invisible += 100;
1433 update_object (op, UP_OBJ_FACE); 1244 update_object (op, UP_OBJ_CHANGE);
1434 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1245 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1435 } 1246 }
1436 1247
1437 return 0; 1248 return 0;
1438} 1249}
… …
1441 * Returns spell object (from archetypes) by name. 1252 * Returns spell object (from archetypes) by name.
1442 * Returns NULL if 0 or more than one spell matches. 1253 * Returns NULL if 0 or more than one spell matches.
1443 * Used for wizard's learn spell/prayer. 1254 * Used for wizard's learn spell/prayer.
1444 * 1255 *
1445 * op is the player issuing the command. 1256 * op is the player issuing the command.
1446 *
1447 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1448 * anymore (but may still be present in some player's inventories and thus
1449 * cannot be removed). We have to ignore them here since they have the same
1450 * name than other "spell_xxx" archetypes and would always conflict.
1451 */ 1257 */
1452static object * 1258static object *
1453get_spell_by_name (object *op, const char *spell_name) 1259get_spell_by_name (object *op, shstr_cmp spell_name)
1454{ 1260{
1455 archetype *ar;
1456 archetype *found;
1457 int conflict_found;
1458 size_t spell_name_length;
1459
1460 /* First check for full name matches. */ 1261 /* First check for full name matches. */
1461 conflict_found = 0; 1262 int conflict_found = 0;
1462 found = NULL; 1263 archetype *found = 0;
1463 for (ar = first_archetype; ar != NULL; ar = ar->next) 1264
1265 for_all_archetypes (at)
1464 { 1266 {
1465 if (ar->clone.type != SPELL) 1267 if (at->type != SPELL)
1466 continue; 1268 continue;
1467 1269
1468 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1270 if (at->object::name != spell_name)
1469 continue; 1271 continue;
1470 1272
1471 if (strcmp (ar->clone.name, spell_name) != 0)
1472 continue;
1473
1474 if (found != NULL) 1273 if (found)
1475 { 1274 {
1476 if (!conflict_found) 1275 if (!conflict_found)
1477 { 1276 {
1478 conflict_found = 1; 1277 conflict_found = 1;
1479 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);
1480 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1279 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1481 } 1280 }
1281
1482 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1282 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1483 continue; 1283 return 0;
1484 } 1284 }
1485 1285
1486 found = ar; 1286 found = at;
1487 } 1287 }
1488
1489 /* No match if more more than one archetype matches. */
1490 if (conflict_found)
1491 return NULL;
1492 1288
1493 /* Return if exactly one archetype matches. */ 1289 /* Return if exactly one archetype matches. */
1494 if (found != NULL) 1290 if (found)
1495 return arch_to_object (found); 1291 return found->instance ();
1496
1497 /* No full match found: now check for partial matches. */
1498 spell_name_length = strlen (spell_name);
1499 conflict_found = 0;
1500 found = NULL;
1501 for (ar = first_archetype; ar != NULL; ar = ar->next)
1502 {
1503 if (ar->clone.type != SPELL)
1504 continue;
1505
1506 if (strncmp (ar->name, "spelldirect_", 12) == 0)
1507 continue;
1508
1509 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0)
1510 continue;
1511
1512 if (found != NULL)
1513 {
1514 if (!conflict_found)
1515 {
1516 conflict_found = 1;
1517 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1518 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name);
1519 }
1520 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name);
1521 continue;
1522 }
1523
1524 found = ar;
1525 }
1526
1527 /* No match if more more than one archetype matches. */
1528 if (conflict_found)
1529 return NULL;
1530
1531 /* Return if exactly one archetype matches. */
1532 if (found != NULL)
1533 return arch_to_object (found);
1534 1292
1535 /* No spell found: just print an error message. */ 1293 /* No spell found: just print an error message. */
1536 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
1537 return NULL; 1296 return 0;
1538} 1297}
1539 1298
1540static int 1299static int
1541command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1300command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1542{ 1301{
… …
1586 { 1345 {
1587 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?");
1588 return 0; 1347 return 0;
1589 } 1348 }
1590 1349
1591 spell = lookup_spell_by_name (op, params); 1350 spell = op->find_spell (params);
1592 if (spell == NULL) 1351 if (spell == NULL)
1593 { 1352 {
1594 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);
1595 return 0; 1354 return 0;
1596 } 1355 }
1597 1356
1598 do_forget_spell (op, spell->name); 1357 do_forget_spell (op, spell->name);
1599 return 1;
1600}
1601
1602/**
1603 * Lists all plugins currently loaded with their IDs and full names.
1604 */
1605int
1606command_listplugins (object *op, char *params)
1607{
1608 plugins_display_list (op);
1609 return 1;
1610}
1611
1612/**
1613 * Loads the given plugin. The DM specifies the name of the library to load (no
1614 * pathname is needed). Do not ever attempt to load the same plugin more than
1615 * once at a time, or bad things could happen.
1616 */
1617int
1618command_loadplugin (object *op, char *params)
1619{
1620 char buf[MAX_BUF];
1621
1622 if (params == NULL)
1623 {
1624 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1625 return 1;
1626 }
1627
1628 strcpy (buf, LIBDIR);
1629 strcat (buf, "/plugins/");
1630 strcat (buf, params);
1631 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1632 if (plugins_init_plugin (buf) == 0)
1633 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1634 else
1635 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1636 return 1;
1637}
1638
1639/**
1640 * Unloads the given plugin. The DM specified the ID of the library to unload.
1641 * Note that some things may behave strangely if the correct plugins are not
1642 * loaded.
1643 */
1644int
1645command_unloadplugin (object *op, char *params)
1646{
1647 if (params == NULL)
1648 {
1649 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1650 return 1;
1651 }
1652
1653 if (plugins_remove_plugin (params) == 0)
1654 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1655 else
1656 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1657 return 1; 1358 return 1;
1658} 1359}
1659 1360
1660/** 1361/**
1661 * A players wants to become DM and hide. 1362 * A players wants to become DM and hide.
… …
1669 return 0; 1370 return 0;
1670 1371
1671 do_wizard_hide (op, 1); 1372 do_wizard_hide (op, 1);
1672 1373
1673 return 1; 1374 return 1;
1674}
1675
1676void
1677dm_stack_pop (player *pl)
1678{
1679 if (!pl->stack_items || !pl->stack_position)
1680 {
1681 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1682 return;
1683 }
1684
1685 pl->stack_position--;
1686 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1687}
1688
1689/**
1690 * Get current stack top item for player.
1691 * Returns NULL if no stacked item.
1692 * If stacked item disappeared (freed), remove it.
1693 *
1694 * Ryo, august 2004
1695 */
1696object *
1697dm_stack_peek (player *pl)
1698{
1699 object *ob;
1700
1701 if (!pl->stack_position)
1702 {
1703 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1704 return NULL;
1705 }
1706
1707 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1708 if (!ob)
1709 {
1710 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1711 dm_stack_pop (pl);
1712 return NULL;
1713 }
1714
1715 return ob;
1716}
1717
1718/**
1719 * Push specified item on player stack.
1720 * Inform player of position.
1721 * Initializes variables if needed.
1722 */
1723void
1724dm_stack_push (player *pl, tag_t item)
1725{
1726 if (!pl->stack_items)
1727 {
1728 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1729 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1730 }
1731
1732 if (pl->stack_position == STACK_SIZE)
1733 {
1734 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1735 return;
1736 }
1737
1738 pl->stack_items[pl->stack_position] = item;
1739 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1740 pl->stack_position++;
1741}
1742
1743/**
1744 * Checks 'params' for object code.
1745 *
1746 * Can be:
1747 * * empty => get current object stack top for player
1748 * * number => get item with that tag, stack it for future use
1749 * * $number => get specified stack item
1750 * * "me" => player himself
1751 *
1752 * At function exit, params points to first non-object char
1753 *
1754 * 'from', if not NULL, contains at exit:
1755 * * STACK_FROM_NONE => object not found
1756 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1757 * * STACK_FROM_STACK => item from somewhere in the stack
1758 * * STACK_FROM_NUMBER => item by number, pushed on stack
1759 *
1760 * Ryo, august 2004
1761 */
1762object *
1763get_dm_object (player *pl, char **params, int *from)
1764{
1765 int item_tag, item_position;
1766 object *ob;
1767
1768 if (!pl)
1769 return NULL;
1770
1771 if (!params || !*params || **params == '\0')
1772 {
1773 if (from)
1774 *from = STACK_FROM_TOP;
1775 /* No parameter => get stack item */
1776 return dm_stack_peek (pl);
1777 }
1778
1779 /* Let's clean white spaces */
1780 while (**params == ' ')
1781 (*params)++;
1782
1783 /* Next case: number => item tag */
1784 if (sscanf (*params, "%d", &item_tag))
1785 {
1786 /* Move parameter to next item */
1787 while (isdigit (**params))
1788 (*params)++;
1789
1790 /* And skip blanks, too */
1791 while (**params == ' ')
1792 (*params)++;
1793
1794 /* Get item */
1795 ob = find_object (item_tag);
1796 if (!ob)
1797 {
1798 if (from)
1799 *from = STACK_FROM_NONE;
1800 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1801 return NULL;
1802 }
1803
1804 /* Got one, let's push it on stack */
1805 dm_stack_push (pl, item_tag);
1806 if (from)
1807 *from = STACK_FROM_NUMBER;
1808 return ob;
1809 }
1810
1811 /* Next case: $number => stack item */
1812 if (sscanf (*params, "$%d", &item_position))
1813 {
1814 /* Move parameter to next item */
1815 (*params)++;
1816
1817 while (isdigit (**params))
1818 (*params)++;
1819 while (**params == ' ')
1820 (*params)++;
1821
1822 if (item_position >= pl->stack_position)
1823 {
1824 if (from)
1825 *from = STACK_FROM_NONE;
1826 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1827 return NULL;
1828 }
1829
1830 ob = find_object (pl->stack_items[item_position]);
1831 if (!ob)
1832 {
1833 if (from)
1834 *from = STACK_FROM_NONE;
1835 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1836 return NULL;
1837 }
1838
1839 if (from)
1840 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1841 return ob;
1842 }
1843
1844 /* Next case: 'me' => return pl->ob */
1845 if (!strncmp (*params, "me", 2))
1846 {
1847 if (from)
1848 *from = STACK_FROM_NUMBER;
1849 dm_stack_push (pl, pl->ob->count);
1850
1851 /* Skip to next token */
1852 (*params) += 2;
1853 while (**params == ' ')
1854 (*params)++;
1855
1856 return pl->ob;
1857 }
1858
1859 /* Last case: get stack top */
1860 if (from)
1861 *from = STACK_FROM_TOP;
1862 return dm_stack_peek (pl);
1863} 1375}
1864 1376
1865/** 1377/**
1866 * Pop the stack top. 1378 * Pop the stack top.
1867 */ 1379 */
… …
1927} 1439}
1928 1440
1929int 1441int
1930command_insert_into (object *op, char *params) 1442command_insert_into (object *op, char *params)
1931{ 1443{
1932 object *left, *right, *inserted; 1444 object *left, *right;
1933 int left_from, right_from; 1445 int left_from, right_from;
1934 1446
1935 left = get_dm_object (op->contr, &params, &left_from); 1447 left = get_dm_object (op->contr, &params, &left_from);
1936 if (!left) 1448 if (!left)
1937 { 1449 {
… …
1980 { 1492 {
1981 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!");
1982 return 0; 1494 return 0;
1983 } 1495 }
1984 1496
1985 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1497 if (!right->flag [FLAG_REMOVED])
1986 right->remove (); 1498 right->remove ();
1499
1987 inserted = insert_ob_in_ob (right, left); 1500 object *inserted = insert_ob_in_ob (right, left);
1988 if (left->type == PLAYER)
1989 if (inserted == right)
1990 esrv_send_item (left, right);
1991 else
1992 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1993 1501
1994 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));
1995 1503
1996 return 0; 1504 return 0;
1997 1505

Diff Legend

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