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.49 by root, Sun Jul 1 05:00:19 2007 UTC vs.
Revision 1.91 by root, Wed Nov 21 12:12:03 2012 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <sproto.h> 26#include <sproto.h>
26#include <spells.h> 27#include <spells.h>
… …
33/* Values for 'from' field of get_dm_object */ 34/* Values for 'from' field of get_dm_object */
34#define STACK_FROM_NONE 0 /* Item was not found */ 35#define STACK_FROM_NONE 0 /* Item was not found */
35#define STACK_FROM_TOP 1 /* Item is stack top */ 36#define STACK_FROM_TOP 1 /* Item is stack top */
36#define STACK_FROM_STACK 2 /* Item is somewhere in stack */ 37#define STACK_FROM_STACK 2 /* Item is somewhere in stack */
37#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */ 38#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */
38
39 39
40/** 40/**
41 * Enough of the DM functions seem to need this that I broke 41 * Enough of the DM functions seem to need this that I broke
42 * it out to a seperate function. name is the person 42 * it out to a seperate function. name is the person
43 * being saught, rq is who is looking for them. This 43 * being saught, rq is who is looking for them. This
… …
70 70
71 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 71 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
72 return 0; 72 return 0;
73} 73}
74 74
75static void
76dm_stack_pop (player *pl)
77{
78 if (!pl->stack_items || !pl->stack_position)
79 {
80 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
81 return;
82 }
83
84 pl->stack_position--;
85 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
86}
87
88/**
89 * Get current stack top item for player.
90 * Returns NULL if no stacked item.
91 * If stacked item disappeared (freed), remove it.
92 *
93 * Ryo, august 2004
94 */
95static object *
96dm_stack_peek (player *pl)
97{
98 object *ob;
99
100 if (!pl->stack_position)
101 {
102 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
103 return NULL;
104 }
105
106 ob = find_object (pl->stack_items[pl->stack_position - 1]);
107 if (!ob)
108 {
109 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
110 dm_stack_pop (pl);
111 return NULL;
112 }
113
114 return ob;
115}
116
117/**
118 * Push specified item on player stack.
119 * Inform player of position.
120 * Initializes variables if needed.
121 */
122void
123dm_stack_push (player *pl, tag_t item)
124{
125 if (!pl->stack_items)
126 {
127 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
128 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
129 }
130
131 if (pl->stack_position == STACK_SIZE)
132 {
133 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
134 return;
135 }
136
137 pl->stack_items[pl->stack_position] = item;
138 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
139 pl->stack_position++;
140}
141
142/**
143 * Checks 'params' for object code.
144 *
145 * Can be:
146 * * empty => get current object stack top for player
147 * * number => get item with that tag, stack it for future use
148 * * $number => get specified stack item
149 * * "me" => player himself
150 *
151 * At function exit, params points to first non-object char
152 *
153 * 'from', if not NULL, contains at exit:
154 * * STACK_FROM_NONE => object not found
155 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
156 * * STACK_FROM_STACK => item from somewhere in the stack
157 * * STACK_FROM_NUMBER => item by number, pushed on stack
158 *
159 * Ryo, august 2004
160 */
161static object *
162get_dm_object (player *pl, char **params, int *from)
163{
164 int item_tag, item_position;
165 object *ob;
166
167 if (!pl)
168 return NULL;
169
170 if (!params || !*params || **params == '\0')
171 {
172 if (from)
173 *from = STACK_FROM_TOP;
174 /* No parameter => get stack item */
175 return dm_stack_peek (pl);
176 }
177
178 /* Let's clean white spaces */
179 while (**params == ' ')
180 (*params)++;
181
182 /* Next case: number => item tag */
183 if (sscanf (*params, "%d", &item_tag))
184 {
185 /* Move parameter to next item */
186 while (isdigit (**params))
187 (*params)++;
188
189 /* And skip blanks, too */
190 while (**params == ' ')
191 (*params)++;
192
193 /* Get item */
194 ob = find_object (item_tag);
195 if (!ob)
196 {
197 if (from)
198 *from = STACK_FROM_NONE;
199 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
200 return NULL;
201 }
202
203 /* Got one, let's push it on stack */
204 dm_stack_push (pl, item_tag);
205 if (from)
206 *from = STACK_FROM_NUMBER;
207 return ob;
208 }
209
210 /* Next case: $number => stack item */
211 if (sscanf (*params, "$%d", &item_position))
212 {
213 /* Move parameter to next item */
214 (*params)++;
215
216 while (isdigit (**params))
217 (*params)++;
218 while (**params == ' ')
219 (*params)++;
220
221 if (item_position >= pl->stack_position)
222 {
223 if (from)
224 *from = STACK_FROM_NONE;
225 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
226 return NULL;
227 }
228
229 ob = find_object (pl->stack_items[item_position]);
230 if (!ob)
231 {
232 if (from)
233 *from = STACK_FROM_NONE;
234 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
235 return NULL;
236 }
237
238 if (from)
239 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
240 return ob;
241 }
242
243 /* Next case: 'me' => return pl->ob */
244 if (!strncmp (*params, "me", 2))
245 {
246 if (from)
247 *from = STACK_FROM_NUMBER;
248 dm_stack_push (pl, pl->ob->count);
249
250 /* Skip to next token */
251 (*params) += 2;
252 while (**params == ' ')
253 (*params)++;
254
255 return pl->ob;
256 }
257
258 /* Last case: get stack top */
259 if (from)
260 *from = STACK_FROM_TOP;
261 return dm_stack_peek (pl);
262}
263
75/** 264/**
76 * Actually hides specified player (obviously a DM). 265 * Actually hides specified player (obviously a DM).
77 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 266 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
78 * else they just think someone left/entered. 267 * else they just think someone left/entered.
79 */ 268 */
80void 269static void
81do_wizard_hide (object *op, int silent_dm) 270do_wizard_hide (object *op, int silent_dm)
82{ 271{
83 if (op->contr->hidden) 272 if (op->contr->hidden)
84 { 273 {
85 op->contr->hidden = 0; 274 op->contr->hidden = 0;
… …
167 { 356 {
168 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str); 357 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str);
169 return 1; 358 return 1;
170 } 359 }
171 360
172 become_follower (ob, god); 361 ob->become_follower (god);
173 return 1;
174}
175
176// TODO: Rewrite banish in perl and get rid of the following two functions
177int
178command_kick (object *op, char *params)
179{
180 for_all_players (pl)
181 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
182 {
183 object *op = pl->ob;
184
185 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
186 {
187 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
188 strcpy (op->contr->killer, "kicked");
189 }
190
191 pl->ns->destroy ();
192 }
193
194 return 1;
195}
196
197//TODO
198#if 0
199int
200command_save_overlay (object *op, char *params)
201{
202 if (!op)
203 return 0;
204
205 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
206 {
207 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't force an overlay save.");
208 return 1; 362 return 1;
209 }
210
211 new_save_map (op->map, 2);
212 new_save_map (op->map, 0);
213 new_draw_info (NDI_UNIQUE, 0, op, "Current map has been saved as an" " overlay.");
214
215 ready_map_name (op->map->path, 0);
216
217 return 1;
218} 363}
219#endif
220 364
221int 365int
222command_freeze (object *op, char *params) 366command_freeze (object *op, char *params)
223{ 367{
224 int ticks; 368 int ticks;
… …
279 /* we have nowhere to send the prisoner.... */ 423 /* we have nowhere to send the prisoner.... */
280 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 424 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
281 return 0; 425 return 0;
282 } 426 }
283 427
284 pl->ob->enter_exit (dummy); 428 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
285 dummy->destroy (); 429 dummy->destroy ();
430
286 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 431 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
287 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 432 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
288 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 433 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
289 return 1; 434 return 1;
290} 435}
291 436
292int 437int
293command_summon (object *op, char *params) 438command_summon (object *op, char *params)
294{ 439{
295 int i; 440 int i;
296 object *dummy;
297 player *pl; 441 player *pl;
298 442
299 if (!op) 443 if (!op)
300 return 0; 444 return 0;
301 445
… …
307 451
308 pl = get_other_player_from_name (op, params); 452 pl = get_other_player_from_name (op, params);
309 if (!pl) 453 if (!pl)
310 return 1; 454 return 1;
311 455
312 i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 456 maptile *m = op->map;
457 sint16 nx = op->x;
458 sint16 ny = op->y;
459
460 i = find_free_spot (op, m, nx, ny, 1, SIZEOFFREE1+1);
313 if (i == -1) 461 if (i == -1)
314 { 462 {
315 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 463 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
316 return 1; 464 return 1;
317 } 465 }
318 466
319 dummy = object::create (); 467 nx += freearr_x [i];
320 EXIT_PATH (dummy) = op->map->path; 468 ny += freearr_y [i];
321 EXIT_X (dummy) = op->x + freearr_x[i]; 469
322 EXIT_Y (dummy) = op->y + freearr_y[i]; 470 if (!xy_normalise (m, nx, ny))
323 pl->ob->enter_exit (dummy); 471 {
324 dummy->destroy (); 472 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
473 return 1;
474 }
475
476 pl->ob->player_goto (m->path, nx, ny);
325 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 477 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
326 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 478 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
327 479
328 return 1; 480 return 1;
329} 481}
… …
346int 498int
347command_create (object *op, char *params) 499command_create (object *op, char *params)
348{ 500{
349 object *tmp = NULL; 501 object *tmp = NULL;
350 int nrof, i, magic, set_magic = 0, set_nrof = 0, gotquote, gotspace; 502 int nrof, i, magic, set_magic = 0, set_nrof = 0, gotquote, gotspace;
351 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline; 503 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *endline;
352 archetype *at, *at_spell = NULL; 504 archetype *at, *at_spell = NULL;
353 artifact *art = NULL; 505 artifact *art = NULL;
354 506
355 if (!op) 507 if (!op)
356 return 0; 508 return 0;
… …
455 { 607 {
456 art = find_artifactlist (at->type)->items; 608 art = find_artifactlist (at->type)->items;
457 609
458 while (art) 610 while (art)
459 { 611 {
460 if (!strcmp (art->item->name, cp)) 612 if (!strcmp (&art->item->name, cp))
461 break; 613 break;
462 614
463 art = art->next; 615 art = art->next;
464 } 616 }
465 617
… …
481 /* 633 /*
482 * Rather than have two different blocks with a lot of similar code, 634 * Rather than have two different blocks with a lot of similar code,
483 * just create one object, do all the processing, and then determine 635 * just create one object, do all the processing, and then determine
484 * if that one object should be inserted or if we need to make copies. 636 * if that one object should be inserted or if we need to make copies.
485 */ 637 */
486 tmp = arch_to_object (at); 638 tmp = at->instance ();
487 639
488 if (set_magic) 640 if (set_magic)
489 set_abs_magic (tmp, magic); 641 set_abs_magic (tmp, magic);
490 642
491 if (art) 643 if (art)
492 give_artifact_abilities (tmp, art->item); 644 give_artifact_abilities (tmp, art->item);
493 645
494 if (need_identify (tmp)) 646 if (tmp->need_identify ())
495 { 647 {
496 SET_FLAG (tmp, FLAG_IDENTIFIED); 648 tmp->set_flag (FLAG_IDENTIFIED);
497 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 649 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
498 } 650 }
499 651
500 /* 652 /*
501 * This entire block here tries to find variable pairings, 653 * This entire block here tries to find variable pairings,
502 * eg, 'hp 4' or the like. The mess here is that values 654 * eg, 'hp 4' or the like. The mess here is that values
… …
504 * is we want to find two spaces, but if we got a quote, 656 * is we want to find two spaces, but if we got a quote,
505 * any spaces there don't count. 657 * any spaces there don't count.
506 */ 658 */
507 while (*bp2 && bp2 <= endline) 659 while (*bp2 && bp2 <= endline)
508 { 660 {
509 bp4 = NULL;
510 gotspace = 0; 661 gotspace = 0;
511 gotquote = 0; 662 gotquote = 0;
512 663
513 /* find the first quote */ 664 /* find the first quote */
514 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) 665 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
… …
574 } 725 }
575 726
576 if (at->nrof) 727 if (at->nrof)
577 { 728 {
578 if (at_spell) 729 if (at_spell)
579 insert_ob_in_ob (arch_to_object (at_spell), tmp); 730 tmp->insert (at_spell->instance ());
580 731
581 tmp->x = op->x; 732 tmp->x = op->x;
582 tmp->y = op->y; 733 tmp->y = op->y;
734 tmp->map = op->map;
583 735
584 if (set_nrof) 736 if (set_nrof)
585 tmp->nrof = nrof; 737 tmp->nrof = nrof;
586 738
587 tmp->map = op->map; 739 op->insert (tmp);
588
589 tmp = insert_ob_in_ob (tmp, op);
590 esrv_send_item (op, tmp);
591 740
592 /* Let's put this created item on stack so dm can access it easily. */ 741 /* Let's put this created item on stack so dm can access it easily. */
593 dm_stack_push (op->contr, tmp->count); 742 dm_stack_push (op->contr, tmp->count);
594 743
595 return 1; 744 return 1;
… …
600 { 749 {
601 object *prev = 0, *head = 0; 750 object *prev = 0, *head = 0;
602 751
603 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more) 752 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
604 { 753 {
605 object *dup = arch_to_object (atmp); 754 object *dup = atmp->instance ();
606 755
607 if (at_spell) 756 if (at_spell)
608 insert_ob_in_ob (arch_to_object (at_spell), dup); 757 insert_ob_in_ob (at_spell->instance (), dup);
609 758
610 /* 759 /*
611 * The head is what contains all the important bits, 760 * The head is what contains all the important bits,
612 * so just copying it over should be fine. 761 * so just copying it over should be fine.
613 */ 762 */
… …
628 } 777 }
629 778
630 prev = dup; 779 prev = dup;
631 } 780 }
632 781
633 if (QUERY_FLAG (head, FLAG_ALIVE)) 782 if (head->flag [FLAG_ALIVE])
634 { 783 {
635 object *check = head; 784 object *check = head;
636 int size_x = 0; 785 int size_x = 0;
637 int size_y = 0; 786 int size_y = 0;
638 787
639 while (check) 788 while (check)
640 { 789 {
641 size_x = MAX (size_x, check->arch->x); 790 size_x = max (size_x, check->arch->x);
642 size_y = MAX (size_y, check->arch->y); 791 size_y = max (size_y, check->arch->y);
643 check = check->more; 792 check = check->more;
644 } 793 }
645 794
646 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 795 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
647 { 796 {
… …
673 /* Wonder if we really want to push all of these, but since 822 /* Wonder if we really want to push all of these, but since
674 * things like rods have nrof 0, we want to cover those. 823 * things like rods have nrof 0, we want to cover those.
675 */ 824 */
676 dm_stack_push (op->contr, head->count); 825 dm_stack_push (op->contr, head->count);
677 826
678 if (at->randomitems != NULL && !at_spell) 827 if (at->randomitems && !at_spell)
679 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0); 828 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
680
681 esrv_send_item (op, head);
682 } 829 }
683 830
684 /* free the one we used to copy */ 831 /* free the one we used to copy */
685 tmp->destroy (); 832 tmp->destroy ();
686 } 833 }
… …
693 */ 840 */
694 841
695int 842int
696command_inventory (object *op, char *params) 843command_inventory (object *op, char *params)
697{ 844{
845 int i;
698 object *tmp; 846 object *tmp;
699 int i;
700 847
701 if (!params) 848 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
702 { 849 {
703 inventory (op, NULL); 850 op->contr->failmsg ("Inventory of what object (nr)?");
704 return 0; 851 return 1;
705 }
706
707 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
708 { 852 }
709 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
710 return 1;
711 }
712 853
713 inventory (op, tmp); 854 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
855
714 return 1; 856 return 1;
715} 857}
716 858
717/* just show player's their skills for now. Dm's can 859/* just show player's their skills for now. Dm's can
718 * already see skills w/ inventory command - b.t. 860 * already see skills w/ inventory command - b.t.
… …
736 878
737 char *dump = dump_object (tmp); 879 char *dump = dump_object (tmp);
738 new_draw_info (NDI_UNIQUE, 0, op, dump); 880 new_draw_info (NDI_UNIQUE, 0, op, dump);
739 free (dump); 881 free (dump);
740 882
741 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 883 if (tmp->flag [FLAG_OBJ_ORIGINAL])
742 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 884 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
743 885
744 return 1; 886 return 1;
745} 887}
746 888
… …
791 { 933 {
792 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!"); 934 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!");
793 return 1; 935 return 1;
794 } 936 }
795 937
796 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 938 if (tmp->flag [FLAG_REMOVED])
797 { 939 {
798 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp)); 940 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp));
799 return 1; 941 return 1;
800 } 942 }
801 943
… …
840 */ 982 */
841int 983int
842command_addexp (object *op, char *params) 984command_addexp (object *op, char *params)
843{ 985{
844 char buf[MAX_BUF], skill[MAX_BUF]; 986 char buf[MAX_BUF], skill[MAX_BUF];
845 int i, q; 987 int q;
988 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
846 object *skillob = NULL; 989 object *skillob = NULL;
847 990
848 skill[0] = '\0'; 991 skill[0] = '\0';
849 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 992 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %[^\n]", buf, &i, skill)) < 2))
850 { 993 {
851 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 994 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
852 return 1; 995 return 1;
853 } 996 }
854 997
… …
890/**************************************************************************/ 1033/**************************************************************************/
891 1034
892int 1035int
893command_stats (object *op, char *params) 1036command_stats (object *op, char *params)
894{ 1037{
895 char thing[20];
896 char buf[MAX_BUF]; 1038 char buf[MAX_BUF];
897 1039
898 thing[0] = '\0'; 1040 if (params == NULL || params[0] == '\0')
899 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
900 { 1041 {
901 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1042 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
902 return 1; 1043 return 1;
903 } 1044 }
904 1045
905 for_all_players (pl) 1046 for_all_players (pl)
906 if (!strcmp (pl->ob->name, thing)) 1047 if (!strcmp (&pl->ob->name, params))
907 { 1048 {
908 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1049 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
909 new_draw_info (NDI_UNIQUE, 0, op, buf); 1050 new_draw_info (NDI_UNIQUE, 0, op, buf);
910 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 1051 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
911 new_draw_info (NDI_UNIQUE, 0, op, buf); 1052 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
954 return 1; 1095 return 1;
955 } 1096 }
956 1097
957 for_all_players (pl) 1098 for_all_players (pl)
958 { 1099 {
959 if (!strcmp (pl->ob->name, thing)) 1100 if (!strcmp (&pl->ob->name, thing))
960 { 1101 {
961 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 1102 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
962 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 1103 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
963 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 1104 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
964 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 1105 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
… …
978} 1119}
979 1120
980int 1121int
981command_nowiz (object *op, char *params) 1122command_nowiz (object *op, char *params)
982{ /* 'nodm' is alias */ 1123{ /* 'nodm' is alias */
983 CLEAR_FLAG (op, FLAG_WIZ); 1124 op->clr_flag (FLAG_WIZ);
984 CLEAR_FLAG (op, FLAG_WIZPASS); 1125 op->clr_flag (FLAG_WIZPASS);
985 CLEAR_FLAG (op, FLAG_WIZCAST); 1126 op->clr_flag (FLAG_WIZCAST);
1127 op->clr_flag (FLAG_WIZLOOK);
1128 op->contr->do_los = 1;
986 1129
987 if (op->contr->hidden) 1130 if (op->contr->hidden)
988 { 1131 {
989 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 1132 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
990 op->map->players++; 1133 op->map->players++;
… …
992 op->contr->hidden = 0; 1135 op->contr->hidden = 0;
993 op->invisible = 1; 1136 op->invisible = 1;
994 } 1137 }
995 else 1138 else
996 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 1139 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
1140
997 return 1; 1141 return 1;
998} 1142}
999 1143
1000/** 1144/**
1001 * object *op is trying to become dm. 1145 * object *op is trying to become dm.
… …
1038 } 1182 }
1039 fclose (dmfile); 1183 fclose (dmfile);
1040 return (0); 1184 return (0);
1041} 1185}
1042 1186
1043int 1187static int
1044do_wizard_dm (object *op, char *params, int silent) 1188do_wizard_dm (object *op, char *params, int silent)
1045{ 1189{
1046 if (!op->contr) 1190 if (!op->contr)
1047 return 0; 1191 return 0;
1048 1192
1049 if (QUERY_FLAG (op, FLAG_WIZ)) 1193 if (op->flag [FLAG_WIZ])
1050 { 1194 {
1051 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1195 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1052 return 0; 1196 return 0;
1053 } 1197 }
1054 1198
1055 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1199 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1056 { 1200 {
1057 SET_FLAG (op, FLAG_WIZ); 1201 op->set_flag (FLAG_WIZ);
1058 SET_FLAG (op, FLAG_WIZPASS); 1202 op->set_flag (FLAG_WIZPASS);
1059 SET_FLAG (op, FLAG_WIZCAST); 1203 op->set_flag (FLAG_WIZCAST);
1204 op->set_flag (FLAG_WIZLOOK);
1205 op->contr->do_los = 1;
1060 1206
1061 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1207 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1062 /*
1063 * Remove setting flying here - that won't work, because next
1064 * fix_player() is called that will get cleared - proper solution
1065 * is probably something like a wiz_force which gives that and any
1066 * other desired abilities.
1067 */
1068 clear_los (op->contr);
1069 op->contr->write_buf[0] = '\0'; 1208 op->contr->write_buf[0] = '\0';
1070 1209
1071 if (!silent) 1210 if (!silent)
1072 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1211 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1073 1212
… …
1113 * Returns spell object (from archetypes) by name. 1252 * Returns spell object (from archetypes) by name.
1114 * Returns NULL if 0 or more than one spell matches. 1253 * Returns NULL if 0 or more than one spell matches.
1115 * Used for wizard's learn spell/prayer. 1254 * Used for wizard's learn spell/prayer.
1116 * 1255 *
1117 * op is the player issuing the command. 1256 * op is the player issuing the command.
1118 *
1119 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1120 * anymore (but may still be present in some player's inventories and thus
1121 * cannot be removed). We have to ignore them here since they have the same
1122 * name than other "spell_xxx" archetypes and would always conflict.
1123 */ 1257 */
1124static object * 1258static object *
1125get_spell_by_name (object *op, const char *spell_name) 1259get_spell_by_name (object *op, shstr_cmp spell_name)
1126{ 1260{
1127 archetype *at;
1128 archetype *found;
1129 int conflict_found;
1130 size_t spell_name_length;
1131
1132 /* First check for full name matches. */ 1261 /* First check for full name matches. */
1133 conflict_found = 0; 1262 int conflict_found = 0;
1134 found = NULL; 1263 archetype *found = 0;
1264
1135 for_all_archetypes (at) 1265 for_all_archetypes (at)
1136 { 1266 {
1137 if (at->type != SPELL) 1267 if (at->type != SPELL)
1138 continue; 1268 continue;
1139 1269
1140 if (strncmp (at->archname, "spelldirect_", 12) == 0) 1270 if (at->object::name != spell_name)
1141 continue; 1271 continue;
1142 1272
1143 if (strcmp (at->object::name, spell_name) != 0)
1144 continue;
1145
1146 if (found != NULL) 1273 if (found)
1147 { 1274 {
1148 if (!conflict_found) 1275 if (!conflict_found)
1149 { 1276 {
1150 conflict_found = 1; 1277 conflict_found = 1;
1151 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1278 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", &spell_name);
1152 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname); 1279 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1153 } 1280 }
1154 1281
1155 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname); 1282 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1156 continue; 1283 return 0;
1157 } 1284 }
1158 1285
1159 found = at; 1286 found = at;
1160 } 1287 }
1161 1288
1162 /* No match if more more than one archetype matches. */
1163 if (conflict_found)
1164 return NULL;
1165
1166 /* Return if exactly one archetype matches. */ 1289 /* Return if exactly one archetype matches. */
1167 if (found != NULL) 1290 if (found)
1168 return arch_to_object (found); 1291 return found->instance ();
1169
1170 /* No full match found: now check for partial matches. */
1171 spell_name_length = strlen (spell_name);
1172 conflict_found = 0;
1173 found = NULL;
1174 for_all_archetypes (at)
1175 {
1176 if (at->type != SPELL)
1177 continue;
1178
1179 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1180 continue;
1181
1182 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1183 continue;
1184
1185 if (found != NULL)
1186 {
1187 if (!conflict_found)
1188 {
1189 conflict_found = 1;
1190 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, "- %s", &found->object::name);
1192 }
1193 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1194 continue;
1195 }
1196
1197 found = at;
1198 }
1199
1200 /* No match if more more than one archetype matches. */
1201 if (conflict_found)
1202 return NULL;
1203
1204 /* Return if exactly one archetype matches. */
1205 if (found != NULL)
1206 return arch_to_object (found);
1207 1292
1208 /* No spell found: just print an error message. */ 1293 /* No spell found: just print an error message. */
1209 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", spell_name); 1294 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell does not exist.");
1295
1210 return NULL; 1296 return 0;
1211} 1297}
1212 1298
1213static int 1299static int
1214command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1300command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1215{ 1301{
… …
1259 { 1345 {
1260 new_draw_info (NDI_UNIQUE, 0, op, "Which spell do you want to forget?"); 1346 new_draw_info (NDI_UNIQUE, 0, op, "Which spell do you want to forget?");
1261 return 0; 1347 return 0;
1262 } 1348 }
1263 1349
1264 spell = lookup_spell_by_name (op, params); 1350 spell = op->find_spell (params);
1265 if (spell == NULL) 1351 if (spell == NULL)
1266 { 1352 {
1267 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1353 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1268 return 0; 1354 return 0;
1269 } 1355 }
1270 1356
1271 do_forget_spell (op, spell->name); 1357 do_forget_spell (op, spell->name);
1272 return 1;
1273}
1274
1275/**
1276 * Lists all plugins currently loaded with their IDs and full names.
1277 */
1278int
1279command_listplugins (object *op, char *params)
1280{
1281 plugins_display_list (op);
1282 return 1;
1283}
1284
1285/**
1286 * Loads the given plugin. The DM specifies the name of the library to load (no
1287 * pathname is needed). Do not ever attempt to load the same plugin more than
1288 * once at a time, or bad things could happen.
1289 */
1290int
1291command_loadplugin (object *op, char *params)
1292{
1293 char buf[MAX_BUF];
1294
1295 if (params == NULL)
1296 {
1297 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1298 return 1;
1299 }
1300
1301 strcpy (buf, LIBDIR);
1302 strcat (buf, "/plugins/");
1303 strcat (buf, params);
1304 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1305 if (plugins_init_plugin (buf) == 0)
1306 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1307 else
1308 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1309 return 1;
1310}
1311
1312/**
1313 * Unloads the given plugin. The DM specified the ID of the library to unload.
1314 * Note that some things may behave strangely if the correct plugins are not
1315 * loaded.
1316 */
1317int
1318command_unloadplugin (object *op, char *params)
1319{
1320 if (params == NULL)
1321 {
1322 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1323 return 1;
1324 }
1325
1326 if (plugins_remove_plugin (params) == 0)
1327 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1328 else
1329 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1330 return 1; 1358 return 1;
1331} 1359}
1332 1360
1333/** 1361/**
1334 * A players wants to become DM and hide. 1362 * A players wants to become DM and hide.
… …
1342 return 0; 1370 return 0;
1343 1371
1344 do_wizard_hide (op, 1); 1372 do_wizard_hide (op, 1);
1345 1373
1346 return 1; 1374 return 1;
1347}
1348
1349void
1350dm_stack_pop (player *pl)
1351{
1352 if (!pl->stack_items || !pl->stack_position)
1353 {
1354 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1355 return;
1356 }
1357
1358 pl->stack_position--;
1359 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1360}
1361
1362/**
1363 * Get current stack top item for player.
1364 * Returns NULL if no stacked item.
1365 * If stacked item disappeared (freed), remove it.
1366 *
1367 * Ryo, august 2004
1368 */
1369object *
1370dm_stack_peek (player *pl)
1371{
1372 object *ob;
1373
1374 if (!pl->stack_position)
1375 {
1376 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1377 return NULL;
1378 }
1379
1380 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1381 if (!ob)
1382 {
1383 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1384 dm_stack_pop (pl);
1385 return NULL;
1386 }
1387
1388 return ob;
1389}
1390
1391/**
1392 * Push specified item on player stack.
1393 * Inform player of position.
1394 * Initializes variables if needed.
1395 */
1396void
1397dm_stack_push (player *pl, tag_t item)
1398{
1399 if (!pl->stack_items)
1400 {
1401 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1402 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1403 }
1404
1405 if (pl->stack_position == STACK_SIZE)
1406 {
1407 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1408 return;
1409 }
1410
1411 pl->stack_items[pl->stack_position] = item;
1412 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1413 pl->stack_position++;
1414}
1415
1416/**
1417 * Checks 'params' for object code.
1418 *
1419 * Can be:
1420 * * empty => get current object stack top for player
1421 * * number => get item with that tag, stack it for future use
1422 * * $number => get specified stack item
1423 * * "me" => player himself
1424 *
1425 * At function exit, params points to first non-object char
1426 *
1427 * 'from', if not NULL, contains at exit:
1428 * * STACK_FROM_NONE => object not found
1429 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1430 * * STACK_FROM_STACK => item from somewhere in the stack
1431 * * STACK_FROM_NUMBER => item by number, pushed on stack
1432 *
1433 * Ryo, august 2004
1434 */
1435object *
1436get_dm_object (player *pl, char **params, int *from)
1437{
1438 int item_tag, item_position;
1439 object *ob;
1440
1441 if (!pl)
1442 return NULL;
1443
1444 if (!params || !*params || **params == '\0')
1445 {
1446 if (from)
1447 *from = STACK_FROM_TOP;
1448 /* No parameter => get stack item */
1449 return dm_stack_peek (pl);
1450 }
1451
1452 /* Let's clean white spaces */
1453 while (**params == ' ')
1454 (*params)++;
1455
1456 /* Next case: number => item tag */
1457 if (sscanf (*params, "%d", &item_tag))
1458 {
1459 /* Move parameter to next item */
1460 while (isdigit (**params))
1461 (*params)++;
1462
1463 /* And skip blanks, too */
1464 while (**params == ' ')
1465 (*params)++;
1466
1467 /* Get item */
1468 ob = find_object (item_tag);
1469 if (!ob)
1470 {
1471 if (from)
1472 *from = STACK_FROM_NONE;
1473 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1474 return NULL;
1475 }
1476
1477 /* Got one, let's push it on stack */
1478 dm_stack_push (pl, item_tag);
1479 if (from)
1480 *from = STACK_FROM_NUMBER;
1481 return ob;
1482 }
1483
1484 /* Next case: $number => stack item */
1485 if (sscanf (*params, "$%d", &item_position))
1486 {
1487 /* Move parameter to next item */
1488 (*params)++;
1489
1490 while (isdigit (**params))
1491 (*params)++;
1492 while (**params == ' ')
1493 (*params)++;
1494
1495 if (item_position >= pl->stack_position)
1496 {
1497 if (from)
1498 *from = STACK_FROM_NONE;
1499 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1500 return NULL;
1501 }
1502
1503 ob = find_object (pl->stack_items[item_position]);
1504 if (!ob)
1505 {
1506 if (from)
1507 *from = STACK_FROM_NONE;
1508 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1509 return NULL;
1510 }
1511
1512 if (from)
1513 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1514 return ob;
1515 }
1516
1517 /* Next case: 'me' => return pl->ob */
1518 if (!strncmp (*params, "me", 2))
1519 {
1520 if (from)
1521 *from = STACK_FROM_NUMBER;
1522 dm_stack_push (pl, pl->ob->count);
1523
1524 /* Skip to next token */
1525 (*params) += 2;
1526 while (**params == ' ')
1527 (*params)++;
1528
1529 return pl->ob;
1530 }
1531
1532 /* Last case: get stack top */
1533 if (from)
1534 *from = STACK_FROM_TOP;
1535 return dm_stack_peek (pl);
1536} 1375}
1537 1376
1538/** 1377/**
1539 * Pop the stack top. 1378 * Pop the stack top.
1540 */ 1379 */
… …
1600} 1439}
1601 1440
1602int 1441int
1603command_insert_into (object *op, char *params) 1442command_insert_into (object *op, char *params)
1604{ 1443{
1605 object *left, *right, *inserted; 1444 object *left, *right;
1606 int left_from, right_from; 1445 int left_from, right_from;
1607 1446
1608 left = get_dm_object (op->contr, &params, &left_from); 1447 left = get_dm_object (op->contr, &params, &left_from);
1609 if (!left) 1448 if (!left)
1610 { 1449 {
… …
1653 { 1492 {
1654 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1493 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1655 return 0; 1494 return 0;
1656 } 1495 }
1657 1496
1658 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1497 if (!right->flag [FLAG_REMOVED])
1659 right->remove (); 1498 right->remove ();
1499
1660 inserted = insert_ob_in_ob (right, left); 1500 object *inserted = insert_ob_in_ob (right, left);
1661 if (left->type == PLAYER)
1662 if (inserted == right)
1663 esrv_send_item (left, right);
1664 else
1665 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1666 1501
1667 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1502 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
1668 1503
1669 return 0; 1504 return 0;
1670 1505

Diff Legend

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