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.48 by root, Tue Jun 5 13:05:02 2007 UTC

1
2/* 1/*
3 * static char *rcsid_c_wiz_c = 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
4 * "$Id: c_wiz.C,v 1.8 2006/09/10 13:20:27 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software; you can redistribute it and/or modify it
14 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
15 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
16 (at your option) any later version. 11 * 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, but
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
21 GNU General Public License for more details. 16 * 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 along
24 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
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
26 21 *
27 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
28*/ 23 */
29 24
30#include <global.h> 25#include <global.h>
31#ifndef __CEXTRACT__
32# include <sproto.h> 26#include <sproto.h>
33#endif
34#include <spells.h> 27#include <spells.h>
35#include <treasure.h> 28#include <treasure.h>
36#include <skills.h> 29#include <skills.h>
37 30
38/** Defines for DM item stack **/ 31/** Defines for DM item stack **/
… …
53 * other player, or NULL otherwise. 46 * other player, or NULL otherwise.
54 */ 47 */
55static player * 48static player *
56get_other_player_from_name (object *op, char *name) 49get_other_player_from_name (object *op, char *name)
57{ 50{
58 player *pl;
59
60 if (!name) 51 if (!name)
61 return NULL; 52 return NULL;
62 53
63 for (pl = first_player; pl != NULL; pl = pl->next) 54 for_all_players (pl)
64 if (!strncmp (pl->ob->name, name, MAX_NAME)) 55 if (!strncmp (pl->ob->name, name, MAX_NAME))
65 break;
66
67 if (pl == NULL)
68 { 56 {
69 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
70 return NULL;
71 }
72
73 if (pl->ob == op) 57 if (pl->ob == op)
74 { 58 {
75 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.");
76 return NULL; 60 return NULL;
77 } 61 }
62
78 if (pl->state != ST_PLAYING) 63 if (pl->ns->state != ST_PLAYING)
79 { 64 {
80 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.");
81 return NULL; 66 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 } 67 }
68
69 return pl;
114 } 70 }
115 71
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
116 return 0; 73 return 0;
117} 74}
118 75
119/** 76/**
120 * Actually hides specified player (obviously a DM). 77 * Actually hides specified player (obviously a DM).
… …
129 op->contr->hidden = 0; 86 op->contr->hidden = 0;
130 op->invisible = 1; 87 op->invisible = 1;
131 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");
132 op->map->players++; 89 op->map->players++;
133 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
134 if (!silent_dm) 92 if (!silent_dm)
135 {
136 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!");
137 }
138 } 94 }
139 else 95 else
140 { 96 {
141 op->contr->hidden = 1; 97 op->contr->hidden = 1;
142 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.");
143 op->map->players--; 99 op->map->players--;
100
144 if (!silent_dm) 101 if (!silent_dm)
145 {
146 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..");
147 } 103
148 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);
149 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);
150 } 106 }
151} 107}
152 108
… …
164static object * 120static object *
165find_object_both (char *params) 121find_object_both (char *params)
166{ 122{
167 if (!params) 123 if (!params)
168 return NULL; 124 return NULL;
125
169 if (params[0] == '#') 126 if (params[0] == '#')
170 return find_object (atol (params + 1)); 127 return find_object (atol (params + 1));
171 else 128 else
172 return find_object_name (params); 129 return find_object_name (params);
173} 130}
… …
215 172
216 become_follower (ob, god); 173 become_follower (ob, god);
217 return 1; 174 return 1;
218} 175}
219 176
220/** 177// 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 178int
271command_kick (object *op, char *params) 179command_kick (object *op, char *params)
272{ 180{
273 struct pl *pl; 181 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))) 182 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
277 { 183 {
278 object *op = pl->ob; 184 object *op = pl->ob;
279 185
280 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 186 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
281 { 187 {
282 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);
283 strcpy (op->contr->killer, "kicked"); 189 strcpy (op->contr->killer, "kicked");
284 } 190 }
285 191
286 pl->socket.status = Ns_Dead; 192 pl->ns->destroy ();
287 } 193 }
288 194
289 return 1; 195 return 1;
290} 196}
291 197
198//TODO
199#if 0
292int 200int
293command_save_overlay (object *op, char *params) 201command_save_overlay (object *op, char *params)
294{ 202{
295 if (!op) 203 if (!op)
296 return 0; 204 return 0;
… …
307 215
308 ready_map_name (op->map->path, 0); 216 ready_map_name (op->map->path, 0);
309 217
310 return 1; 218 return 1;
311} 219}
312 220#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 221
395int 222int
396command_freeze (object *op, char *params) 223command_freeze (object *op, char *params)
397{ 224{
398 int ticks; 225 int ticks;
… …
434 object *dummy; 261 object *dummy;
435 player *pl; 262 player *pl;
436 263
437 if (!op) 264 if (!op)
438 return 0; 265 return 0;
266
439 if (params == NULL) 267 if (params == NULL)
440 { 268 {
441 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 269 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
442 return 1; 270 return 1;
443 } 271 }
272
444 pl = get_other_player_from_name (op, params); 273 pl = get_other_player_from_name (op, params);
445 if (!pl) 274 if (!pl)
446 return 1; 275 return 1;
276
447 dummy = get_jail_exit (pl->ob); 277 dummy = get_jail_exit (pl->ob);
448 if (!dummy) 278 if (!dummy)
449 { 279 {
450 /* we have nowhere to send the prisoner.... */ 280 /* 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"); 281 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
452 return 0; 282 return 0;
453 } 283 }
454 enter_exit (pl->ob, dummy); 284
455 free_object (dummy); 285 pl->ob->enter_exit (dummy);
286 dummy->destroy ();
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 dummy = object::create ();
490 EXIT_PATH (dummy) = op->map->path; 321 EXIT_PATH (dummy) = op->map->path;
491 EXIT_X (dummy) = op->x + freearr_x[i]; 322 EXIT_X (dummy) = op->x + freearr_x[i];
492 EXIT_Y (dummy) = op->y + freearr_y[i]; 323 EXIT_Y (dummy) = op->y + freearr_y[i];
493 enter_exit (pl->ob, dummy); 324 pl->ob->enter_exit (dummy);
494 free_object (dummy); 325 dummy->destroy ();
495 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 326 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
496 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 327 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
497 328
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; 329 return 1;
543} 330}
544 331
545/** 332/**
546 * This function is a real mess, because we're stucking getting 333 * This function is a real mess, because we're stucking getting
… …
572 if (params == NULL) 359 if (params == NULL)
573 { 360 {
574 new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]"); 361 new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]");
575 return 1; 362 return 1;
576 } 363 }
364
577 bp = params; 365 bp = params;
578 366
579 /* We need to know where the line ends */ 367 /* We need to know where the line ends */
580 endline = bp + strlen (bp); 368 endline = bp + strlen (bp);
581 369
… …
588 } 376 }
589 bp++; 377 bp++;
590 set_nrof = 1; 378 set_nrof = 1;
591 LOG (llevDebug, "%s creates: (%d) %s\n", &op->name, nrof, bp); 379 LOG (llevDebug, "%s creates: (%d) %s\n", &op->name, nrof, bp);
592 } 380 }
381
593 if (sscanf (bp, "%d ", &magic)) 382 if (sscanf (bp, "%d ", &magic))
594 { 383 {
595 if ((bp = strchr (bp, ' ')) == NULL) 384 if ((bp = strchr (bp, ' ')) == NULL)
596 { 385 {
597 new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]"); 386 new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]");
598 return 1; 387 return 1;
599 } 388 }
389
600 bp++; 390 bp++;
601 set_magic = 1; 391 set_magic = 1;
602 LOG (llevDebug, "%s creates: (%d) (%d) %s\n", &op->name, nrof, magic, bp); 392 LOG (llevDebug, "%s creates: (%d) (%d) %s\n", &op->name, nrof, magic, bp);
603 } 393 }
394
604 if ((cp = strstr (bp, " of ")) != NULL) 395 if ((cp = strstr (bp, " of ")) != NULL)
605 { 396 {
606 *cp = '\0'; 397 *cp = '\0';
607 cp += 4; 398 cp += 4;
608 } 399 }
400
609 for (bp2 = bp; *bp2; bp2++) 401 for (bp2 = bp; *bp2; bp2++)
610 { 402 {
611 if (*bp2 == ' ') 403 if (*bp2 == ' ')
612 { 404 {
613 *bp2 = '\0'; 405 *bp2 = '\0';
614 bp2++; 406 bp2++;
615 break; 407 break;
616 } 408 }
617 } 409 }
618 410
619 if ((at = find_archetype (bp)) == NULL) 411 if ((at = archetype::find (bp)) == NULL)
620 { 412 {
621 new_draw_info (NDI_UNIQUE, 0, op, "No such archetype."); 413 new_draw_info (NDI_UNIQUE, 0, op, "No such archetype.");
622 return 1; 414 return 1;
623 } 415 }
624 416
… …
630 * Try to find a spell object for this. Note that 422 * Try to find a spell object for this. Note that
631 * we also set up spell_name which is only 423 * we also set up spell_name which is only
632 * the first word. 424 * the first word.
633 */ 425 */
634 426
635 at_spell = find_archetype (cp); 427 at_spell = archetype::find (cp);
636 if (!at_spell || at_spell->clone.type != SPELL) 428 if (!at_spell || at_spell->type != SPELL)
637 at_spell = find_archetype_by_object_name (cp); 429 at_spell = find_archetype_by_object_name (cp);
638 if (!at_spell || at_spell->clone.type != SPELL) 430 if (!at_spell || at_spell->type != SPELL)
639 { 431 {
640 strcpy (spell_name, cp); 432 assign (spell_name, cp);
641 fsp = strchr (spell_name, ' '); 433 fsp = strchr (spell_name, ' ');
642 if (fsp) 434 if (fsp)
643 { 435 {
644 *fsp = 0; 436 *fsp = 0;
645 fsp++; 437 fsp++;
646 at_spell = find_archetype (spell_name); 438 at_spell = archetype::find (spell_name);
647 439
648 /* Got a spell, update the first string pointer */ 440 /* Got a spell, update the first string pointer */
649 if (at_spell && at_spell->clone.type == SPELL) 441 if (at_spell && at_spell->type == SPELL)
650 bp2 = cp + strlen (spell_name) + 1; 442 bp2 = cp + strlen (spell_name) + 1;
651 else 443 else
652 at_spell = NULL; 444 at_spell = NULL;
653 } 445 }
654 } 446 }
… …
656 /* OK - we didn't find a spell - presume the 'of' 448 /* OK - we didn't find a spell - presume the 'of'
657 * in this case means its an artifact. 449 * in this case means its an artifact.
658 */ 450 */
659 if (!at_spell) 451 if (!at_spell)
660 { 452 {
661 if (find_artifactlist (at->clone.type) == NULL) 453 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); 454 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
664 }
665 else 455 else
666 { 456 {
667 art = find_artifactlist (at->clone.type)->items; 457 art = find_artifactlist (at->type)->items;
668 458
669 do 459 while (art)
670 { 460 {
671 if (!strcmp (art->item->name, cp)) 461 if (!strcmp (art->item->name, cp))
672 break; 462 break;
463
673 art = art->next; 464 art = art->next;
674 } 465 }
675 while (art != NULL); 466
676 if (!art) 467 if (!art)
677 {
678 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);
679 }
680 } 469 }
470
681 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);
682 } 472 }
683 } /* if cp */ 473 } /* if cp */
684 474
685 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 475 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
686 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 476 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
687 { 477 {
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); 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);
689 return 1; 479 return 1;
690 } 480 }
691 481
… …
693 * 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,
694 * just create one object, do all the processing, and then determine 484 * 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. 485 * if that one object should be inserted or if we need to make copies.
696 */ 486 */
697 tmp = arch_to_object (at); 487 tmp = arch_to_object (at);
698 if (settings.real_wiz == FALSE) 488
699 SET_FLAG (tmp, FLAG_WAS_WIZ);
700 if (set_magic) 489 if (set_magic)
701 set_abs_magic (tmp, magic); 490 set_abs_magic (tmp, magic);
491
702 if (art) 492 if (art)
703 give_artifact_abilities (tmp, art->item); 493 give_artifact_abilities (tmp, art->item);
494
704 if (need_identify (tmp)) 495 if (need_identify (tmp))
705 { 496 {
706 SET_FLAG (tmp, FLAG_IDENTIFIED); 497 SET_FLAG (tmp, FLAG_IDENTIFIED);
707 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 498 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL);
708 } 499 }
… …
717 while (*bp2 && bp2 <= endline) 508 while (*bp2 && bp2 <= endline)
718 { 509 {
719 bp4 = NULL; 510 bp4 = NULL;
720 gotspace = 0; 511 gotspace = 0;
721 gotquote = 0; 512 gotquote = 0;
513
722 /* find the first quote */ 514 /* find the first quote */
723 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) 515 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
724 { 516 {
725 517
726 /* Found a quote - now lets find the second one */ 518 /* Found a quote - now lets find the second one */
… …
740 else 532 else
741 bp3++; 533 bp3++;
742 } 534 }
743 } 535 }
744 else if (*bp3 == ' ') 536 else if (*bp3 == ' ')
745 {
746 gotspace++; 537 gotspace++;
747 }
748 } 538 }
749 539
750 /* 540 /*
751 * If we got two spaces, send the second one to null. 541 * If we got two spaces, send the second one to null.
752 * if we've reached the end of the line, increase gotspace - 542 * if we've reached the end of the line, increase gotspace -
… …
770 * anyways. 560 * anyways.
771 */ 561 */
772 new_draw_info_format (NDI_UNIQUE, 0, op, "Malformed create line: %s", bp2); 562 new_draw_info_format (NDI_UNIQUE, 0, op, "Malformed create line: %s", bp2);
773 break; 563 break;
774 } 564 }
565
775 /* bp2 should still point to the start of this line, 566 /* bp2 should still point to the start of this line,
776 * with bp3 pointing to the end 567 * with bp3 pointing to the end
777 */ 568 */
778 if (set_variable (tmp, bp2) == -1) 569 if (set_variable (tmp, bp2) == -1)
779 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", bp2); 570 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", bp2);
780 else 571 else
781 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);
573
782 bp2 = bp3 + 1; 574 bp2 = bp3 + 1;
783 } 575 }
784 576
785 if (at->clone.nrof) 577 if (at->nrof)
786 { 578 {
787 if (at_spell) 579 if (at_spell)
788 insert_ob_in_ob (arch_to_object (at_spell), tmp); 580 insert_ob_in_ob (arch_to_object (at_spell), tmp);
789 581
790 tmp->x = op->x; 582 tmp->x = op->x;
791 tmp->y = op->y; 583 tmp->y = op->y;
584
792 if (set_nrof) 585 if (set_nrof)
793 tmp->nrof = nrof; 586 tmp->nrof = nrof;
587
794 tmp->map = op->map; 588 tmp->map = op->map;
795 589
796 tmp = insert_ob_in_ob (tmp, op); 590 tmp = insert_ob_in_ob (tmp, op);
797 esrv_send_item (op, tmp); 591 esrv_send_item (op, tmp);
798 592
… …
803 } 597 }
804 else 598 else
805 { 599 {
806 for (i = 0; i < (set_nrof ? nrof : 1); i++) 600 for (i = 0; i < (set_nrof ? nrof : 1); i++)
807 { 601 {
808 archetype *atmp;
809 object *prev = NULL, *head = NULL, *dup; 602 object *prev = 0, *head = 0;
810 603
811 for (atmp = at; atmp != NULL; atmp = atmp->more) 604 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
812 { 605 {
813 dup = arch_to_object (atmp); 606 object *dup = arch_to_object (atmp);
814 607
815 if (at_spell) 608 if (at_spell)
816 insert_ob_in_ob (arch_to_object (at_spell), dup); 609 insert_ob_in_ob (arch_to_object (at_spell), dup);
817 610
818 /* 611 /*
819 * The head is what contains all the important bits, 612 * The head is what contains all the important bits,
820 * so just copying it over should be fine. 613 * so just copying it over should be fine.
821 */ 614 */
822 if (head == NULL) 615 if (!head)
823 { 616 {
824 head = dup; 617 head = dup;
825 copy_object (tmp, dup); 618 tmp->copy_to (dup);
826 } 619 }
827 if (settings.real_wiz == FALSE) 620
828 SET_FLAG (dup, FLAG_WAS_WIZ);
829 dup->x = op->x + dup->arch->clone.x; 621 dup->x = op->x + dup->arch->x;
830 dup->y = op->y + dup->arch->clone.y; 622 dup->y = op->y + dup->arch->y;
831 dup->map = op->map; 623 dup->map = op->map;
832 624
833 if (head != dup) 625 if (head != dup)
834 { 626 {
835 dup->head = head; 627 dup->head = head;
836 prev->more = dup; 628 prev->more = dup;
837 } 629 }
630
838 prev = dup; 631 prev = dup;
839 } 632 }
840 633
841 if (QUERY_FLAG (head, FLAG_ALIVE)) 634 if (QUERY_FLAG (head, FLAG_ALIVE))
842 { 635 {
… …
844 int size_x = 0; 637 int size_x = 0;
845 int size_y = 0; 638 int size_y = 0;
846 639
847 while (check) 640 while (check)
848 { 641 {
849 size_x = MAX (size_x, check->arch->clone.x); 642 size_x = MAX (size_x, check->arch->x);
850 size_y = MAX (size_y, check->arch->clone.y); 643 size_y = MAX (size_y, check->arch->y);
851 check = check->more; 644 check = check->more;
852 } 645 }
853 646
854 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))
855 { 648 {
856 if (head->x < size_x || head->y < size_y) 649 if (head->x < size_x || head->y < size_y)
857 { 650 {
858 dm_stack_pop (op->contr); 651 dm_stack_pop (op->contr);
859 free_object (head); 652 head->destroy ();
860 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.");
861 free_object (tmp); 654 tmp->destroy ();
862 return 1; 655 return 1;
863 } 656 }
864 657
865 check = head; 658 check = head;
659
866 while (check) 660 while (check)
867 { 661 {
868 check->x -= size_x; 662 check->x -= size_x;
869 check->y -= size_y; 663 check->y -= size_y;
870 check = check->more; 664 check = check->more;
… …
880 /* 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
881 * things like rods have nrof 0, we want to cover those. 675 * things like rods have nrof 0, we want to cover those.
882 */ 676 */
883 dm_stack_push (op->contr, head->count); 677 dm_stack_push (op->contr, head->count);
884 678
885 if (at->clone.randomitems != NULL && !at_spell) 679 if (at->randomitems != NULL && !at_spell)
886 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 680 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
681
887 esrv_send_item (op, head); 682 esrv_send_item (op, head);
888 } 683 }
889 684
890 /* free the one we used to copy */ 685 /* free the one we used to copy */
891 free_object (tmp); 686 tmp->destroy ();
892 } 687 }
893 688
894 return 1; 689 return 1;
895} 690}
896 691
… …
938 733
939 tmp = get_dm_object (op->contr, &params, NULL); 734 tmp = get_dm_object (op->contr, &params, NULL);
940 if (!tmp) 735 if (!tmp)
941 return 1; 736 return 1;
942 737
943 dump_object (tmp); 738 char *dump = dump_object (tmp);
944 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 739 new_draw_info (NDI_UNIQUE, 0, op, dump);
740 free (dump);
741
945 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 742 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
946 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 743 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
947 return 1;
948}
949 744
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; 745 return 1;
1051} 746}
1052 747
1053int 748int
1054command_patch (object *op, char *params) 749command_patch (object *op, char *params)
… …
1069 return 1; 764 return 1;
1070 } 765 }
1071 766
1072 if ((arg2 = strchr (arg, ' '))) 767 if ((arg2 = strchr (arg, ' ')))
1073 arg2++; 768 arg2++;
1074 if (settings.real_wiz == FALSE) 769
1075 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
1076 if (set_variable (tmp, arg) == -1) 770 if (set_variable (tmp, arg) == -1)
1077 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);
1078 else 772 else
1079 {
1080 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);
1081 }
1082 774
1083 return 1; 775 return 1;
1084} 776}
1085 777
1086int 778int
… …
1113 dm_stack_pop (op->contr); 805 dm_stack_pop (op->contr);
1114 806
1115 /* 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 */
1116 if (tmp->head) 808 if (tmp->head)
1117 tmp = tmp->head; 809 tmp = tmp->head;
1118 remove_ob (tmp); 810 tmp->remove ();
1119 return 1; 811 return 1;
1120} 812}
1121 813
1122int 814int
1123command_free (object *op, char *params) 815command_free (object *op, char *params)
… …
1135 827
1136 if (from != STACK_FROM_STACK) 828 if (from != STACK_FROM_STACK)
1137 /* 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 */
1138 dm_stack_pop (op->contr); 830 dm_stack_pop (op->contr);
1139 831
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) 832 if (tmp->head)
1147 tmp = tmp->head; 833 tmp = tmp->head;
1148 free_object (tmp); 834
835 tmp->destroy ();
1149 return 1; 836 return 1;
1150} 837}
1151 838
1152/** 839/**
1153 * 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.
… …
1156command_addexp (object *op, char *params) 843command_addexp (object *op, char *params)
1157{ 844{
1158 char buf[MAX_BUF], skill[MAX_BUF]; 845 char buf[MAX_BUF], skill[MAX_BUF];
1159 int i, q; 846 int i, q;
1160 object *skillob = NULL; 847 object *skillob = NULL;
1161 player *pl;
1162 848
1163 skill[0] = '\0'; 849 skill[0] = '\0';
1164 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))
1165 { 851 {
1166 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>].");
1167 return 1; 853 return 1;
1168 } 854 }
1169 855
1170 for (pl = first_player; pl != NULL; pl = pl->next) 856 for_all_players (pl)
1171 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 857 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1172 break;
1173
1174 if (pl == NULL)
1175 { 858 {
1176 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1177 return 1;
1178 }
1179
1180 if (q >= 3) 859 if (q >= 3)
1181 { 860 {
1182 skillob = find_skill_by_name (pl->ob, skill); 861 skillob = find_skill_by_name (pl->ob, skill);
1183 if (!skillob) 862 if (!skillob)
1184 { 863 {
1185 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
1186 return 1; 878 return 1;
1187 } 879 }
1188 880
1189 i = check_exp_adjust (skillob, i); 881 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; 882 return 1;
1202} 883}
1203 884
1204/**************************************************************************/ 885/**************************************************************************/
1205 886
… …
1211 892
1212int 893int
1213command_stats (object *op, char *params) 894command_stats (object *op, char *params)
1214{ 895{
1215 char thing[20]; 896 char thing[20];
1216 player *pl;
1217 char buf[MAX_BUF]; 897 char buf[MAX_BUF];
1218 898
1219 thing[0] = '\0'; 899 thing[0] = '\0';
1220 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 900 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1221 { 901 {
1222 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 902 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1223 return 1; 903 return 1;
1224 } 904 }
1225 905
1226 for (pl = first_player; pl != NULL; pl = pl->next) 906 for_all_players (pl)
1227 if (!strcmp (pl->ob->name, thing)) 907 if (!strcmp (pl->ob->name, thing))
1228 { 908 {
1229 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);
1230 new_draw_info (NDI_UNIQUE, 0, op, buf); 910 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); 911 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); 912 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); 913 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); 914 new_draw_info (NDI_UNIQUE, 0, op, buf);
1235 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);
1236 new_draw_info (NDI_UNIQUE, 0, op, buf); 916 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); 917 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1238 new_draw_info (NDI_UNIQUE, 0, op, buf); 918 new_draw_info (NDI_UNIQUE, 0, op, buf);
1239 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);
1240 new_draw_info (NDI_UNIQUE, 0, op, buf); 920 new_draw_info (NDI_UNIQUE, 0, op, buf);
1241 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);
1242 new_draw_info (NDI_UNIQUE, 0, op, buf); 922 new_draw_info (NDI_UNIQUE, 0, op, buf);
1243 break; 923 return 1;
1244 } 924 }
1245 if (pl == NULL) 925
1246 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 926 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1247 return 1; 927 return 1;
1248} 928}
1249 929
1250int 930int
1251command_abil (object *op, char *params) 931command_abil (object *op, char *params)
1252{ 932{
1253 char thing[20], thing2[20]; 933 char thing[20], thing2[20];
1254 int iii; 934 int iii;
1255 player *pl;
1256 char buf[MAX_BUF]; 935 char buf[MAX_BUF];
1257 936
1258 iii = 0; 937 iii = 0;
1259 thing[0] = '\0'; 938 thing[0] = '\0';
1260 thing2[0] = '\0'; 939 thing2[0] = '\0';
… …
1274 { 953 {
1275 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");
1276 return 1; 955 return 1;
1277 } 956 }
1278 957
1279 for (pl = first_player; pl != NULL; pl = pl->next) 958 for_all_players (pl)
1280 { 959 {
1281 if (!strcmp (pl->ob->name, thing)) 960 if (!strcmp (pl->ob->name, thing))
1282 { 961 {
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; 962 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; 963 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; 964 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; 965 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; 966 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; 967 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; 968 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
969
1299 sprintf (buf, "%s has been altered.", &pl->ob->name); 970 sprintf (buf, "%s has been altered.", &pl->ob->name);
1300 new_draw_info (NDI_UNIQUE, 0, op, buf); 971 new_draw_info (NDI_UNIQUE, 0, op, buf);
1301 fix_player (pl->ob); 972 pl->ob->update_stats ();
1302 return 1; 973 return 1;
1303 } 974 }
1304 } 975 }
1305 976
1306 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 977 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1307 return 1; 978 return 1;
1308} 979}
1309 980
1310int 981int
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) 982command_nowiz (object *op, char *params)
1401{ /* 'noadm' is alias */ 983{ /* 'nodm' is alias */
1402 CLEAR_FLAG (op, FLAG_WIZ); 984 CLEAR_FLAG (op, FLAG_WIZ);
1403 CLEAR_FLAG (op, FLAG_WIZPASS); 985 CLEAR_FLAG (op, FLAG_WIZPASS);
1404 CLEAR_FLAG (op, FLAG_WIZCAST); 986 CLEAR_FLAG (op, FLAG_WIZCAST);
1405 987
1406 if (settings.real_wiz == TRUE)
1407 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1408 if (op->contr->hidden) 988 if (op->contr->hidden)
1409 { 989 {
1410 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");
1411 op->map->players++; 991 op->map->players++;
1412 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);
… …
1471 { 1051 {
1472 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!");
1473 return 0; 1053 return 0;
1474 } 1054 }
1475 1055
1476 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1056 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1477 { 1057 {
1478 SET_FLAG (op, FLAG_WIZ); 1058 SET_FLAG (op, FLAG_WIZ);
1479 SET_FLAG (op, FLAG_WAS_WIZ);
1480 SET_FLAG (op, FLAG_WIZPASS); 1059 SET_FLAG (op, FLAG_WIZPASS);
1481 SET_FLAG (op, FLAG_WIZCAST); 1060 SET_FLAG (op, FLAG_WIZCAST);
1061
1482 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!");
1483 /* 1063 /*
1484 * Remove setting flying here - that won't work, because next 1064 * Remove setting flying here - that won't work, because next
1485 * fix_player() is called that will get cleared - proper solution 1065 * fix_player() is called that will get cleared - proper solution
1486 * 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
1487 * other desired abilities. 1067 * other desired abilities.
1488 */ 1068 */
1489 clear_los (op); 1069 clear_los (op->contr);
1490 op->contr->write_buf[0] = '\0'; 1070 op->contr->write_buf[0] = '\0';
1491 1071
1492 if (!silent) 1072 if (!silent)
1493 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!");
1494 1074
… …
1521command_invisible (object *op, char *params) 1101command_invisible (object *op, char *params)
1522{ 1102{
1523 if (op) 1103 if (op)
1524 { 1104 {
1525 op->invisible += 100; 1105 op->invisible += 100;
1526 update_object (op, UP_OBJ_FACE); 1106 update_object (op, UP_OBJ_CHANGE);
1527 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1107 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1528 } 1108 }
1529 1109
1530 return 0; 1110 return 0;
1531} 1111}
… …
1543 * name than other "spell_xxx" archetypes and would always conflict. 1123 * name than other "spell_xxx" archetypes and would always conflict.
1544 */ 1124 */
1545static object * 1125static object *
1546get_spell_by_name (object *op, const char *spell_name) 1126get_spell_by_name (object *op, const char *spell_name)
1547{ 1127{
1548 archetype *ar; 1128 archetype *at;
1549 archetype *found; 1129 archetype *found;
1550 int conflict_found; 1130 int conflict_found;
1551 size_t spell_name_length; 1131 size_t spell_name_length;
1552 1132
1553 /* First check for full name matches. */ 1133 /* First check for full name matches. */
1554 conflict_found = 0; 1134 conflict_found = 0;
1555 found = NULL; 1135 found = NULL;
1556 for (ar = first_archetype; ar != NULL; ar = ar->next) 1136 for_all_archetypes (at)
1557 { 1137 {
1558 if (ar->clone.type != SPELL) 1138 if (at->type != SPELL)
1559 continue; 1139 continue;
1560 1140
1561 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1141 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1562 continue; 1142 continue;
1563 1143
1564 if (strcmp (ar->clone.name, spell_name) != 0) 1144 if (strcmp (at->object::name, spell_name) != 0)
1565 continue; 1145 continue;
1566 1146
1567 if (found != NULL) 1147 if (found != NULL)
1568 { 1148 {
1569 if (!conflict_found) 1149 if (!conflict_found)
1570 { 1150 {
1571 conflict_found = 1; 1151 conflict_found = 1;
1572 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);
1573 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1153 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1574 } 1154 }
1155
1575 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1156 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1576 continue; 1157 continue;
1577 } 1158 }
1578 1159
1579 found = ar; 1160 found = at;
1580 } 1161 }
1581 1162
1582 /* No match if more more than one archetype matches. */ 1163 /* No match if more more than one archetype matches. */
1583 if (conflict_found) 1164 if (conflict_found)
1584 return NULL; 1165 return NULL;
… …
1589 1170
1590 /* No full match found: now check for partial matches. */ 1171 /* No full match found: now check for partial matches. */
1591 spell_name_length = strlen (spell_name); 1172 spell_name_length = strlen (spell_name);
1592 conflict_found = 0; 1173 conflict_found = 0;
1593 found = NULL; 1174 found = NULL;
1594 for (ar = first_archetype; ar != NULL; ar = ar->next) 1175 for_all_archetypes (at)
1595 { 1176 {
1596 if (ar->clone.type != SPELL) 1177 if (at->type != SPELL)
1597 continue; 1178 continue;
1598 1179
1599 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1180 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1600 continue; 1181 continue;
1601 1182
1602 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1183 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1603 continue; 1184 continue;
1604 1185
1605 if (found != NULL) 1186 if (found != NULL)
1606 { 1187 {
1607 if (!conflict_found) 1188 if (!conflict_found)
1608 { 1189 {
1609 conflict_found = 1; 1190 conflict_found = 1;
1610 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);
1611 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);
1612 } 1193 }
1613 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);
1614 continue; 1195 continue;
1615 } 1196 }
1616 1197
1617 found = ar; 1198 found = at;
1618 } 1199 }
1619 1200
1620 /* No match if more more than one archetype matches. */ 1201 /* No match if more more than one archetype matches. */
1621 if (conflict_found) 1202 if (conflict_found)
1622 return NULL; 1203 return NULL;
… …
1652 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);
1653 return 0; 1234 return 0;
1654 } 1235 }
1655 1236
1656 do_learn_spell (op, tmp, special_prayer); 1237 do_learn_spell (op, tmp, special_prayer);
1657 free_object (tmp); 1238 tmp->destroy ();
1658 return 1; 1239 return 1;
1659} 1240}
1660 1241
1661int 1242int
1662command_learn_spell (object *op, char *params) 1243command_learn_spell (object *op, char *params)
… …
2074 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!");
2075 return 0; 1656 return 0;
2076 } 1657 }
2077 1658
2078 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1659 if (!QUERY_FLAG (right, FLAG_REMOVED))
2079 remove_ob (right); 1660 right->remove ();
2080 inserted = insert_ob_in_ob (right, left); 1661 inserted = insert_ob_in_ob (right, left);
2081 if (left->type == PLAYER) 1662 if (left->type == PLAYER)
2082 if (inserted == right) 1663 if (inserted == right)
2083 esrv_send_item (left, right); 1664 esrv_send_item (left, right);
2084 else 1665 else

Diff Legend

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