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.12 by root, Thu Sep 14 22:34:03 2006 UTC vs.
Revision 1.48 by root, Tue Jun 5 13:05:02 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 GNU General Public License along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
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 <crossfire@schmorp.de>
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 **/
… …
47 * other player, or NULL otherwise. 46 * other player, or NULL otherwise.
48 */ 47 */
49static player * 48static player *
50get_other_player_from_name (object *op, char *name) 49get_other_player_from_name (object *op, char *name)
51{ 50{
52 player *pl;
53
54 if (!name) 51 if (!name)
55 return NULL; 52 return NULL;
56 53
57 for (pl = first_player; pl != NULL; pl = pl->next) 54 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 55 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 56 {
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
64 return NULL;
65 }
66
67 if (pl->ob == op) 57 if (pl->ob == op)
68 { 58 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 59 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 60 return NULL;
71 } 61 }
62
72 if (pl->state != ST_PLAYING) 63 if (pl->ns->state != ST_PLAYING)
73 { 64 {
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 65 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
75 return NULL; 66 return NULL;
76 }
77 return pl;
78}
79
80/**
81 * This command will stress server.
82 */
83int
84command_loadtest (object *op, char *params)
85{
86 uint32 x, y;
87 char buf[1024];
88
89 new_draw_info (NDI_UNIQUE, 0, op, "loadtest will stress server through teleporting");
90 new_draw_info (NDI_UNIQUE, 0, op, "at different map places.");
91 new_draw_info (NDI_UNIQUE, 0, op, "use at your own risks.");
92 new_draw_info (NDI_UNIQUE, 0, op, "Very long loop used so server may have to be reset.");
93 new_draw_info (NDI_UNIQUE, 0, op, "type loadtest TRUE to run");
94 new_draw_info_format (NDI_UNIQUE, 0, op, "{%s}", params);
95
96 if (!params)
97 return 0;
98
99 if (strncmp (params, "TRUE", 4))
100 return 0;
101
102 new_draw_info_format (NDI_UNIQUE, 0, op, "gogogo");
103
104 for (x = 0; x < settings.worldmaptilesx; x++)
105 {
106 for (y = 0; y < settings.worldmaptilesy; y++)
107 {
108 sprintf (buf, "/world/world_%d_%d", x + settings.worldmapstartx, y + settings.worldmapstarty);
109 command_goto (op, buf);
110 } 67 }
68
69 return pl;
111 } 70 }
112 71
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
113 return 0; 73 return 0;
114} 74}
115 75
116/** 76/**
117 * Actually hides specified player (obviously a DM). 77 * Actually hides specified player (obviously a DM).
… …
126 op->contr->hidden = 0; 86 op->contr->hidden = 0;
127 op->invisible = 1; 87 op->invisible = 1;
128 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 88 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
129 op->map->players++; 89 op->map->players++;
130 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 90 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
91
131 if (!silent_dm) 92 if (!silent_dm)
132 {
133 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 93 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
134 }
135 } 94 }
136 else 95 else
137 { 96 {
138 op->contr->hidden = 1; 97 op->contr->hidden = 1;
139 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); 98 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
140 op->map->players--; 99 op->map->players--;
100
141 if (!silent_dm) 101 if (!silent_dm)
142 {
143 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 102 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
144 } 103
145 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); 104 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name);
146 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); 105 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name);
147 } 106 }
148} 107}
149 108
… …
213 172
214 become_follower (ob, god); 173 become_follower (ob, god);
215 return 1; 174 return 1;
216} 175}
217 176
218/** 177// TODO: Rewrite banish in perl and get rid of the following two functions
219 * Add player's IP to ban_file and kick them off the server
220 * I know most people have dynamic IPs but this is more of a short term
221 * solution if they have to get a new IP to play maybe they'll calm down.
222 * This uses the banish_file in the local directory *not* the ban_file
223 * The action is logged with a ! for easy searching. -tm
224 */
225int
226command_banish (object *op, char *params)
227{
228 player *pl;
229 FILE *banishfile;
230 char buf[MAX_BUF];
231 time_t now;
232
233 if (!params)
234 {
235 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
236 return 1;
237 }
238
239 pl = get_other_player_from_name (op, params);
240 if (!pl)
241 return 1;
242
243 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
244
245 if ((banishfile = fopen (buf, "a")) == NULL)
246 {
247 LOG (llevDebug, "Could not find file banish_file.\n");
248 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
249 return 0;
250 }
251
252 now = time (NULL);
253 /*
254 * Record this as a comment - then we don't have to worry about changing
255 * the parsing code.
256 */
257 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket.host, &op->name, ctime (&now));
258 fprintf (banishfile, "*@%s\n", pl->socket.host);
259 fclose (banishfile);
260
261 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host);
262 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
263 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
264 command_kick (op, (char *) &pl->ob->name);
265 return 1;
266}
267
268int 178int
269command_kick (object *op, char *params) 179command_kick (object *op, char *params)
270{ 180{
271 struct pl *pl; 181 for_all_players (pl)
272
273 for (pl = first_player; pl != NULL; pl = pl->next)
274 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) 182 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
275 { 183 {
276 object *op = pl->ob; 184 object *op = pl->ob;
277 185
278 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 186 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
279 { 187 {
280 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 188 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
281 strcpy (op->contr->killer, "kicked"); 189 strcpy (op->contr->killer, "kicked");
282 } 190 }
283 191
284 pl->socket.status = Ns_Dead; 192 pl->ns->destroy ();
285 } 193 }
286 194
287 return 1; 195 return 1;
288} 196}
289 197
198//TODO
199#if 0
290int 200int
291command_save_overlay (object *op, char *params) 201command_save_overlay (object *op, char *params)
292{ 202{
293 if (!op) 203 if (!op)
294 return 0; 204 return 0;
… …
305 215
306 ready_map_name (op->map->path, 0); 216 ready_map_name (op->map->path, 0);
307 217
308 return 1; 218 return 1;
309} 219}
310 220#endif
311int
312command_shutdown (object *op, char *params)
313{
314 struct pl *pl;
315
316 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
317 {
318 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
319 return 1;
320 }
321
322 for (pl = first_player; pl != NULL; pl = pl->next)
323 save_player (pl->ob, 0);
324
325 for (pl = first_player; pl != NULL; pl = pl->next)
326 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
327 leave_map (pl->ob);
328
329 cleanup ();
330 /* not reached */
331 return 1;
332}
333
334int
335command_goto (object *op, char *params)
336{
337 char *name;
338 object *dummy;
339
340 if (!op)
341 return 0;
342
343 if (params == NULL)
344 {
345 new_draw_info (NDI_UNIQUE, 0, op, "Go to what level?");
346 return 1;
347 }
348
349 name = params;
350 dummy = get_object ();
351 dummy->map = op->map;
352 EXIT_PATH (dummy) = name;
353 dummy->name = name;
354
355 enter_exit (op, dummy);
356 free_object (dummy);
357 if (op->contr->loading == NULL)
358 {
359 new_draw_info_format (NDI_UNIQUE, 0, op, "Difficulty: %d.", op->map->difficulty);
360 }
361
362 return 1;
363}
364
365/* is this function called from somewhere ? -Tero */
366int
367command_generate (object *op, char *params)
368{
369 object *tmp;
370 int nr = 1, i, retry;
371
372 if (!op)
373 return 0;
374
375 if (params != NULL)
376 sscanf (params, "%d", &nr);
377 for (i = 0; i < nr; i++)
378 {
379 retry = 50;
380 while ((tmp = generate_treasure (0, op->map->difficulty)) == NULL && --retry)
381 ;
382 if (tmp != NULL)
383 {
384 tmp = insert_ob_in_ob (tmp, op);
385 if (op->type == PLAYER)
386 esrv_send_item (op, tmp);
387 }
388 }
389
390 return 1;
391}
392 221
393int 222int
394command_freeze (object *op, char *params) 223command_freeze (object *op, char *params)
395{ 224{
396 int ticks; 225 int ticks;
… …
432 object *dummy; 261 object *dummy;
433 player *pl; 262 player *pl;
434 263
435 if (!op) 264 if (!op)
436 return 0; 265 return 0;
266
437 if (params == NULL) 267 if (params == NULL)
438 { 268 {
439 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 269 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
440 return 1; 270 return 1;
441 } 271 }
272
442 pl = get_other_player_from_name (op, params); 273 pl = get_other_player_from_name (op, params);
443 if (!pl) 274 if (!pl)
444 return 1; 275 return 1;
276
445 dummy = get_jail_exit (pl->ob); 277 dummy = get_jail_exit (pl->ob);
446 if (!dummy) 278 if (!dummy)
447 { 279 {
448 /* we have nowhere to send the prisoner.... */ 280 /* we have nowhere to send the prisoner.... */
449 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 281 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
450 return 0; 282 return 0;
451 } 283 }
452 enter_exit (pl->ob, dummy); 284
453 free_object (dummy); 285 pl->ob->enter_exit (dummy);
286 dummy->destroy ();
454 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.");
455 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 288 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
456 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);
457 return 1; 290 return 1;
458} 291}
… …
482 { 315 {
483 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.");
484 return 1; 317 return 1;
485 } 318 }
486 319
487 dummy = get_object (); 320 dummy = object::create ();
488 EXIT_PATH (dummy) = op->map->path; 321 EXIT_PATH (dummy) = op->map->path;
489 EXIT_X (dummy) = op->x + freearr_x[i]; 322 EXIT_X (dummy) = op->x + freearr_x[i];
490 EXIT_Y (dummy) = op->y + freearr_y[i]; 323 EXIT_Y (dummy) = op->y + freearr_y[i];
491 enter_exit (pl->ob, dummy); 324 pl->ob->enter_exit (dummy);
492 free_object (dummy); 325 dummy->destroy ();
493 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 326 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
494 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 327 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
495 328
496 return 1;
497}
498
499/**
500 * Teleport next to target player.
501 */
502
503/* mids 01/16/2002 */
504int
505command_teleport (object *op, char *params)
506{
507 int i;
508 object *dummy;
509 player *pl;
510
511 if (!op)
512 return 0;
513
514 if (params == NULL)
515 {
516 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
517 return 1;
518 }
519
520 pl = get_other_player_from_name (op, params);
521 if (!pl)
522 return 1;
523
524 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
525 if (i == -1)
526 {
527 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
528 return 1;
529 }
530
531 dummy = get_object ();
532 EXIT_PATH (dummy) = pl->ob->map->path;
533 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
534 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
535 enter_exit (op, dummy);
536 free_object (dummy);
537 if (!op->contr->hidden)
538 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
539 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
540 return 1; 329 return 1;
541} 330}
542 331
543/** 332/**
544 * This function is a real mess, because we're stucking getting 333 * This function is a real mess, because we're stucking getting
… …
634 * we also set up spell_name which is only 423 * we also set up spell_name which is only
635 * the first word. 424 * the first word.
636 */ 425 */
637 426
638 at_spell = archetype::find (cp); 427 at_spell = archetype::find (cp);
639 if (!at_spell || at_spell->clone.type != SPELL) 428 if (!at_spell || at_spell->type != SPELL)
640 at_spell = find_archetype_by_object_name (cp); 429 at_spell = find_archetype_by_object_name (cp);
641 if (!at_spell || at_spell->clone.type != SPELL) 430 if (!at_spell || at_spell->type != SPELL)
642 { 431 {
643 strcpy (spell_name, cp); 432 assign (spell_name, cp);
644 fsp = strchr (spell_name, ' '); 433 fsp = strchr (spell_name, ' ');
645 if (fsp) 434 if (fsp)
646 { 435 {
647 *fsp = 0; 436 *fsp = 0;
648 fsp++; 437 fsp++;
649 at_spell = archetype::find (spell_name); 438 at_spell = archetype::find (spell_name);
650 439
651 /* Got a spell, update the first string pointer */ 440 /* Got a spell, update the first string pointer */
652 if (at_spell && at_spell->clone.type == SPELL) 441 if (at_spell && at_spell->type == SPELL)
653 bp2 = cp + strlen (spell_name) + 1; 442 bp2 = cp + strlen (spell_name) + 1;
654 else 443 else
655 at_spell = NULL; 444 at_spell = NULL;
656 } 445 }
657 } 446 }
… …
659 /* OK - we didn't find a spell - presume the 'of' 448 /* OK - we didn't find a spell - presume the 'of'
660 * in this case means its an artifact. 449 * in this case means its an artifact.
661 */ 450 */
662 if (!at_spell) 451 if (!at_spell)
663 { 452 {
664 if (find_artifactlist (at->clone.type) == NULL) 453 if (find_artifactlist (at->type) == NULL)
665 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type); 454 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
666 else 455 else
667 { 456 {
668 art = find_artifactlist (at->clone.type)->items; 457 art = find_artifactlist (at->type)->items;
669 458
670 do 459 while (art)
671 { 460 {
672 if (!strcmp (art->item->name, cp)) 461 if (!strcmp (art->item->name, cp))
673 break; 462 break;
463
674 art = art->next; 464 art = art->next;
675 } 465 }
676 while (art != NULL);
677 466
678 if (!art) 467 if (!art)
679 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 468 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
680 } 469 }
681 470
682 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 471 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
683 } 472 }
684 } /* if cp */ 473 } /* if cp */
685 474
686 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 475 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
687 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 476 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
688 { 477 {
689 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); 478 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);
690 return 1; 479 return 1;
691 } 480 }
692 481
… …
694 * Rather than have two different blocks with a lot of similar code, 483 * Rather than have two different blocks with a lot of similar code,
695 * just create one object, do all the processing, and then determine 484 * just create one object, do all the processing, and then determine
696 * if that one object should be inserted or if we need to make copies. 485 * if that one object should be inserted or if we need to make copies.
697 */ 486 */
698 tmp = arch_to_object (at); 487 tmp = arch_to_object (at);
699
700 if (settings.real_wiz == FALSE)
701 SET_FLAG (tmp, FLAG_WAS_WIZ);
702 488
703 if (set_magic) 489 if (set_magic)
704 set_abs_magic (tmp, magic); 490 set_abs_magic (tmp, magic);
705 491
706 if (art) 492 if (art)
… …
786 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 572 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
787 573
788 bp2 = bp3 + 1; 574 bp2 = bp3 + 1;
789 } 575 }
790 576
791 if (at->clone.nrof) 577 if (at->nrof)
792 { 578 {
793 if (at_spell) 579 if (at_spell)
794 insert_ob_in_ob (arch_to_object (at_spell), tmp); 580 insert_ob_in_ob (arch_to_object (at_spell), tmp);
795 581
796 tmp->x = op->x; 582 tmp->x = op->x;
… …
811 } 597 }
812 else 598 else
813 { 599 {
814 for (i = 0; i < (set_nrof ? nrof : 1); i++) 600 for (i = 0; i < (set_nrof ? nrof : 1); i++)
815 { 601 {
816 archetype *atmp;
817 object *prev = 0, *head = 0; 602 object *prev = 0, *head = 0;
818 603
819 for (atmp = at; atmp; atmp = atmp->more) 604 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
820 { 605 {
821 object *dup = arch_to_object (atmp); 606 object *dup = arch_to_object (atmp);
822 607
823 if (at_spell) 608 if (at_spell)
824 insert_ob_in_ob (arch_to_object (at_spell), dup); 609 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
828 * so just copying it over should be fine. 613 * so just copying it over should be fine.
829 */ 614 */
830 if (!head) 615 if (!head)
831 { 616 {
832 head = dup; 617 head = dup;
833 copy_object (tmp, dup); 618 tmp->copy_to (dup);
834 } 619 }
835 620
836 if (settings.real_wiz == FALSE)
837 SET_FLAG (dup, FLAG_WAS_WIZ);
838
839 dup->x = op->x + dup->arch->clone.x; 621 dup->x = op->x + dup->arch->x;
840 dup->y = op->y + dup->arch->clone.y; 622 dup->y = op->y + dup->arch->y;
841 dup->map = op->map; 623 dup->map = op->map;
842 624
843 if (head != dup) 625 if (head != dup)
844 { 626 {
845 dup->head = head; 627 dup->head = head;
… …
855 int size_x = 0; 637 int size_x = 0;
856 int size_y = 0; 638 int size_y = 0;
857 639
858 while (check) 640 while (check)
859 { 641 {
860 size_x = MAX (size_x, check->arch->clone.x); 642 size_x = MAX (size_x, check->arch->x);
861 size_y = MAX (size_y, check->arch->clone.y); 643 size_y = MAX (size_y, check->arch->y);
862 check = check->more; 644 check = check->more;
863 } 645 }
864 646
865 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 647 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
866 { 648 {
867 if (head->x < size_x || head->y < size_y) 649 if (head->x < size_x || head->y < size_y)
868 { 650 {
869 dm_stack_pop (op->contr); 651 dm_stack_pop (op->contr);
870 free_object (head); 652 head->destroy ();
871 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 653 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
872 free_object (tmp); 654 tmp->destroy ();
873 return 1; 655 return 1;
874 } 656 }
875 657
876 check = head; 658 check = head;
877 659
… …
892 /* Wonder if we really want to push all of these, but since 674 /* Wonder if we really want to push all of these, but since
893 * things like rods have nrof 0, we want to cover those. 675 * things like rods have nrof 0, we want to cover those.
894 */ 676 */
895 dm_stack_push (op->contr, head->count); 677 dm_stack_push (op->contr, head->count);
896 678
897 if (at->clone.randomitems != NULL && !at_spell) 679 if (at->randomitems != NULL && !at_spell)
898 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 680 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
899 681
900 esrv_send_item (op, head); 682 esrv_send_item (op, head);
901 } 683 }
902 684
903 /* free the one we used to copy */ 685 /* free the one we used to copy */
904 free_object (tmp); 686 tmp->destroy ();
905 } 687 }
906 688
907 return 1; 689 return 1;
908} 690}
909 691
… …
951 733
952 tmp = get_dm_object (op->contr, &params, NULL); 734 tmp = get_dm_object (op->contr, &params, NULL);
953 if (!tmp) 735 if (!tmp)
954 return 1; 736 return 1;
955 737
956 dump_object (tmp); 738 char *dump = dump_object (tmp);
957 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 739 new_draw_info (NDI_UNIQUE, 0, op, dump);
740 free (dump);
741
958 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 742 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
959 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 743 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
960 return 1;
961}
962 744
963/**
964 * When DM is possessing a monster, flip aggression on and off, to allow
965 * better motion.
966 */
967int
968command_mon_aggr (object *op, char *params)
969{
970 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
971 {
972 op->enemy = NULL;
973 SET_FLAG (op, FLAG_UNAGGRESSIVE);
974 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
975 }
976 else
977 {
978 CLEAR_FLAG (op, FLAG_FRIENDLY);
979 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
980 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
981 }
982
983 return 1;
984}
985
986/** DM can possess a monster. Basically, this tricks the client into thinking
987 * a given monster, is actually the player it controls. This allows a DM
988 * to inhabit a monster's body, and run around the game with it.
989 * This function is severely broken - it has tons of hardcoded values,
990 */
991int
992command_possess (object *op, char *params)
993{
994 object *victim, *curinv, *nextinv;
995 player *pl;
996 int i;
997 char buf[MAX_BUF];
998
999 victim = NULL;
1000 if (params != NULL)
1001 {
1002 if (sscanf (params, "%d", &i))
1003 victim = find_object (i);
1004 else if (sscanf (params, "%s", buf))
1005 victim = find_object_name (buf);
1006 }
1007 if (victim == NULL)
1008 {
1009 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
1010 return 1;
1011 }
1012
1013 if (victim == op)
1014 {
1015 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
1016 return 1;
1017 }
1018
1019 /* clear out the old inventory */
1020 curinv = op->inv;
1021 while (curinv != NULL)
1022 {
1023 nextinv = curinv->below;
1024 esrv_del_item (op->contr, curinv->count);
1025 curinv = nextinv;
1026 }
1027
1028 /* make the switch */
1029 pl = op->contr;
1030 victim->contr = pl;
1031 pl->ob = victim;
1032 victim->type = PLAYER;
1033 SET_FLAG (victim, FLAG_WIZ);
1034
1035 /* send the inventory to the client */
1036 curinv = victim->inv;
1037 while (curinv != NULL)
1038 {
1039 nextinv = curinv->below;
1040 esrv_send_item (victim, curinv);
1041 curinv = nextinv;
1042 }
1043 /* basic patchup */
1044 /* The use of hard coded values is terrible. Note
1045 * that really, to be fair, this shouldn't get changed at
1046 * all - if you are possessing a kobold, you should have the
1047 * same limitations. As it is, as more body locations are added,
1048 * this will give this player more locations than perhaps
1049 * they should be allowed.
1050 */
1051 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1052 if (i == 1 || i == 6 || i == 8 || i == 9)
1053 victim->body_info[i] = 2;
1054 else
1055 victim->body_info[i] = 1;
1056
1057 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
1058 esrv_send_inventory (victim, victim);
1059
1060 fix_player (victim);
1061
1062 do_some_living (victim);
1063 return 1; 745 return 1;
1064} 746}
1065 747
1066int 748int
1067command_patch (object *op, char *params) 749command_patch (object *op, char *params)
… …
1082 return 1; 764 return 1;
1083 } 765 }
1084 766
1085 if ((arg2 = strchr (arg, ' '))) 767 if ((arg2 = strchr (arg, ' ')))
1086 arg2++; 768 arg2++;
1087 if (settings.real_wiz == FALSE) 769
1088 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
1089 if (set_variable (tmp, arg) == -1) 770 if (set_variable (tmp, arg) == -1)
1090 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 771 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
1091 else 772 else
1092 {
1093 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 773 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
1094 }
1095 774
1096 return 1; 775 return 1;
1097} 776}
1098 777
1099int 778int
… …
1126 dm_stack_pop (op->contr); 805 dm_stack_pop (op->contr);
1127 806
1128 /* Always work on the head - otherwise object will get in odd state */ 807 /* Always work on the head - otherwise object will get in odd state */
1129 if (tmp->head) 808 if (tmp->head)
1130 tmp = tmp->head; 809 tmp = tmp->head;
1131 remove_ob (tmp); 810 tmp->remove ();
1132 return 1; 811 return 1;
1133} 812}
1134 813
1135int 814int
1136command_free (object *op, char *params) 815command_free (object *op, char *params)
… …
1148 827
1149 if (from != STACK_FROM_STACK) 828 if (from != STACK_FROM_STACK)
1150 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 829 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1151 dm_stack_pop (op->contr); 830 dm_stack_pop (op->contr);
1152 831
1153 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1154 {
1155 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1156 remove_ob (tmp);
1157 }
1158
1159 if (tmp->head) 832 if (tmp->head)
1160 tmp = tmp->head; 833 tmp = tmp->head;
1161 free_object (tmp); 834
835 tmp->destroy ();
1162 return 1; 836 return 1;
1163} 837}
1164 838
1165/** 839/**
1166 * This adds exp to a player. We now allow adding to a specific skill. 840 * This adds exp to a player. We now allow adding to a specific skill.
… …
1169command_addexp (object *op, char *params) 843command_addexp (object *op, char *params)
1170{ 844{
1171 char buf[MAX_BUF], skill[MAX_BUF]; 845 char buf[MAX_BUF], skill[MAX_BUF];
1172 int i, q; 846 int i, q;
1173 object *skillob = NULL; 847 object *skillob = NULL;
1174 player *pl;
1175 848
1176 skill[0] = '\0'; 849 skill[0] = '\0';
1177 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 850 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2))
1178 { 851 {
1179 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 852 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1180 return 1; 853 return 1;
1181 } 854 }
1182 855
1183 for (pl = first_player; pl != NULL; pl = pl->next) 856 for_all_players (pl)
1184 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 857 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1185 break;
1186
1187 if (pl == NULL)
1188 { 858 {
1189 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1190 return 1;
1191 }
1192
1193 if (q >= 3) 859 if (q >= 3)
1194 { 860 {
1195 skillob = find_skill_by_name (pl->ob, skill); 861 skillob = find_skill_by_name (pl->ob, skill);
1196 if (!skillob) 862 if (!skillob)
1197 { 863 {
1198 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 864 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
865 return 1;
866 }
867
868 i = check_exp_adjust (skillob, i);
869 skillob->stats.exp += i;
870 calc_perm_exp (skillob);
871 player_lvl_adj (pl->ob, skillob);
872 }
873
874 pl->ob->stats.exp += i;
875 calc_perm_exp (pl->ob);
876 player_lvl_adj (pl->ob, NULL);
877
1199 return 1; 878 return 1;
1200 } 879 }
1201 880
1202 i = check_exp_adjust (skillob, i); 881 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1203 skillob->stats.exp += i;
1204 calc_perm_exp (skillob);
1205 player_lvl_adj (pl->ob, skillob);
1206 }
1207
1208 pl->ob->stats.exp += i;
1209 calc_perm_exp (pl->ob);
1210 player_lvl_adj (pl->ob, NULL);
1211
1212 if (settings.real_wiz == FALSE)
1213 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1214 return 1; 882 return 1;
1215} 883}
1216 884
1217/**************************************************************************/ 885/**************************************************************************/
1218 886
… …
1224 892
1225int 893int
1226command_stats (object *op, char *params) 894command_stats (object *op, char *params)
1227{ 895{
1228 char thing[20]; 896 char thing[20];
1229 player *pl;
1230 char buf[MAX_BUF]; 897 char buf[MAX_BUF];
1231 898
1232 thing[0] = '\0'; 899 thing[0] = '\0';
1233 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 900 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1234 { 901 {
1235 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 902 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1236 return 1; 903 return 1;
1237 } 904 }
1238 905
1239 for (pl = first_player; pl != NULL; pl = pl->next) 906 for_all_players (pl)
1240 if (!strcmp (pl->ob->name, thing)) 907 if (!strcmp (pl->ob->name, thing))
1241 { 908 {
1242 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 909 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1243 new_draw_info (NDI_UNIQUE, 0, op, buf); 910 new_draw_info (NDI_UNIQUE, 0, op, buf);
1244 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 911 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
1245 new_draw_info (NDI_UNIQUE, 0, op, buf); 912 new_draw_info (NDI_UNIQUE, 0, op, buf);
1246 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 913 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1247 new_draw_info (NDI_UNIQUE, 0, op, buf); 914 new_draw_info (NDI_UNIQUE, 0, op, buf);
1248 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 915 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1249 new_draw_info (NDI_UNIQUE, 0, op, buf); 916 new_draw_info (NDI_UNIQUE, 0, op, buf);
1250 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 917 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1251 new_draw_info (NDI_UNIQUE, 0, op, buf); 918 new_draw_info (NDI_UNIQUE, 0, op, buf);
1252 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 919 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1253 new_draw_info (NDI_UNIQUE, 0, op, buf); 920 new_draw_info (NDI_UNIQUE, 0, op, buf);
1254 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 921 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1255 new_draw_info (NDI_UNIQUE, 0, op, buf); 922 new_draw_info (NDI_UNIQUE, 0, op, buf);
1256 break; 923 return 1;
1257 } 924 }
1258 if (pl == NULL) 925
1259 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 926 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1260 return 1; 927 return 1;
1261} 928}
1262 929
1263int 930int
1264command_abil (object *op, char *params) 931command_abil (object *op, char *params)
1265{ 932{
1266 char thing[20], thing2[20]; 933 char thing[20], thing2[20];
1267 int iii; 934 int iii;
1268 player *pl;
1269 char buf[MAX_BUF]; 935 char buf[MAX_BUF];
1270 936
1271 iii = 0; 937 iii = 0;
1272 thing[0] = '\0'; 938 thing[0] = '\0';
1273 thing2[0] = '\0'; 939 thing2[0] = '\0';
… …
1287 { 953 {
1288 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 954 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1289 return 1; 955 return 1;
1290 } 956 }
1291 957
1292 for (pl = first_player; pl != NULL; pl = pl->next) 958 for_all_players (pl)
1293 { 959 {
1294 if (!strcmp (pl->ob->name, thing)) 960 if (!strcmp (pl->ob->name, thing))
1295 { 961 {
1296 if (settings.real_wiz == FALSE)
1297 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1298 if (!strcmp ("str", thing2))
1299 pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 962 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
1300 if (!strcmp ("dex", thing2))
1301 pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 963 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
1302 if (!strcmp ("con", thing2))
1303 pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 964 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
1304 if (!strcmp ("wis", thing2))
1305 pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 965 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
1306 if (!strcmp ("cha", thing2))
1307 pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii; 966 if (!strcmp ("cha", thing2)) pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii;
1308 if (!strcmp ("int", thing2))
1309 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 967 if (!strcmp ("int", thing2)) pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1310 if (!strcmp ("pow", thing2))
1311 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 968 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
969
1312 sprintf (buf, "%s has been altered.", &pl->ob->name); 970 sprintf (buf, "%s has been altered.", &pl->ob->name);
1313 new_draw_info (NDI_UNIQUE, 0, op, buf); 971 new_draw_info (NDI_UNIQUE, 0, op, buf);
1314 fix_player (pl->ob); 972 pl->ob->update_stats ();
1315 return 1; 973 return 1;
1316 } 974 }
1317 } 975 }
1318 976
1319 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 977 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1320 return 1; 978 return 1;
1321} 979}
1322 980
1323int 981int
1324command_reset (object *op, char *params)
1325{
1326 mapstruct *m;
1327 object *dummy = NULL, *tmp = NULL;
1328
1329 if (params == NULL)
1330 {
1331 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1332 return 1;
1333 }
1334
1335 if (strcmp (params, ".") == 0)
1336 params = op->map->path;
1337 m = has_been_loaded (params);
1338 if (m == NULL)
1339 {
1340 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1341 return 1;
1342 }
1343
1344 if (m->in_memory != MAP_SWAPPED)
1345 {
1346 if (m->in_memory != MAP_IN_MEMORY)
1347 {
1348 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1349 return 0;
1350 }
1351
1352 /*
1353 * Only attempt to remove the player that is doing the reset, and not other
1354 * players or wiz's.
1355 */
1356 if (op->map == m)
1357 {
1358 dummy = get_object ();
1359 dummy->map = NULL;
1360 EXIT_X (dummy) = op->x;
1361 EXIT_Y (dummy) = op->y;
1362 EXIT_PATH (dummy) = op->map->path;
1363 remove_ob (op);
1364 op->map = NULL;
1365 tmp = op;
1366 }
1367 swap_map (m);
1368 }
1369
1370 if (m->in_memory == MAP_SWAPPED)
1371 {
1372 LOG (llevDebug, "Resetting map %s.\n", m->path);
1373
1374 /* setting this effectively causes an immediate reload */
1375 m->reset_time = 1;
1376 flush_old_maps ();
1377 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1378 if (tmp)
1379 {
1380 enter_exit (tmp, dummy);
1381 free_object (dummy);
1382 }
1383 return 1;
1384 }
1385 else
1386 {
1387 player *pl;
1388 int playercount = 0;
1389
1390 /* Need to re-insert player if swap failed for some reason */
1391 if (tmp)
1392 {
1393 insert_ob_in_map (op, m, NULL, 0);
1394 free_object (dummy);
1395 }
1396
1397 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1398 for (pl = first_player; pl != NULL; pl = pl->next)
1399 {
1400 if (pl->ob->map == m && pl->ob != op)
1401 {
1402 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1403 playercount++;
1404 }
1405 }
1406 if (!playercount)
1407 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1408 return 1;
1409 }
1410}
1411
1412int
1413command_nowiz (object *op, char *params) 982command_nowiz (object *op, char *params)
1414{ /* 'noadm' is alias */ 983{ /* 'nodm' is alias */
1415 CLEAR_FLAG (op, FLAG_WIZ); 984 CLEAR_FLAG (op, FLAG_WIZ);
1416 CLEAR_FLAG (op, FLAG_WIZPASS); 985 CLEAR_FLAG (op, FLAG_WIZPASS);
1417 CLEAR_FLAG (op, FLAG_WIZCAST); 986 CLEAR_FLAG (op, FLAG_WIZCAST);
1418 987
1419 if (settings.real_wiz == TRUE)
1420 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1421 if (op->contr->hidden) 988 if (op->contr->hidden)
1422 { 989 {
1423 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 990 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1424 op->map->players++; 991 op->map->players++;
1425 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 992 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
… …
1484 { 1051 {
1485 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1052 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1486 return 0; 1053 return 0;
1487 } 1054 }
1488 1055
1489 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1056 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1490 { 1057 {
1491 SET_FLAG (op, FLAG_WIZ); 1058 SET_FLAG (op, FLAG_WIZ);
1492 SET_FLAG (op, FLAG_WAS_WIZ);
1493 SET_FLAG (op, FLAG_WIZPASS); 1059 SET_FLAG (op, FLAG_WIZPASS);
1494 SET_FLAG (op, FLAG_WIZCAST); 1060 SET_FLAG (op, FLAG_WIZCAST);
1061
1495 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1062 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1496 /* 1063 /*
1497 * Remove setting flying here - that won't work, because next 1064 * Remove setting flying here - that won't work, because next
1498 * fix_player() is called that will get cleared - proper solution 1065 * fix_player() is called that will get cleared - proper solution
1499 * is probably something like a wiz_force which gives that and any 1066 * is probably something like a wiz_force which gives that and any
1500 * other desired abilities. 1067 * other desired abilities.
1501 */ 1068 */
1502 clear_los (op); 1069 clear_los (op->contr);
1503 op->contr->write_buf[0] = '\0'; 1070 op->contr->write_buf[0] = '\0';
1504 1071
1505 if (!silent) 1072 if (!silent)
1506 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1073 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1507 1074
… …
1534command_invisible (object *op, char *params) 1101command_invisible (object *op, char *params)
1535{ 1102{
1536 if (op) 1103 if (op)
1537 { 1104 {
1538 op->invisible += 100; 1105 op->invisible += 100;
1539 update_object (op, UP_OBJ_FACE); 1106 update_object (op, UP_OBJ_CHANGE);
1540 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1107 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1541 } 1108 }
1542 1109
1543 return 0; 1110 return 0;
1544} 1111}
… …
1556 * name than other "spell_xxx" archetypes and would always conflict. 1123 * name than other "spell_xxx" archetypes and would always conflict.
1557 */ 1124 */
1558static object * 1125static object *
1559get_spell_by_name (object *op, const char *spell_name) 1126get_spell_by_name (object *op, const char *spell_name)
1560{ 1127{
1561 archetype *ar; 1128 archetype *at;
1562 archetype *found; 1129 archetype *found;
1563 int conflict_found; 1130 int conflict_found;
1564 size_t spell_name_length; 1131 size_t spell_name_length;
1565 1132
1566 /* First check for full name matches. */ 1133 /* First check for full name matches. */
1567 conflict_found = 0; 1134 conflict_found = 0;
1568 found = NULL; 1135 found = NULL;
1569 for (ar = first_archetype; ar != NULL; ar = ar->next) 1136 for_all_archetypes (at)
1570 { 1137 {
1571 if (ar->clone.type != SPELL) 1138 if (at->type != SPELL)
1572 continue; 1139 continue;
1573 1140
1574 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1141 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1575 continue; 1142 continue;
1576 1143
1577 if (strcmp (ar->clone.name, spell_name) != 0) 1144 if (strcmp (at->object::name, spell_name) != 0)
1578 continue; 1145 continue;
1579 1146
1580 if (found != NULL) 1147 if (found != NULL)
1581 { 1148 {
1582 if (!conflict_found) 1149 if (!conflict_found)
1583 { 1150 {
1584 conflict_found = 1; 1151 conflict_found = 1;
1585 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1152 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name);
1586 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1153 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1587 } 1154 }
1155
1588 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1156 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1589 continue; 1157 continue;
1590 } 1158 }
1591 1159
1592 found = ar; 1160 found = at;
1593 } 1161 }
1594 1162
1595 /* No match if more more than one archetype matches. */ 1163 /* No match if more more than one archetype matches. */
1596 if (conflict_found) 1164 if (conflict_found)
1597 return NULL; 1165 return NULL;
… …
1602 1170
1603 /* No full match found: now check for partial matches. */ 1171 /* No full match found: now check for partial matches. */
1604 spell_name_length = strlen (spell_name); 1172 spell_name_length = strlen (spell_name);
1605 conflict_found = 0; 1173 conflict_found = 0;
1606 found = NULL; 1174 found = NULL;
1607 for (ar = first_archetype; ar != NULL; ar = ar->next) 1175 for_all_archetypes (at)
1608 { 1176 {
1609 if (ar->clone.type != SPELL) 1177 if (at->type != SPELL)
1610 continue; 1178 continue;
1611 1179
1612 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1180 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1613 continue; 1181 continue;
1614 1182
1615 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1183 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1616 continue; 1184 continue;
1617 1185
1618 if (found != NULL) 1186 if (found != NULL)
1619 { 1187 {
1620 if (!conflict_found) 1188 if (!conflict_found)
1621 { 1189 {
1622 conflict_found = 1; 1190 conflict_found = 1;
1623 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name); 1191 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1624 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name); 1192 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1625 } 1193 }
1626 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name); 1194 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1627 continue; 1195 continue;
1628 } 1196 }
1629 1197
1630 found = ar; 1198 found = at;
1631 } 1199 }
1632 1200
1633 /* No match if more more than one archetype matches. */ 1201 /* No match if more more than one archetype matches. */
1634 if (conflict_found) 1202 if (conflict_found)
1635 return NULL; 1203 return NULL;
… …
1665 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1233 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1666 return 0; 1234 return 0;
1667 } 1235 }
1668 1236
1669 do_learn_spell (op, tmp, special_prayer); 1237 do_learn_spell (op, tmp, special_prayer);
1670 free_object (tmp); 1238 tmp->destroy ();
1671 return 1; 1239 return 1;
1672} 1240}
1673 1241
1674int 1242int
1675command_learn_spell (object *op, char *params) 1243command_learn_spell (object *op, char *params)
… …
2087 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1655 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
2088 return 0; 1656 return 0;
2089 } 1657 }
2090 1658
2091 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1659 if (!QUERY_FLAG (right, FLAG_REMOVED))
2092 remove_ob (right); 1660 right->remove ();
2093 inserted = insert_ob_in_ob (right, left); 1661 inserted = insert_ob_in_ob (right, left);
2094 if (left->type == PLAYER) 1662 if (left->type == PLAYER)
2095 if (inserted == right) 1663 if (inserted == right)
2096 esrv_send_item (left, right); 1664 esrv_send_item (left, right);
2097 else 1665 else

Diff Legend

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