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.65 by root, Wed Dec 31 17:35:37 2008 UTC vs.
Revision 1.91 by root, Wed Nov 21 12:12:03 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net> 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>
… …
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 *plop = pl->ob;
184
185 if (!QUERY_FLAG (plop, FLAG_REMOVED) && !QUERY_FLAG (plop, FLAG_FREED))
186 {
187 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &plop->name);
188 plop->contr->killer = op;
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;
… …
292 436
293int 437int
294command_summon (object *op, char *params) 438command_summon (object *op, char *params)
295{ 439{
296 int i; 440 int i;
297 object *dummy;
298 player *pl; 441 player *pl;
299 442
300 if (!op) 443 if (!op)
301 return 0; 444 return 0;
302 445
… …
308 451
309 pl = get_other_player_from_name (op, params); 452 pl = get_other_player_from_name (op, params);
310 if (!pl) 453 if (!pl)
311 return 1; 454 return 1;
312 455
313 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);
314 if (i == -1) 461 if (i == -1)
315 { 462 {
316 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.");
317 return 1; 464 return 1;
318 } 465 }
319 466
320 pl->ob->player_goto (op->map->path, op->x + freearr_x[i], op->y + freearr_y[i]); 467 nx += freearr_x [i];
468 ny += freearr_y [i];
469
470 if (!xy_normalise (m, nx, ny))
471 {
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);
321 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 477 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
322 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 478 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
323 479
324 return 1; 480 return 1;
325} 481}
… …
342int 498int
343command_create (object *op, char *params) 499command_create (object *op, char *params)
344{ 500{
345 object *tmp = NULL; 501 object *tmp = NULL;
346 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;
347 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline; 503 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *endline;
348 archetype *at, *at_spell = NULL; 504 archetype *at, *at_spell = NULL;
349 artifact *art = NULL; 505 artifact *art = NULL;
350 506
351 if (!op) 507 if (!op)
352 return 0; 508 return 0;
… …
451 { 607 {
452 art = find_artifactlist (at->type)->items; 608 art = find_artifactlist (at->type)->items;
453 609
454 while (art) 610 while (art)
455 { 611 {
456 if (!strcmp (art->item->name, cp)) 612 if (!strcmp (&art->item->name, cp))
457 break; 613 break;
458 614
459 art = art->next; 615 art = art->next;
460 } 616 }
461 617
… …
477 /* 633 /*
478 * 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,
479 * just create one object, do all the processing, and then determine 635 * just create one object, do all the processing, and then determine
480 * 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.
481 */ 637 */
482 tmp = arch_to_object (at); 638 tmp = at->instance ();
483 639
484 if (set_magic) 640 if (set_magic)
485 set_abs_magic (tmp, magic); 641 set_abs_magic (tmp, magic);
486 642
487 if (art) 643 if (art)
488 give_artifact_abilities (tmp, art->item); 644 give_artifact_abilities (tmp, art->item);
489 645
490 if (need_identify (tmp)) 646 if (tmp->need_identify ())
491 { 647 {
492 SET_FLAG (tmp, FLAG_IDENTIFIED); 648 tmp->set_flag (FLAG_IDENTIFIED);
493 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 649 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
494 } 650 }
495 651
496 /* 652 /*
497 * This entire block here tries to find variable pairings, 653 * This entire block here tries to find variable pairings,
498 * 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
… …
500 * 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,
501 * any spaces there don't count. 657 * any spaces there don't count.
502 */ 658 */
503 while (*bp2 && bp2 <= endline) 659 while (*bp2 && bp2 <= endline)
504 { 660 {
505 bp4 = NULL;
506 gotspace = 0; 661 gotspace = 0;
507 gotquote = 0; 662 gotquote = 0;
508 663
509 /* find the first quote */ 664 /* find the first quote */
510 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) 665 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
… …
570 } 725 }
571 726
572 if (at->nrof) 727 if (at->nrof)
573 { 728 {
574 if (at_spell) 729 if (at_spell)
575 tmp->insert (arch_to_object (at_spell)); 730 tmp->insert (at_spell->instance ());
576 731
577 tmp->x = op->x; 732 tmp->x = op->x;
578 tmp->y = op->y; 733 tmp->y = op->y;
579 tmp->map = op->map; 734 tmp->map = op->map;
580 735
… …
594 { 749 {
595 object *prev = 0, *head = 0; 750 object *prev = 0, *head = 0;
596 751
597 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more) 752 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
598 { 753 {
599 object *dup = arch_to_object (atmp); 754 object *dup = atmp->instance ();
600 755
601 if (at_spell) 756 if (at_spell)
602 insert_ob_in_ob (arch_to_object (at_spell), dup); 757 insert_ob_in_ob (at_spell->instance (), dup);
603 758
604 /* 759 /*
605 * The head is what contains all the important bits, 760 * The head is what contains all the important bits,
606 * so just copying it over should be fine. 761 * so just copying it over should be fine.
607 */ 762 */
… …
622 } 777 }
623 778
624 prev = dup; 779 prev = dup;
625 } 780 }
626 781
627 if (QUERY_FLAG (head, FLAG_ALIVE)) 782 if (head->flag [FLAG_ALIVE])
628 { 783 {
629 object *check = head; 784 object *check = head;
630 int size_x = 0; 785 int size_x = 0;
631 int size_y = 0; 786 int size_y = 0;
632 787
633 while (check) 788 while (check)
634 { 789 {
635 size_x = MAX (size_x, check->arch->x); 790 size_x = max (size_x, check->arch->x);
636 size_y = MAX (size_y, check->arch->y); 791 size_y = max (size_y, check->arch->y);
637 check = check->more; 792 check = check->more;
638 } 793 }
639 794
640 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))
641 { 796 {
… …
723 878
724 char *dump = dump_object (tmp); 879 char *dump = dump_object (tmp);
725 new_draw_info (NDI_UNIQUE, 0, op, dump); 880 new_draw_info (NDI_UNIQUE, 0, op, dump);
726 free (dump); 881 free (dump);
727 882
728 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 883 if (tmp->flag [FLAG_OBJ_ORIGINAL])
729 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 884 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
730 885
731 return 1; 886 return 1;
732} 887}
733 888
… …
778 { 933 {
779 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!");
780 return 1; 935 return 1;
781 } 936 }
782 937
783 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 938 if (tmp->flag [FLAG_REMOVED])
784 { 939 {
785 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));
786 return 1; 941 return 1;
787 } 942 }
788 943
… …
832 int q; 987 int q;
833 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure 988 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
834 object *skillob = NULL; 989 object *skillob = NULL;
835 990
836 skill[0] = '\0'; 991 skill[0] = '\0';
837 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %s", buf, &i, skill)) < 2)) 992 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %[^\n]", buf, &i, skill)) < 2))
838 { 993 {
839 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>].");
840 return 1; 995 return 1;
841 } 996 }
842 997
… …
878/**************************************************************************/ 1033/**************************************************************************/
879 1034
880int 1035int
881command_stats (object *op, char *params) 1036command_stats (object *op, char *params)
882{ 1037{
883 char thing[20];
884 char buf[MAX_BUF]; 1038 char buf[MAX_BUF];
885 1039
886 thing[0] = '\0'; 1040 if (params == NULL || params[0] == '\0')
887 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
888 { 1041 {
889 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1042 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
890 return 1; 1043 return 1;
891 } 1044 }
892 1045
893 for_all_players (pl) 1046 for_all_players (pl)
894 if (!strcmp (pl->ob->name, thing)) 1047 if (!strcmp (&pl->ob->name, params))
895 { 1048 {
896 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);
897 new_draw_info (NDI_UNIQUE, 0, op, buf); 1050 new_draw_info (NDI_UNIQUE, 0, op, buf);
898 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);
899 new_draw_info (NDI_UNIQUE, 0, op, buf); 1052 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
942 return 1; 1095 return 1;
943 } 1096 }
944 1097
945 for_all_players (pl) 1098 for_all_players (pl)
946 { 1099 {
947 if (!strcmp (pl->ob->name, thing)) 1100 if (!strcmp (&pl->ob->name, thing))
948 { 1101 {
949 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;
950 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;
951 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;
952 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;
… …
966} 1119}
967 1120
968int 1121int
969command_nowiz (object *op, char *params) 1122command_nowiz (object *op, char *params)
970{ /* 'nodm' is alias */ 1123{ /* 'nodm' is alias */
971 CLEAR_FLAG (op, FLAG_WIZ); 1124 op->clr_flag (FLAG_WIZ);
972 CLEAR_FLAG (op, FLAG_WIZPASS); 1125 op->clr_flag (FLAG_WIZPASS);
973 CLEAR_FLAG (op, FLAG_WIZCAST); 1126 op->clr_flag (FLAG_WIZCAST);
974 CLEAR_FLAG (op, FLAG_WIZLOOK); 1127 op->clr_flag (FLAG_WIZLOOK);
975 op->contr->do_los = 1; 1128 op->contr->do_los = 1;
976 1129
977 if (op->contr->hidden) 1130 if (op->contr->hidden)
978 { 1131 {
979 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");
… …
1029 } 1182 }
1030 fclose (dmfile); 1183 fclose (dmfile);
1031 return (0); 1184 return (0);
1032} 1185}
1033 1186
1034int 1187static int
1035do_wizard_dm (object *op, char *params, int silent) 1188do_wizard_dm (object *op, char *params, int silent)
1036{ 1189{
1037 if (!op->contr) 1190 if (!op->contr)
1038 return 0; 1191 return 0;
1039 1192
1040 if (QUERY_FLAG (op, FLAG_WIZ)) 1193 if (op->flag [FLAG_WIZ])
1041 { 1194 {
1042 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!");
1043 return 0; 1196 return 0;
1044 } 1197 }
1045 1198
1046 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1199 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1047 { 1200 {
1048 SET_FLAG (op, FLAG_WIZ); 1201 op->set_flag (FLAG_WIZ);
1049 SET_FLAG (op, FLAG_WIZPASS); 1202 op->set_flag (FLAG_WIZPASS);
1050 SET_FLAG (op, FLAG_WIZCAST); 1203 op->set_flag (FLAG_WIZCAST);
1051 SET_FLAG (op, FLAG_WIZLOOK); 1204 op->set_flag (FLAG_WIZLOOK);
1052 op->contr->do_los = 1; 1205 op->contr->do_los = 1;
1053 1206
1054 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!");
1055 op->contr->write_buf[0] = '\0'; 1208 op->contr->write_buf[0] = '\0';
1056 1209
… …
1101 * Used for wizard's learn spell/prayer. 1254 * Used for wizard's learn spell/prayer.
1102 * 1255 *
1103 * op is the player issuing the command. 1256 * op is the player issuing the command.
1104 */ 1257 */
1105static object * 1258static object *
1106get_spell_by_name (object *op, const char *spell_name) 1259get_spell_by_name (object *op, shstr_cmp spell_name)
1107{ 1260{
1108 archetype *at;
1109 archetype *found;
1110 int conflict_found;
1111 size_t spell_name_length;
1112
1113 /* First check for full name matches. */ 1261 /* First check for full name matches. */
1114 conflict_found = 0; 1262 int conflict_found = 0;
1115 found = NULL; 1263 archetype *found = 0;
1264
1116 for_all_archetypes (at) 1265 for_all_archetypes (at)
1117 { 1266 {
1118 if (at->type != SPELL) 1267 if (at->type != SPELL)
1119 continue; 1268 continue;
1120 1269
1121 if (strcmp (at->object::name, spell_name) != 0) 1270 if (at->object::name != spell_name)
1122 continue; 1271 continue;
1123 1272
1124 if (found) 1273 if (found)
1125 { 1274 {
1126 if (!conflict_found) 1275 if (!conflict_found)
1127 { 1276 {
1128 conflict_found = 1; 1277 conflict_found = 1;
1129 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);
1130 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname); 1279 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1131 } 1280 }
1132 1281
1133 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname); 1282 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1134 continue; 1283 return 0;
1135 } 1284 }
1136 1285
1137 found = at; 1286 found = at;
1138 } 1287 }
1139 1288
1140 /* No match if more more than one archetype matches. */
1141 if (conflict_found)
1142 return NULL;
1143
1144 /* Return if exactly one archetype matches. */ 1289 /* Return if exactly one archetype matches. */
1145 if (found != NULL) 1290 if (found)
1146 return arch_to_object (found); 1291 return found->instance ();
1147
1148 /* No full match found: now check for partial matches. */
1149 spell_name_length = strlen (spell_name);
1150 conflict_found = 0;
1151 found = NULL;
1152 for_all_archetypes (at)
1153 {
1154 if (at->type != SPELL)
1155 continue;
1156
1157 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1158 continue;
1159
1160 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1161 continue;
1162
1163 if (found != NULL)
1164 {
1165 if (!conflict_found)
1166 {
1167 conflict_found = 1;
1168 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1169 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1170 }
1171 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1172 continue;
1173 }
1174
1175 found = at;
1176 }
1177
1178 /* No match if more more than one archetype matches. */
1179 if (conflict_found)
1180 return NULL;
1181
1182 /* Return if exactly one archetype matches. */
1183 if (found != NULL)
1184 return arch_to_object (found);
1185 1292
1186 /* No spell found: just print an error message. */ 1293 /* No spell found: just print an error message. */
1187 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
1188 return NULL; 1296 return 0;
1189} 1297}
1190 1298
1191static int 1299static int
1192command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1300command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1193{ 1301{
… …
1237 { 1345 {
1238 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?");
1239 return 0; 1347 return 0;
1240 } 1348 }
1241 1349
1242 spell = lookup_spell_by_name (op, params); 1350 spell = op->find_spell (params);
1243 if (spell == NULL) 1351 if (spell == NULL)
1244 { 1352 {
1245 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);
1246 return 0; 1354 return 0;
1247 } 1355 }
… …
1262 return 0; 1370 return 0;
1263 1371
1264 do_wizard_hide (op, 1); 1372 do_wizard_hide (op, 1);
1265 1373
1266 return 1; 1374 return 1;
1267}
1268
1269void
1270dm_stack_pop (player *pl)
1271{
1272 if (!pl->stack_items || !pl->stack_position)
1273 {
1274 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1275 return;
1276 }
1277
1278 pl->stack_position--;
1279 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1280}
1281
1282/**
1283 * Get current stack top item for player.
1284 * Returns NULL if no stacked item.
1285 * If stacked item disappeared (freed), remove it.
1286 *
1287 * Ryo, august 2004
1288 */
1289object *
1290dm_stack_peek (player *pl)
1291{
1292 object *ob;
1293
1294 if (!pl->stack_position)
1295 {
1296 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1297 return NULL;
1298 }
1299
1300 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1301 if (!ob)
1302 {
1303 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1304 dm_stack_pop (pl);
1305 return NULL;
1306 }
1307
1308 return ob;
1309}
1310
1311/**
1312 * Push specified item on player stack.
1313 * Inform player of position.
1314 * Initializes variables if needed.
1315 */
1316void
1317dm_stack_push (player *pl, tag_t item)
1318{
1319 if (!pl->stack_items)
1320 {
1321 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1322 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1323 }
1324
1325 if (pl->stack_position == STACK_SIZE)
1326 {
1327 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1328 return;
1329 }
1330
1331 pl->stack_items[pl->stack_position] = item;
1332 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1333 pl->stack_position++;
1334}
1335
1336/**
1337 * Checks 'params' for object code.
1338 *
1339 * Can be:
1340 * * empty => get current object stack top for player
1341 * * number => get item with that tag, stack it for future use
1342 * * $number => get specified stack item
1343 * * "me" => player himself
1344 *
1345 * At function exit, params points to first non-object char
1346 *
1347 * 'from', if not NULL, contains at exit:
1348 * * STACK_FROM_NONE => object not found
1349 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1350 * * STACK_FROM_STACK => item from somewhere in the stack
1351 * * STACK_FROM_NUMBER => item by number, pushed on stack
1352 *
1353 * Ryo, august 2004
1354 */
1355object *
1356get_dm_object (player *pl, char **params, int *from)
1357{
1358 int item_tag, item_position;
1359 object *ob;
1360
1361 if (!pl)
1362 return NULL;
1363
1364 if (!params || !*params || **params == '\0')
1365 {
1366 if (from)
1367 *from = STACK_FROM_TOP;
1368 /* No parameter => get stack item */
1369 return dm_stack_peek (pl);
1370 }
1371
1372 /* Let's clean white spaces */
1373 while (**params == ' ')
1374 (*params)++;
1375
1376 /* Next case: number => item tag */
1377 if (sscanf (*params, "%d", &item_tag))
1378 {
1379 /* Move parameter to next item */
1380 while (isdigit (**params))
1381 (*params)++;
1382
1383 /* And skip blanks, too */
1384 while (**params == ' ')
1385 (*params)++;
1386
1387 /* Get item */
1388 ob = find_object (item_tag);
1389 if (!ob)
1390 {
1391 if (from)
1392 *from = STACK_FROM_NONE;
1393 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1394 return NULL;
1395 }
1396
1397 /* Got one, let's push it on stack */
1398 dm_stack_push (pl, item_tag);
1399 if (from)
1400 *from = STACK_FROM_NUMBER;
1401 return ob;
1402 }
1403
1404 /* Next case: $number => stack item */
1405 if (sscanf (*params, "$%d", &item_position))
1406 {
1407 /* Move parameter to next item */
1408 (*params)++;
1409
1410 while (isdigit (**params))
1411 (*params)++;
1412 while (**params == ' ')
1413 (*params)++;
1414
1415 if (item_position >= pl->stack_position)
1416 {
1417 if (from)
1418 *from = STACK_FROM_NONE;
1419 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1420 return NULL;
1421 }
1422
1423 ob = find_object (pl->stack_items[item_position]);
1424 if (!ob)
1425 {
1426 if (from)
1427 *from = STACK_FROM_NONE;
1428 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1429 return NULL;
1430 }
1431
1432 if (from)
1433 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1434 return ob;
1435 }
1436
1437 /* Next case: 'me' => return pl->ob */
1438 if (!strncmp (*params, "me", 2))
1439 {
1440 if (from)
1441 *from = STACK_FROM_NUMBER;
1442 dm_stack_push (pl, pl->ob->count);
1443
1444 /* Skip to next token */
1445 (*params) += 2;
1446 while (**params == ' ')
1447 (*params)++;
1448
1449 return pl->ob;
1450 }
1451
1452 /* Last case: get stack top */
1453 if (from)
1454 *from = STACK_FROM_TOP;
1455 return dm_stack_peek (pl);
1456} 1375}
1457 1376
1458/** 1377/**
1459 * Pop the stack top. 1378 * Pop the stack top.
1460 */ 1379 */
… …
1520} 1439}
1521 1440
1522int 1441int
1523command_insert_into (object *op, char *params) 1442command_insert_into (object *op, char *params)
1524{ 1443{
1525 object *left, *right, *inserted; 1444 object *left, *right;
1526 int left_from, right_from; 1445 int left_from, right_from;
1527 1446
1528 left = get_dm_object (op->contr, &params, &left_from); 1447 left = get_dm_object (op->contr, &params, &left_from);
1529 if (!left) 1448 if (!left)
1530 { 1449 {
… …
1573 { 1492 {
1574 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!");
1575 return 0; 1494 return 0;
1576 } 1495 }
1577 1496
1578 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1497 if (!right->flag [FLAG_REMOVED])
1579 right->remove (); 1498 right->remove ();
1580 1499
1581 insert_ob_in_ob (right, left); 1500 object *inserted = insert_ob_in_ob (right, left);
1582 1501
1583 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));
1584 1503
1585 return 0; 1504 return 0;
1586 1505

Diff Legend

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