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.8 by root, Sun Sep 10 13:20:27 2006 UTC vs.
Revision 1.61 by root, Sat Dec 20 02:32:31 2008 UTC

1
2/* 1/*
3 * static char *rcsid_c_wiz_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 * "$Id: c_wiz.C,v 1.8 2006/09/10 13:20:27 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
12 7 *
13 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
14 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
15 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
16 (at your option) any later version. 11 * (at your option) any later version.
17 12 *
18 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,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details. 16 * GNU General Public License for more details.
22 17 *
23 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
26 21 * The authors can be reached via e-mail to <support@deliantra.net>
27 The authors can be reached via e-mail at crossfire-devel@real-time.com
28*/ 22 */
29 23
30#include <global.h> 24#include <global.h>
31#ifndef __CEXTRACT__
32# include <sproto.h> 25#include <sproto.h>
33#endif
34#include <spells.h> 26#include <spells.h>
35#include <treasure.h> 27#include <treasure.h>
36#include <skills.h> 28#include <skills.h>
37 29
38/** Defines for DM item stack **/ 30/** Defines for DM item stack **/
… …
53 * other player, or NULL otherwise. 45 * other player, or NULL otherwise.
54 */ 46 */
55static player * 47static player *
56get_other_player_from_name (object *op, char *name) 48get_other_player_from_name (object *op, char *name)
57{ 49{
58 player *pl;
59
60 if (!name) 50 if (!name)
61 return NULL; 51 return NULL;
62 52
63 for (pl = first_player; pl != NULL; pl = pl->next) 53 for_all_players (pl)
64 if (!strncmp (pl->ob->name, name, MAX_NAME)) 54 if (!strncmp (pl->ob->name, name, MAX_NAME))
65 break;
66
67 if (pl == NULL)
68 { 55 {
69 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
70 return NULL;
71 }
72
73 if (pl->ob == op) 56 if (pl->ob == op)
74 { 57 {
75 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 58 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
76 return NULL; 59 return NULL;
77 } 60 }
61
78 if (pl->state != ST_PLAYING) 62 if (pl->ns->state != ST_PLAYING)
79 { 63 {
80 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 64 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
81 return NULL; 65 return NULL;
82 }
83 return pl;
84}
85
86/**
87 * This command will stress server.
88 */
89int
90command_loadtest (object *op, char *params)
91{
92 uint32 x, y;
93 char buf[1024];
94
95 new_draw_info (NDI_UNIQUE, 0, op, "loadtest will stress server through teleporting");
96 new_draw_info (NDI_UNIQUE, 0, op, "at different map places.");
97 new_draw_info (NDI_UNIQUE, 0, op, "use at your own risks.");
98 new_draw_info (NDI_UNIQUE, 0, op, "Very long loop used so server may have to be reset.");
99 new_draw_info (NDI_UNIQUE, 0, op, "type loadtest TRUE to run");
100 new_draw_info_format (NDI_UNIQUE, 0, op, "{%s}", params);
101 if (!params)
102 return 0;
103 if (strncmp (params, "TRUE", 4))
104 return 0;
105
106 new_draw_info_format (NDI_UNIQUE, 0, op, "gogogo");
107 for (x = 0; x < settings.worldmaptilesx; x++)
108 {
109 for (y = 0; y < settings.worldmaptilesy; y++)
110 {
111 sprintf (buf, "/world/world_%d_%d", x + settings.worldmapstartx, y + settings.worldmapstarty);
112 command_goto (op, buf);
113 } 66 }
67
68 return pl;
114 } 69 }
115 70
71 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
116 return 0; 72 return 0;
117} 73}
118 74
119/** 75/**
120 * Actually hides specified player (obviously a DM). 76 * Actually hides specified player (obviously a DM).
… …
129 op->contr->hidden = 0; 85 op->contr->hidden = 0;
130 op->invisible = 1; 86 op->invisible = 1;
131 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 87 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
132 op->map->players++; 88 op->map->players++;
133 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 89 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
90
134 if (!silent_dm) 91 if (!silent_dm)
135 {
136 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 92 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
137 }
138 } 93 }
139 else 94 else
140 { 95 {
141 op->contr->hidden = 1; 96 op->contr->hidden = 1;
142 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); 97 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
143 op->map->players--; 98 op->map->players--;
99
144 if (!silent_dm) 100 if (!silent_dm)
145 {
146 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 101 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
147 } 102
148 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); 103 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name);
149 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); 104 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name);
150 } 105 }
151} 106}
152 107
… …
164static object * 119static object *
165find_object_both (char *params) 120find_object_both (char *params)
166{ 121{
167 if (!params) 122 if (!params)
168 return NULL; 123 return NULL;
124
169 if (params[0] == '#') 125 if (params[0] == '#')
170 return find_object (atol (params + 1)); 126 return find_object (atol (params + 1));
171 else 127 else
172 return find_object_name (params); 128 return find_object_name (params);
173} 129}
… …
215 171
216 become_follower (ob, god); 172 become_follower (ob, god);
217 return 1; 173 return 1;
218} 174}
219 175
220/** 176// TODO: Rewrite banish in perl and get rid of the following two functions
221 * Add player's IP to ban_file and kick them off the server
222 * I know most people have dynamic IPs but this is more of a short term
223 * solution if they have to get a new IP to play maybe they'll calm down.
224 * This uses the banish_file in the local directory *not* the ban_file
225 * The action is logged with a ! for easy searching. -tm
226 */
227int
228command_banish (object *op, char *params)
229{
230 player *pl;
231 FILE *banishfile;
232 char buf[MAX_BUF];
233 time_t now;
234
235 if (!params)
236 {
237 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
238 return 1;
239 }
240
241 pl = get_other_player_from_name (op, params);
242 if (!pl)
243 return 1;
244
245 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
246
247 if ((banishfile = fopen (buf, "a")) == NULL)
248 {
249 LOG (llevDebug, "Could not find file banish_file.\n");
250 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
251 return 0;
252 }
253
254 now = time (NULL);
255 /*
256 * Record this as a comment - then we don't have to worry about changing
257 * the parsing code.
258 */
259 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket.host, &op->name, ctime (&now));
260 fprintf (banishfile, "*@%s\n", pl->socket.host);
261 fclose (banishfile);
262
263 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host);
264 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
265 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
266 command_kick (op, (char *) &pl->ob->name);
267 return 1;
268}
269
270int 177int
271command_kick (object *op, char *params) 178command_kick (object *op, char *params)
272{ 179{
273 struct pl *pl; 180 for_all_players (pl)
274
275 for (pl = first_player; pl != NULL; pl = pl->next)
276 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) 181 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
277 { 182 {
278 object *op = pl->ob; 183 object *plop = pl->ob;
279 184
280 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 185 if (!QUERY_FLAG (plop, FLAG_REMOVED) && !QUERY_FLAG (plop, FLAG_FREED))
281 { 186 {
282 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 187 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &plop->name);
283 strcpy (op->contr->killer, "kicked"); 188 plop->contr->killer = op;
284 } 189 }
285 190
286 pl->socket.status = Ns_Dead; 191 pl->ns->destroy ();
287 } 192 }
288 193
289 return 1; 194 return 1;
290} 195}
291 196
197//TODO
198#if 0
292int 199int
293command_save_overlay (object *op, char *params) 200command_save_overlay (object *op, char *params)
294{ 201{
295 if (!op) 202 if (!op)
296 return 0; 203 return 0;
… …
307 214
308 ready_map_name (op->map->path, 0); 215 ready_map_name (op->map->path, 0);
309 216
310 return 1; 217 return 1;
311} 218}
312 219#endif
313int
314command_shutdown (object *op, char *params)
315{
316 struct pl *pl;
317
318 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
319 {
320 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
321 return 1;
322 }
323
324 for (pl = first_player; pl != NULL; pl = pl->next)
325 save_player (pl->ob, 0);
326
327 for (pl = first_player; pl != NULL; pl = pl->next)
328 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
329 leave_map (pl->ob);
330
331 cleanup ();
332 /* not reached */
333 return 1;
334}
335
336int
337command_goto (object *op, char *params)
338{
339 char *name;
340 object *dummy;
341
342 if (!op)
343 return 0;
344
345 if (params == NULL)
346 {
347 new_draw_info (NDI_UNIQUE, 0, op, "Go to what level?");
348 return 1;
349 }
350
351 name = params;
352 dummy = get_object ();
353 dummy->map = op->map;
354 EXIT_PATH (dummy) = name;
355 dummy->name = name;
356
357 enter_exit (op, dummy);
358 free_object (dummy);
359 if (op->contr->loading == NULL)
360 {
361 new_draw_info_format (NDI_UNIQUE, 0, op, "Difficulty: %d.", op->map->difficulty);
362 }
363
364 return 1;
365}
366
367/* is this function called from somewhere ? -Tero */
368int
369command_generate (object *op, char *params)
370{
371 object *tmp;
372 int nr = 1, i, retry;
373
374 if (!op)
375 return 0;
376
377 if (params != NULL)
378 sscanf (params, "%d", &nr);
379 for (i = 0; i < nr; i++)
380 {
381 retry = 50;
382 while ((tmp = generate_treasure (0, op->map->difficulty)) == NULL && --retry)
383 ;
384 if (tmp != NULL)
385 {
386 tmp = insert_ob_in_ob (tmp, op);
387 if (op->type == PLAYER)
388 esrv_send_item (op, tmp);
389 }
390 }
391
392 return 1;
393}
394 220
395int 221int
396command_freeze (object *op, char *params) 222command_freeze (object *op, char *params)
397{ 223{
398 int ticks; 224 int ticks;
… …
434 object *dummy; 260 object *dummy;
435 player *pl; 261 player *pl;
436 262
437 if (!op) 263 if (!op)
438 return 0; 264 return 0;
265
439 if (params == NULL) 266 if (params == NULL)
440 { 267 {
441 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 268 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
442 return 1; 269 return 1;
443 } 270 }
271
444 pl = get_other_player_from_name (op, params); 272 pl = get_other_player_from_name (op, params);
445 if (!pl) 273 if (!pl)
446 return 1; 274 return 1;
275
447 dummy = get_jail_exit (pl->ob); 276 dummy = get_jail_exit (pl->ob);
448 if (!dummy) 277 if (!dummy)
449 { 278 {
450 /* we have nowhere to send the prisoner.... */ 279 /* we have nowhere to send the prisoner.... */
451 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 280 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
452 return 0; 281 return 0;
453 } 282 }
454 enter_exit (pl->ob, dummy); 283
455 free_object (dummy); 284 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
285 dummy->destroy ();
286
456 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 287 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
457 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 288 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
458 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 289 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
459 return 1; 290 return 1;
460} 291}
… …
484 { 315 {
485 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 316 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
486 return 1; 317 return 1;
487 } 318 }
488 319
489 dummy = get_object (); 320 pl->ob->player_goto (op->map->path, op->x + freearr_x[i], op->y + freearr_y[i]);
490 EXIT_PATH (dummy) = op->map->path;
491 EXIT_X (dummy) = op->x + freearr_x[i];
492 EXIT_Y (dummy) = op->y + freearr_y[i];
493 enter_exit (pl->ob, dummy);
494 free_object (dummy);
495 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 321 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
496 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 322 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
497 323
498 return 1;
499}
500
501/**
502 * Teleport next to target player.
503 */
504
505/* mids 01/16/2002 */
506int
507command_teleport (object *op, char *params)
508{
509 int i;
510 object *dummy;
511 player *pl;
512
513 if (!op)
514 return 0;
515
516 if (params == NULL)
517 {
518 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
519 return 1;
520 }
521
522 pl = get_other_player_from_name (op, params);
523 if (!pl)
524 return 1;
525
526 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
527 if (i == -1)
528 {
529 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
530 return 1;
531 }
532
533 dummy = get_object ();
534 EXIT_PATH (dummy) = pl->ob->map->path;
535 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
536 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
537 enter_exit (op, dummy);
538 free_object (dummy);
539 if (!op->contr->hidden)
540 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
541 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
542 return 1; 324 return 1;
543} 325}
544 326
545/** 327/**
546 * This function is a real mess, because we're stucking getting 328 * This function is a real mess, because we're stucking getting
… …
572 if (params == NULL) 354 if (params == NULL)
573 { 355 {
574 new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]"); 356 new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]");
575 return 1; 357 return 1;
576 } 358 }
359
577 bp = params; 360 bp = params;
578 361
579 /* We need to know where the line ends */ 362 /* We need to know where the line ends */
580 endline = bp + strlen (bp); 363 endline = bp + strlen (bp);
581 364
… …
588 } 371 }
589 bp++; 372 bp++;
590 set_nrof = 1; 373 set_nrof = 1;
591 LOG (llevDebug, "%s creates: (%d) %s\n", &op->name, nrof, bp); 374 LOG (llevDebug, "%s creates: (%d) %s\n", &op->name, nrof, bp);
592 } 375 }
376
593 if (sscanf (bp, "%d ", &magic)) 377 if (sscanf (bp, "%d ", &magic))
594 { 378 {
595 if ((bp = strchr (bp, ' ')) == NULL) 379 if ((bp = strchr (bp, ' ')) == NULL)
596 { 380 {
597 new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]"); 381 new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]");
598 return 1; 382 return 1;
599 } 383 }
384
600 bp++; 385 bp++;
601 set_magic = 1; 386 set_magic = 1;
602 LOG (llevDebug, "%s creates: (%d) (%d) %s\n", &op->name, nrof, magic, bp); 387 LOG (llevDebug, "%s creates: (%d) (%d) %s\n", &op->name, nrof, magic, bp);
603 } 388 }
389
604 if ((cp = strstr (bp, " of ")) != NULL) 390 if ((cp = strstr (bp, " of ")) != NULL)
605 { 391 {
606 *cp = '\0'; 392 *cp = '\0';
607 cp += 4; 393 cp += 4;
608 } 394 }
395
609 for (bp2 = bp; *bp2; bp2++) 396 for (bp2 = bp; *bp2; bp2++)
610 { 397 {
611 if (*bp2 == ' ') 398 if (*bp2 == ' ')
612 { 399 {
613 *bp2 = '\0'; 400 *bp2 = '\0';
614 bp2++; 401 bp2++;
615 break; 402 break;
616 } 403 }
617 } 404 }
618 405
619 if ((at = find_archetype (bp)) == NULL) 406 if ((at = archetype::find (bp)) == NULL)
620 { 407 {
621 new_draw_info (NDI_UNIQUE, 0, op, "No such archetype."); 408 new_draw_info (NDI_UNIQUE, 0, op, "No such archetype.");
622 return 1; 409 return 1;
623 } 410 }
624 411
… …
630 * Try to find a spell object for this. Note that 417 * Try to find a spell object for this. Note that
631 * we also set up spell_name which is only 418 * we also set up spell_name which is only
632 * the first word. 419 * the first word.
633 */ 420 */
634 421
635 at_spell = find_archetype (cp); 422 at_spell = archetype::find (cp);
636 if (!at_spell || at_spell->clone.type != SPELL) 423 if (!at_spell || at_spell->type != SPELL)
637 at_spell = find_archetype_by_object_name (cp); 424 at_spell = find_archetype_by_object_name (cp);
638 if (!at_spell || at_spell->clone.type != SPELL) 425 if (!at_spell || at_spell->type != SPELL)
639 { 426 {
640 strcpy (spell_name, cp); 427 assign (spell_name, cp);
641 fsp = strchr (spell_name, ' '); 428 fsp = strchr (spell_name, ' ');
642 if (fsp) 429 if (fsp)
643 { 430 {
644 *fsp = 0; 431 *fsp = 0;
645 fsp++; 432 fsp++;
646 at_spell = find_archetype (spell_name); 433 at_spell = archetype::find (spell_name);
647 434
648 /* Got a spell, update the first string pointer */ 435 /* Got a spell, update the first string pointer */
649 if (at_spell && at_spell->clone.type == SPELL) 436 if (at_spell && at_spell->type == SPELL)
650 bp2 = cp + strlen (spell_name) + 1; 437 bp2 = cp + strlen (spell_name) + 1;
651 else 438 else
652 at_spell = NULL; 439 at_spell = NULL;
653 } 440 }
654 } 441 }
… …
656 /* OK - we didn't find a spell - presume the 'of' 443 /* OK - we didn't find a spell - presume the 'of'
657 * in this case means its an artifact. 444 * in this case means its an artifact.
658 */ 445 */
659 if (!at_spell) 446 if (!at_spell)
660 { 447 {
661 if (find_artifactlist (at->clone.type) == NULL) 448 if (find_artifactlist (at->type) == NULL)
662 {
663 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type); 449 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
664 }
665 else 450 else
666 { 451 {
667 art = find_artifactlist (at->clone.type)->items; 452 art = find_artifactlist (at->type)->items;
668 453
669 do 454 while (art)
670 { 455 {
671 if (!strcmp (art->item->name, cp)) 456 if (!strcmp (art->item->name, cp))
672 break; 457 break;
458
673 art = art->next; 459 art = art->next;
674 } 460 }
675 while (art != NULL); 461
676 if (!art) 462 if (!art)
677 {
678 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 463 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
679 }
680 } 464 }
465
681 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 466 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
682 } 467 }
683 } /* if cp */ 468 } /* if cp */
684 469
685 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 470 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
686 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 471 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
687 { 472 {
688 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp); 473 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp);
689 return 1; 474 return 1;
690 } 475 }
691 476
… …
693 * Rather than have two different blocks with a lot of similar code, 478 * Rather than have two different blocks with a lot of similar code,
694 * just create one object, do all the processing, and then determine 479 * just create one object, do all the processing, and then determine
695 * if that one object should be inserted or if we need to make copies. 480 * if that one object should be inserted or if we need to make copies.
696 */ 481 */
697 tmp = arch_to_object (at); 482 tmp = arch_to_object (at);
698 if (settings.real_wiz == FALSE) 483
699 SET_FLAG (tmp, FLAG_WAS_WIZ);
700 if (set_magic) 484 if (set_magic)
701 set_abs_magic (tmp, magic); 485 set_abs_magic (tmp, magic);
486
702 if (art) 487 if (art)
703 give_artifact_abilities (tmp, art->item); 488 give_artifact_abilities (tmp, art->item);
489
704 if (need_identify (tmp)) 490 if (need_identify (tmp))
705 { 491 {
706 SET_FLAG (tmp, FLAG_IDENTIFIED); 492 SET_FLAG (tmp, FLAG_IDENTIFIED);
707 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 493 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL);
708 } 494 }
… …
717 while (*bp2 && bp2 <= endline) 503 while (*bp2 && bp2 <= endline)
718 { 504 {
719 bp4 = NULL; 505 bp4 = NULL;
720 gotspace = 0; 506 gotspace = 0;
721 gotquote = 0; 507 gotquote = 0;
508
722 /* find the first quote */ 509 /* find the first quote */
723 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) 510 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
724 { 511 {
725 512
726 /* Found a quote - now lets find the second one */ 513 /* Found a quote - now lets find the second one */
… …
740 else 527 else
741 bp3++; 528 bp3++;
742 } 529 }
743 } 530 }
744 else if (*bp3 == ' ') 531 else if (*bp3 == ' ')
745 {
746 gotspace++; 532 gotspace++;
747 }
748 } 533 }
749 534
750 /* 535 /*
751 * If we got two spaces, send the second one to null. 536 * If we got two spaces, send the second one to null.
752 * if we've reached the end of the line, increase gotspace - 537 * if we've reached the end of the line, increase gotspace -
… …
770 * anyways. 555 * anyways.
771 */ 556 */
772 new_draw_info_format (NDI_UNIQUE, 0, op, "Malformed create line: %s", bp2); 557 new_draw_info_format (NDI_UNIQUE, 0, op, "Malformed create line: %s", bp2);
773 break; 558 break;
774 } 559 }
560
775 /* bp2 should still point to the start of this line, 561 /* bp2 should still point to the start of this line,
776 * with bp3 pointing to the end 562 * with bp3 pointing to the end
777 */ 563 */
778 if (set_variable (tmp, bp2) == -1) 564 if (set_variable (tmp, bp2) == -1)
779 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", bp2); 565 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", bp2);
780 else 566 else
781 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 567 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
568
782 bp2 = bp3 + 1; 569 bp2 = bp3 + 1;
783 } 570 }
784 571
785 if (at->clone.nrof) 572 if (at->nrof)
786 { 573 {
787 if (at_spell) 574 if (at_spell)
788 insert_ob_in_ob (arch_to_object (at_spell), tmp); 575 tmp->insert (arch_to_object (at_spell));
789 576
790 tmp->x = op->x; 577 tmp->x = op->x;
791 tmp->y = op->y; 578 tmp->y = op->y;
579 tmp->map = op->map;
580
792 if (set_nrof) 581 if (set_nrof)
793 tmp->nrof = nrof; 582 tmp->nrof = nrof;
794 tmp->map = op->map;
795 583
796 tmp = insert_ob_in_ob (tmp, op); 584 op->insert (tmp);
797 esrv_send_item (op, tmp);
798 585
799 /* Let's put this created item on stack so dm can access it easily. */ 586 /* Let's put this created item on stack so dm can access it easily. */
800 dm_stack_push (op->contr, tmp->count); 587 dm_stack_push (op->contr, tmp->count);
801 588
802 return 1; 589 return 1;
803 } 590 }
804 else 591 else
805 { 592 {
806 for (i = 0; i < (set_nrof ? nrof : 1); i++) 593 for (i = 0; i < (set_nrof ? nrof : 1); i++)
807 { 594 {
808 archetype *atmp;
809 object *prev = NULL, *head = NULL, *dup; 595 object *prev = 0, *head = 0;
810 596
811 for (atmp = at; atmp != NULL; atmp = atmp->more) 597 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
812 { 598 {
813 dup = arch_to_object (atmp); 599 object *dup = arch_to_object (atmp);
814 600
815 if (at_spell) 601 if (at_spell)
816 insert_ob_in_ob (arch_to_object (at_spell), dup); 602 insert_ob_in_ob (arch_to_object (at_spell), dup);
817 603
818 /* 604 /*
819 * The head is what contains all the important bits, 605 * The head is what contains all the important bits,
820 * so just copying it over should be fine. 606 * so just copying it over should be fine.
821 */ 607 */
822 if (head == NULL) 608 if (!head)
823 { 609 {
824 head = dup; 610 head = dup;
825 copy_object (tmp, dup); 611 tmp->copy_to (dup);
826 } 612 }
827 if (settings.real_wiz == FALSE) 613
828 SET_FLAG (dup, FLAG_WAS_WIZ);
829 dup->x = op->x + dup->arch->clone.x; 614 dup->x = op->x + dup->arch->x;
830 dup->y = op->y + dup->arch->clone.y; 615 dup->y = op->y + dup->arch->y;
831 dup->map = op->map; 616 dup->map = op->map;
832 617
833 if (head != dup) 618 if (head != dup)
834 { 619 {
835 dup->head = head; 620 dup->head = head;
836 prev->more = dup; 621 prev->more = dup;
837 } 622 }
623
838 prev = dup; 624 prev = dup;
839 } 625 }
840 626
841 if (QUERY_FLAG (head, FLAG_ALIVE)) 627 if (QUERY_FLAG (head, FLAG_ALIVE))
842 { 628 {
… …
844 int size_x = 0; 630 int size_x = 0;
845 int size_y = 0; 631 int size_y = 0;
846 632
847 while (check) 633 while (check)
848 { 634 {
849 size_x = MAX (size_x, check->arch->clone.x); 635 size_x = MAX (size_x, check->arch->x);
850 size_y = MAX (size_y, check->arch->clone.y); 636 size_y = MAX (size_y, check->arch->y);
851 check = check->more; 637 check = check->more;
852 } 638 }
853 639
854 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 640 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
855 { 641 {
856 if (head->x < size_x || head->y < size_y) 642 if (head->x < size_x || head->y < size_y)
857 { 643 {
858 dm_stack_pop (op->contr); 644 dm_stack_pop (op->contr);
859 free_object (head); 645 head->destroy ();
860 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 646 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
861 free_object (tmp); 647 tmp->destroy ();
862 return 1; 648 return 1;
863 } 649 }
864 650
865 check = head; 651 check = head;
652
866 while (check) 653 while (check)
867 { 654 {
868 check->x -= size_x; 655 check->x -= size_x;
869 check->y -= size_y; 656 check->y -= size_y;
870 check = check->more; 657 check = check->more;
… …
880 /* Wonder if we really want to push all of these, but since 667 /* Wonder if we really want to push all of these, but since
881 * things like rods have nrof 0, we want to cover those. 668 * things like rods have nrof 0, we want to cover those.
882 */ 669 */
883 dm_stack_push (op->contr, head->count); 670 dm_stack_push (op->contr, head->count);
884 671
885 if (at->clone.randomitems != NULL && !at_spell) 672 if (at->randomitems && !at_spell)
886 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 673 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
887 esrv_send_item (op, head);
888 } 674 }
889 675
890 /* free the one we used to copy */ 676 /* free the one we used to copy */
891 free_object (tmp); 677 tmp->destroy ();
892 } 678 }
893 679
894 return 1; 680 return 1;
895} 681}
896 682
… …
899 */ 685 */
900 686
901int 687int
902command_inventory (object *op, char *params) 688command_inventory (object *op, char *params)
903{ 689{
690 int i;
904 object *tmp; 691 object *tmp;
905 int i;
906 692
907 if (!params) 693 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
908 { 694 {
909 inventory (op, NULL); 695 op->contr->failmsg ("Inventory of what object (nr)?");
910 return 0; 696 return 1;
911 }
912
913 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
914 { 697 }
915 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
916 return 1;
917 }
918 698
919 inventory (op, tmp); 699 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
700
920 return 1; 701 return 1;
921} 702}
922 703
923/* just show player's their skills for now. Dm's can 704/* just show player's their skills for now. Dm's can
924 * already see skills w/ inventory command - b.t. 705 * already see skills w/ inventory command - b.t.
… …
938 719
939 tmp = get_dm_object (op->contr, &params, NULL); 720 tmp = get_dm_object (op->contr, &params, NULL);
940 if (!tmp) 721 if (!tmp)
941 return 1; 722 return 1;
942 723
943 dump_object (tmp); 724 char *dump = dump_object (tmp);
944 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 725 new_draw_info (NDI_UNIQUE, 0, op, dump);
726 free (dump);
727
945 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 728 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
946 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 729 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
947 return 1;
948}
949 730
950/**
951 * When DM is possessing a monster, flip aggression on and off, to allow
952 * better motion.
953 */
954int
955command_mon_aggr (object *op, char *params)
956{
957 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
958 {
959 op->enemy = NULL;
960 SET_FLAG (op, FLAG_UNAGGRESSIVE);
961 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
962 }
963 else
964 {
965 CLEAR_FLAG (op, FLAG_FRIENDLY);
966 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
967 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
968 }
969
970 return 1;
971}
972
973/** DM can possess a monster. Basically, this tricks the client into thinking
974 * a given monster, is actually the player it controls. This allows a DM
975 * to inhabit a monster's body, and run around the game with it.
976 * This function is severely broken - it has tons of hardcoded values,
977 */
978int
979command_possess (object *op, char *params)
980{
981 object *victim, *curinv, *nextinv;
982 player *pl;
983 int i;
984 char buf[MAX_BUF];
985
986 victim = NULL;
987 if (params != NULL)
988 {
989 if (sscanf (params, "%d", &i))
990 victim = find_object (i);
991 else if (sscanf (params, "%s", buf))
992 victim = find_object_name (buf);
993 }
994 if (victim == NULL)
995 {
996 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
997 return 1;
998 }
999
1000 if (victim == op)
1001 {
1002 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
1003 return 1;
1004 }
1005
1006 /* clear out the old inventory */
1007 curinv = op->inv;
1008 while (curinv != NULL)
1009 {
1010 nextinv = curinv->below;
1011 esrv_del_item (op->contr, curinv->count);
1012 curinv = nextinv;
1013 }
1014
1015 /* make the switch */
1016 pl = op->contr;
1017 victim->contr = pl;
1018 pl->ob = victim;
1019 victim->type = PLAYER;
1020 SET_FLAG (victim, FLAG_WIZ);
1021
1022 /* send the inventory to the client */
1023 curinv = victim->inv;
1024 while (curinv != NULL)
1025 {
1026 nextinv = curinv->below;
1027 esrv_send_item (victim, curinv);
1028 curinv = nextinv;
1029 }
1030 /* basic patchup */
1031 /* The use of hard coded values is terrible. Note
1032 * that really, to be fair, this shouldn't get changed at
1033 * all - if you are possessing a kobold, you should have the
1034 * same limitations. As it is, as more body locations are added,
1035 * this will give this player more locations than perhaps
1036 * they should be allowed.
1037 */
1038 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1039 if (i == 1 || i == 6 || i == 8 || i == 9)
1040 victim->body_info[i] = 2;
1041 else
1042 victim->body_info[i] = 1;
1043
1044 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
1045 esrv_send_inventory (victim, victim);
1046
1047 fix_player (victim);
1048
1049 do_some_living (victim);
1050 return 1; 731 return 1;
1051} 732}
1052 733
1053int 734int
1054command_patch (object *op, char *params) 735command_patch (object *op, char *params)
… …
1069 return 1; 750 return 1;
1070 } 751 }
1071 752
1072 if ((arg2 = strchr (arg, ' '))) 753 if ((arg2 = strchr (arg, ' ')))
1073 arg2++; 754 arg2++;
1074 if (settings.real_wiz == FALSE) 755
1075 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
1076 if (set_variable (tmp, arg) == -1) 756 if (set_variable (tmp, arg) == -1)
1077 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 757 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
1078 else 758 else
1079 {
1080 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 759 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
1081 }
1082 760
1083 return 1; 761 return 1;
1084} 762}
1085 763
1086int 764int
… …
1113 dm_stack_pop (op->contr); 791 dm_stack_pop (op->contr);
1114 792
1115 /* Always work on the head - otherwise object will get in odd state */ 793 /* Always work on the head - otherwise object will get in odd state */
1116 if (tmp->head) 794 if (tmp->head)
1117 tmp = tmp->head; 795 tmp = tmp->head;
1118 remove_ob (tmp); 796 tmp->remove ();
1119 return 1; 797 return 1;
1120} 798}
1121 799
1122int 800int
1123command_free (object *op, char *params) 801command_free (object *op, char *params)
… …
1135 813
1136 if (from != STACK_FROM_STACK) 814 if (from != STACK_FROM_STACK)
1137 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 815 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1138 dm_stack_pop (op->contr); 816 dm_stack_pop (op->contr);
1139 817
1140 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1141 {
1142 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1143 remove_ob (tmp);
1144 }
1145
1146 if (tmp->head) 818 if (tmp->head)
1147 tmp = tmp->head; 819 tmp = tmp->head;
1148 free_object (tmp); 820
821 tmp->destroy ();
1149 return 1; 822 return 1;
1150} 823}
1151 824
1152/** 825/**
1153 * This adds exp to a player. We now allow adding to a specific skill. 826 * This adds exp to a player. We now allow adding to a specific skill.
1154 */ 827 */
1155int 828int
1156command_addexp (object *op, char *params) 829command_addexp (object *op, char *params)
1157{ 830{
1158 char buf[MAX_BUF], skill[MAX_BUF]; 831 char buf[MAX_BUF], skill[MAX_BUF];
1159 int i, q; 832 int q;
833 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1160 object *skillob = NULL; 834 object *skillob = NULL;
1161 player *pl;
1162 835
1163 skill[0] = '\0'; 836 skill[0] = '\0';
1164 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 837 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %s", buf, &i, skill)) < 2))
1165 { 838 {
1166 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 839 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1167 return 1; 840 return 1;
1168 } 841 }
1169 842
1170 for (pl = first_player; pl != NULL; pl = pl->next) 843 for_all_players (pl)
1171 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 844 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1172 break;
1173
1174 if (pl == NULL)
1175 { 845 {
1176 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1177 return 1;
1178 }
1179
1180 if (q >= 3) 846 if (q >= 3)
1181 { 847 {
1182 skillob = find_skill_by_name (pl->ob, skill); 848 skillob = find_skill_by_name (pl->ob, skill);
1183 if (!skillob) 849 if (!skillob)
1184 { 850 {
1185 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 851 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
852 return 1;
853 }
854
855 i = check_exp_adjust (skillob, i);
856 skillob->stats.exp += i;
857 calc_perm_exp (skillob);
858 player_lvl_adj (pl->ob, skillob);
859 }
860
861 pl->ob->stats.exp += i;
862 calc_perm_exp (pl->ob);
863 player_lvl_adj (pl->ob, NULL);
864
1186 return 1; 865 return 1;
1187 } 866 }
1188 867
1189 i = check_exp_adjust (skillob, i); 868 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1190 skillob->stats.exp += i;
1191 calc_perm_exp (skillob);
1192 player_lvl_adj (pl->ob, skillob);
1193 }
1194
1195 pl->ob->stats.exp += i;
1196 calc_perm_exp (pl->ob);
1197 player_lvl_adj (pl->ob, NULL);
1198
1199 if (settings.real_wiz == FALSE)
1200 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1201 return 1; 869 return 1;
1202} 870}
1203 871
1204/**************************************************************************/ 872/**************************************************************************/
1205 873
… …
1211 879
1212int 880int
1213command_stats (object *op, char *params) 881command_stats (object *op, char *params)
1214{ 882{
1215 char thing[20]; 883 char thing[20];
1216 player *pl;
1217 char buf[MAX_BUF]; 884 char buf[MAX_BUF];
1218 885
1219 thing[0] = '\0'; 886 thing[0] = '\0';
1220 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 887 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1221 { 888 {
1222 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 889 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1223 return 1; 890 return 1;
1224 } 891 }
1225 892
1226 for (pl = first_player; pl != NULL; pl = pl->next) 893 for_all_players (pl)
1227 if (!strcmp (pl->ob->name, thing)) 894 if (!strcmp (pl->ob->name, thing))
1228 { 895 {
1229 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 896 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1230 new_draw_info (NDI_UNIQUE, 0, op, buf); 897 new_draw_info (NDI_UNIQUE, 0, op, buf);
1231 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 898 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
1232 new_draw_info (NDI_UNIQUE, 0, op, buf); 899 new_draw_info (NDI_UNIQUE, 0, op, buf);
1233 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 900 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1234 new_draw_info (NDI_UNIQUE, 0, op, buf); 901 new_draw_info (NDI_UNIQUE, 0, op, buf);
1235 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 902 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1236 new_draw_info (NDI_UNIQUE, 0, op, buf); 903 new_draw_info (NDI_UNIQUE, 0, op, buf);
1237 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 904 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1238 new_draw_info (NDI_UNIQUE, 0, op, buf); 905 new_draw_info (NDI_UNIQUE, 0, op, buf);
1239 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 906 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1240 new_draw_info (NDI_UNIQUE, 0, op, buf); 907 new_draw_info (NDI_UNIQUE, 0, op, buf);
1241 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 908 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1242 new_draw_info (NDI_UNIQUE, 0, op, buf); 909 new_draw_info (NDI_UNIQUE, 0, op, buf);
1243 break; 910 return 1;
1244 } 911 }
1245 if (pl == NULL) 912
1246 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 913 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1247 return 1; 914 return 1;
1248} 915}
1249 916
1250int 917int
1251command_abil (object *op, char *params) 918command_abil (object *op, char *params)
1252{ 919{
1253 char thing[20], thing2[20]; 920 char thing[20], thing2[20];
1254 int iii; 921 int iii;
1255 player *pl;
1256 char buf[MAX_BUF]; 922 char buf[MAX_BUF];
1257 923
1258 iii = 0; 924 iii = 0;
1259 thing[0] = '\0'; 925 thing[0] = '\0';
1260 thing2[0] = '\0'; 926 thing2[0] = '\0';
… …
1274 { 940 {
1275 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 941 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1276 return 1; 942 return 1;
1277 } 943 }
1278 944
1279 for (pl = first_player; pl != NULL; pl = pl->next) 945 for_all_players (pl)
1280 { 946 {
1281 if (!strcmp (pl->ob->name, thing)) 947 if (!strcmp (pl->ob->name, thing))
1282 { 948 {
1283 if (settings.real_wiz == FALSE)
1284 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1285 if (!strcmp ("str", thing2))
1286 pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 949 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
1287 if (!strcmp ("dex", thing2))
1288 pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 950 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
1289 if (!strcmp ("con", thing2))
1290 pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 951 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
1291 if (!strcmp ("wis", thing2))
1292 pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 952 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
1293 if (!strcmp ("cha", thing2))
1294 pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii; 953 if (!strcmp ("cha", thing2)) pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii;
1295 if (!strcmp ("int", thing2))
1296 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 954 if (!strcmp ("int", thing2)) pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1297 if (!strcmp ("pow", thing2))
1298 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 955 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
956
1299 sprintf (buf, "%s has been altered.", &pl->ob->name); 957 sprintf (buf, "%s has been altered.", &pl->ob->name);
1300 new_draw_info (NDI_UNIQUE, 0, op, buf); 958 new_draw_info (NDI_UNIQUE, 0, op, buf);
1301 fix_player (pl->ob); 959 pl->ob->update_stats ();
1302 return 1; 960 return 1;
1303 } 961 }
1304 } 962 }
1305 963
1306 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 964 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1307 return 1; 965 return 1;
1308} 966}
1309 967
1310int 968int
1311command_reset (object *op, char *params)
1312{
1313 mapstruct *m;
1314 object *dummy = NULL, *tmp = NULL;
1315
1316 if (params == NULL)
1317 {
1318 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1319 return 1;
1320 }
1321
1322 if (strcmp (params, ".") == 0)
1323 params = op->map->path;
1324 m = has_been_loaded (params);
1325 if (m == NULL)
1326 {
1327 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1328 return 1;
1329 }
1330
1331 if (m->in_memory != MAP_SWAPPED)
1332 {
1333 if (m->in_memory != MAP_IN_MEMORY)
1334 {
1335 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1336 return 0;
1337 }
1338
1339 /*
1340 * Only attempt to remove the player that is doing the reset, and not other
1341 * players or wiz's.
1342 */
1343 if (op->map == m)
1344 {
1345 dummy = get_object ();
1346 dummy->map = NULL;
1347 EXIT_X (dummy) = op->x;
1348 EXIT_Y (dummy) = op->y;
1349 EXIT_PATH (dummy) = op->map->path;
1350 remove_ob (op);
1351 op->map = NULL;
1352 tmp = op;
1353 }
1354 swap_map (m);
1355 }
1356
1357 if (m->in_memory == MAP_SWAPPED)
1358 {
1359 LOG (llevDebug, "Resetting map %s.\n", m->path);
1360
1361 /* setting this effectively causes an immediate reload */
1362 m->reset_time = 1;
1363 flush_old_maps ();
1364 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1365 if (tmp)
1366 {
1367 enter_exit (tmp, dummy);
1368 free_object (dummy);
1369 }
1370 return 1;
1371 }
1372 else
1373 {
1374 player *pl;
1375 int playercount = 0;
1376
1377 /* Need to re-insert player if swap failed for some reason */
1378 if (tmp)
1379 {
1380 insert_ob_in_map (op, m, NULL, 0);
1381 free_object (dummy);
1382 }
1383
1384 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1385 for (pl = first_player; pl != NULL; pl = pl->next)
1386 {
1387 if (pl->ob->map == m && pl->ob != op)
1388 {
1389 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1390 playercount++;
1391 }
1392 }
1393 if (!playercount)
1394 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1395 return 1;
1396 }
1397}
1398
1399int
1400command_nowiz (object *op, char *params) 969command_nowiz (object *op, char *params)
1401{ /* 'noadm' is alias */ 970{ /* 'nodm' is alias */
1402 CLEAR_FLAG (op, FLAG_WIZ); 971 CLEAR_FLAG (op, FLAG_WIZ);
1403 CLEAR_FLAG (op, FLAG_WIZPASS); 972 CLEAR_FLAG (op, FLAG_WIZPASS);
1404 CLEAR_FLAG (op, FLAG_WIZCAST); 973 CLEAR_FLAG (op, FLAG_WIZCAST);
1405 974
1406 if (settings.real_wiz == TRUE)
1407 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1408 if (op->contr->hidden) 975 if (op->contr->hidden)
1409 { 976 {
1410 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 977 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1411 op->map->players++; 978 op->map->players++;
1412 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 979 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
… …
1471 { 1038 {
1472 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1039 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1473 return 0; 1040 return 0;
1474 } 1041 }
1475 1042
1476 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1043 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1477 { 1044 {
1478 SET_FLAG (op, FLAG_WIZ); 1045 SET_FLAG (op, FLAG_WIZ);
1479 SET_FLAG (op, FLAG_WAS_WIZ);
1480 SET_FLAG (op, FLAG_WIZPASS); 1046 SET_FLAG (op, FLAG_WIZPASS);
1481 SET_FLAG (op, FLAG_WIZCAST); 1047 SET_FLAG (op, FLAG_WIZCAST);
1048
1482 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1049 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1483 /* 1050 /*
1484 * Remove setting flying here - that won't work, because next 1051 * Remove setting flying here - that won't work, because next
1485 * fix_player() is called that will get cleared - proper solution 1052 * fix_player() is called that will get cleared - proper solution
1486 * is probably something like a wiz_force which gives that and any 1053 * is probably something like a wiz_force which gives that and any
1487 * other desired abilities. 1054 * other desired abilities.
1488 */ 1055 */
1489 clear_los (op); 1056 op->contr->clear_los (0);
1490 op->contr->write_buf[0] = '\0'; 1057 op->contr->write_buf[0] = '\0';
1491 1058
1492 if (!silent) 1059 if (!silent)
1493 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1060 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1494 1061
… …
1521command_invisible (object *op, char *params) 1088command_invisible (object *op, char *params)
1522{ 1089{
1523 if (op) 1090 if (op)
1524 { 1091 {
1525 op->invisible += 100; 1092 op->invisible += 100;
1526 update_object (op, UP_OBJ_FACE); 1093 update_object (op, UP_OBJ_CHANGE);
1527 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1094 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1528 } 1095 }
1529 1096
1530 return 0; 1097 return 0;
1531} 1098}
… …
1543 * name than other "spell_xxx" archetypes and would always conflict. 1110 * name than other "spell_xxx" archetypes and would always conflict.
1544 */ 1111 */
1545static object * 1112static object *
1546get_spell_by_name (object *op, const char *spell_name) 1113get_spell_by_name (object *op, const char *spell_name)
1547{ 1114{
1548 archetype *ar; 1115 archetype *at;
1549 archetype *found; 1116 archetype *found;
1550 int conflict_found; 1117 int conflict_found;
1551 size_t spell_name_length; 1118 size_t spell_name_length;
1552 1119
1553 /* First check for full name matches. */ 1120 /* First check for full name matches. */
1554 conflict_found = 0; 1121 conflict_found = 0;
1555 found = NULL; 1122 found = NULL;
1556 for (ar = first_archetype; ar != NULL; ar = ar->next) 1123 for_all_archetypes (at)
1557 { 1124 {
1558 if (ar->clone.type != SPELL) 1125 if (at->type != SPELL)
1559 continue; 1126 continue;
1560 1127
1561 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1128 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1562 continue; 1129 continue;
1563 1130
1564 if (strcmp (ar->clone.name, spell_name) != 0) 1131 if (strcmp (at->object::name, spell_name) != 0)
1565 continue; 1132 continue;
1566 1133
1567 if (found != NULL) 1134 if (found != NULL)
1568 { 1135 {
1569 if (!conflict_found) 1136 if (!conflict_found)
1570 { 1137 {
1571 conflict_found = 1; 1138 conflict_found = 1;
1572 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1139 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name);
1573 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1140 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1574 } 1141 }
1142
1575 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1143 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1576 continue; 1144 continue;
1577 } 1145 }
1578 1146
1579 found = ar; 1147 found = at;
1580 } 1148 }
1581 1149
1582 /* No match if more more than one archetype matches. */ 1150 /* No match if more more than one archetype matches. */
1583 if (conflict_found) 1151 if (conflict_found)
1584 return NULL; 1152 return NULL;
… …
1589 1157
1590 /* No full match found: now check for partial matches. */ 1158 /* No full match found: now check for partial matches. */
1591 spell_name_length = strlen (spell_name); 1159 spell_name_length = strlen (spell_name);
1592 conflict_found = 0; 1160 conflict_found = 0;
1593 found = NULL; 1161 found = NULL;
1594 for (ar = first_archetype; ar != NULL; ar = ar->next) 1162 for_all_archetypes (at)
1595 { 1163 {
1596 if (ar->clone.type != SPELL) 1164 if (at->type != SPELL)
1597 continue; 1165 continue;
1598 1166
1599 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1167 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1600 continue; 1168 continue;
1601 1169
1602 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1170 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1603 continue; 1171 continue;
1604 1172
1605 if (found != NULL) 1173 if (found != NULL)
1606 { 1174 {
1607 if (!conflict_found) 1175 if (!conflict_found)
1608 { 1176 {
1609 conflict_found = 1; 1177 conflict_found = 1;
1610 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name); 1178 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1611 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name); 1179 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1612 } 1180 }
1613 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name); 1181 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1614 continue; 1182 continue;
1615 } 1183 }
1616 1184
1617 found = ar; 1185 found = at;
1618 } 1186 }
1619 1187
1620 /* No match if more more than one archetype matches. */ 1188 /* No match if more more than one archetype matches. */
1621 if (conflict_found) 1189 if (conflict_found)
1622 return NULL; 1190 return NULL;
… …
1652 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1220 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1653 return 0; 1221 return 0;
1654 } 1222 }
1655 1223
1656 do_learn_spell (op, tmp, special_prayer); 1224 do_learn_spell (op, tmp, special_prayer);
1657 free_object (tmp); 1225 tmp->destroy ();
1658 return 1; 1226 return 1;
1659} 1227}
1660 1228
1661int 1229int
1662command_learn_spell (object *op, char *params) 1230command_learn_spell (object *op, char *params)
… …
1687 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1255 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1688 return 0; 1256 return 0;
1689 } 1257 }
1690 1258
1691 do_forget_spell (op, spell->name); 1259 do_forget_spell (op, spell->name);
1692 return 1;
1693}
1694
1695/**
1696 * Lists all plugins currently loaded with their IDs and full names.
1697 */
1698int
1699command_listplugins (object *op, char *params)
1700{
1701 plugins_display_list (op);
1702 return 1;
1703}
1704
1705/**
1706 * Loads the given plugin. The DM specifies the name of the library to load (no
1707 * pathname is needed). Do not ever attempt to load the same plugin more than
1708 * once at a time, or bad things could happen.
1709 */
1710int
1711command_loadplugin (object *op, char *params)
1712{
1713 char buf[MAX_BUF];
1714
1715 if (params == NULL)
1716 {
1717 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1718 return 1;
1719 }
1720
1721 strcpy (buf, LIBDIR);
1722 strcat (buf, "/plugins/");
1723 strcat (buf, params);
1724 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1725 if (plugins_init_plugin (buf) == 0)
1726 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1727 else
1728 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1729 return 1;
1730}
1731
1732/**
1733 * Unloads the given plugin. The DM specified the ID of the library to unload.
1734 * Note that some things may behave strangely if the correct plugins are not
1735 * loaded.
1736 */
1737int
1738command_unloadplugin (object *op, char *params)
1739{
1740 if (params == NULL)
1741 {
1742 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1743 return 1;
1744 }
1745
1746 if (plugins_remove_plugin (params) == 0)
1747 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1748 else
1749 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1750 return 1; 1260 return 1;
1751} 1261}
1752 1262
1753/** 1263/**
1754 * A players wants to become DM and hide. 1264 * A players wants to become DM and hide.
… …
2074 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1584 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
2075 return 0; 1585 return 0;
2076 } 1586 }
2077 1587
2078 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1588 if (!QUERY_FLAG (right, FLAG_REMOVED))
2079 remove_ob (right); 1589 right->remove ();
1590
2080 inserted = insert_ob_in_ob (right, left); 1591 insert_ob_in_ob (right, left);
2081 if (left->type == PLAYER)
2082 if (inserted == right)
2083 esrv_send_item (left, right);
2084 else
2085 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
2086 1592
2087 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1593 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
2088 1594
2089 return 0; 1595 return 0;
2090 1596

Diff Legend

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