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.58 by root, Tue May 6 16:55:26 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;
… …
281 return 0; 425 return 0;
282 } 426 }
283 427
284 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO 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 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);
320 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 477 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
321 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 478 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
322 479
323 return 1; 480 return 1;
324} 481}
… …
341int 498int
342command_create (object *op, char *params) 499command_create (object *op, char *params)
343{ 500{
344 object *tmp = NULL; 501 object *tmp = NULL;
345 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;
346 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline; 503 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *endline;
347 archetype *at, *at_spell = NULL; 504 archetype *at, *at_spell = NULL;
348 artifact *art = NULL; 505 artifact *art = NULL;
349 506
350 if (!op) 507 if (!op)
351 return 0; 508 return 0;
… …
450 { 607 {
451 art = find_artifactlist (at->type)->items; 608 art = find_artifactlist (at->type)->items;
452 609
453 while (art) 610 while (art)
454 { 611 {
455 if (!strcmp (art->item->name, cp)) 612 if (!strcmp (&art->item->name, cp))
456 break; 613 break;
457 614
458 art = art->next; 615 art = art->next;
459 } 616 }
460 617
… …
476 /* 633 /*
477 * 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,
478 * just create one object, do all the processing, and then determine 635 * just create one object, do all the processing, and then determine
479 * 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.
480 */ 637 */
481 tmp = arch_to_object (at); 638 tmp = at->instance ();
482 639
483 if (set_magic) 640 if (set_magic)
484 set_abs_magic (tmp, magic); 641 set_abs_magic (tmp, magic);
485 642
486 if (art) 643 if (art)
487 give_artifact_abilities (tmp, art->item); 644 give_artifact_abilities (tmp, art->item);
488 645
489 if (need_identify (tmp)) 646 if (tmp->need_identify ())
490 { 647 {
491 SET_FLAG (tmp, FLAG_IDENTIFIED); 648 tmp->set_flag (FLAG_IDENTIFIED);
492 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 649 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
493 } 650 }
494 651
495 /* 652 /*
496 * This entire block here tries to find variable pairings, 653 * This entire block here tries to find variable pairings,
497 * 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
… …
499 * 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,
500 * any spaces there don't count. 657 * any spaces there don't count.
501 */ 658 */
502 while (*bp2 && bp2 <= endline) 659 while (*bp2 && bp2 <= endline)
503 { 660 {
504 bp4 = NULL;
505 gotspace = 0; 661 gotspace = 0;
506 gotquote = 0; 662 gotquote = 0;
507 663
508 /* find the first quote */ 664 /* find the first quote */
509 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) 665 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
… …
569 } 725 }
570 726
571 if (at->nrof) 727 if (at->nrof)
572 { 728 {
573 if (at_spell) 729 if (at_spell)
574 tmp->insert (arch_to_object (at_spell)); 730 tmp->insert (at_spell->instance ());
575 731
576 tmp->x = op->x; 732 tmp->x = op->x;
577 tmp->y = op->y; 733 tmp->y = op->y;
578 tmp->map = op->map; 734 tmp->map = op->map;
579 735
… …
593 { 749 {
594 object *prev = 0, *head = 0; 750 object *prev = 0, *head = 0;
595 751
596 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more) 752 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
597 { 753 {
598 object *dup = arch_to_object (atmp); 754 object *dup = atmp->instance ();
599 755
600 if (at_spell) 756 if (at_spell)
601 insert_ob_in_ob (arch_to_object (at_spell), dup); 757 insert_ob_in_ob (at_spell->instance (), dup);
602 758
603 /* 759 /*
604 * The head is what contains all the important bits, 760 * The head is what contains all the important bits,
605 * so just copying it over should be fine. 761 * so just copying it over should be fine.
606 */ 762 */
… …
621 } 777 }
622 778
623 prev = dup; 779 prev = dup;
624 } 780 }
625 781
626 if (QUERY_FLAG (head, FLAG_ALIVE)) 782 if (head->flag [FLAG_ALIVE])
627 { 783 {
628 object *check = head; 784 object *check = head;
629 int size_x = 0; 785 int size_x = 0;
630 int size_y = 0; 786 int size_y = 0;
631 787
632 while (check) 788 while (check)
633 { 789 {
634 size_x = MAX (size_x, check->arch->x); 790 size_x = max (size_x, check->arch->x);
635 size_y = MAX (size_y, check->arch->y); 791 size_y = max (size_y, check->arch->y);
636 check = check->more; 792 check = check->more;
637 } 793 }
638 794
639 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))
640 { 796 {
… …
722 878
723 char *dump = dump_object (tmp); 879 char *dump = dump_object (tmp);
724 new_draw_info (NDI_UNIQUE, 0, op, dump); 880 new_draw_info (NDI_UNIQUE, 0, op, dump);
725 free (dump); 881 free (dump);
726 882
727 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 883 if (tmp->flag [FLAG_OBJ_ORIGINAL])
728 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 884 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
729 885
730 return 1; 886 return 1;
731} 887}
732 888
… …
777 { 933 {
778 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!");
779 return 1; 935 return 1;
780 } 936 }
781 937
782 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 938 if (tmp->flag [FLAG_REMOVED])
783 { 939 {
784 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));
785 return 1; 941 return 1;
786 } 942 }
787 943
… …
831 int q; 987 int q;
832 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
833 object *skillob = NULL; 989 object *skillob = NULL;
834 990
835 skill[0] = '\0'; 991 skill[0] = '\0';
836 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))
837 { 993 {
838 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>].");
839 return 1; 995 return 1;
840 } 996 }
841 997
… …
877/**************************************************************************/ 1033/**************************************************************************/
878 1034
879int 1035int
880command_stats (object *op, char *params) 1036command_stats (object *op, char *params)
881{ 1037{
882 char thing[20];
883 char buf[MAX_BUF]; 1038 char buf[MAX_BUF];
884 1039
885 thing[0] = '\0'; 1040 if (params == NULL || params[0] == '\0')
886 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
887 { 1041 {
888 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1042 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
889 return 1; 1043 return 1;
890 } 1044 }
891 1045
892 for_all_players (pl) 1046 for_all_players (pl)
893 if (!strcmp (pl->ob->name, thing)) 1047 if (!strcmp (&pl->ob->name, params))
894 { 1048 {
895 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);
896 new_draw_info (NDI_UNIQUE, 0, op, buf); 1050 new_draw_info (NDI_UNIQUE, 0, op, buf);
897 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);
898 new_draw_info (NDI_UNIQUE, 0, op, buf); 1052 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
941 return 1; 1095 return 1;
942 } 1096 }
943 1097
944 for_all_players (pl) 1098 for_all_players (pl)
945 { 1099 {
946 if (!strcmp (pl->ob->name, thing)) 1100 if (!strcmp (&pl->ob->name, thing))
947 { 1101 {
948 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;
949 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;
950 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;
951 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;
… …
965} 1119}
966 1120
967int 1121int
968command_nowiz (object *op, char *params) 1122command_nowiz (object *op, char *params)
969{ /* 'nodm' is alias */ 1123{ /* 'nodm' is alias */
970 CLEAR_FLAG (op, FLAG_WIZ); 1124 op->clr_flag (FLAG_WIZ);
971 CLEAR_FLAG (op, FLAG_WIZPASS); 1125 op->clr_flag (FLAG_WIZPASS);
972 CLEAR_FLAG (op, FLAG_WIZCAST); 1126 op->clr_flag (FLAG_WIZCAST);
1127 op->clr_flag (FLAG_WIZLOOK);
1128 op->contr->do_los = 1;
973 1129
974 if (op->contr->hidden) 1130 if (op->contr->hidden)
975 { 1131 {
976 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");
977 op->map->players++; 1133 op->map->players++;
… …
979 op->contr->hidden = 0; 1135 op->contr->hidden = 0;
980 op->invisible = 1; 1136 op->invisible = 1;
981 } 1137 }
982 else 1138 else
983 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
984 return 1; 1141 return 1;
985} 1142}
986 1143
987/** 1144/**
988 * object *op is trying to become dm. 1145 * object *op is trying to become dm.
… …
1025 } 1182 }
1026 fclose (dmfile); 1183 fclose (dmfile);
1027 return (0); 1184 return (0);
1028} 1185}
1029 1186
1030int 1187static int
1031do_wizard_dm (object *op, char *params, int silent) 1188do_wizard_dm (object *op, char *params, int silent)
1032{ 1189{
1033 if (!op->contr) 1190 if (!op->contr)
1034 return 0; 1191 return 0;
1035 1192
1036 if (QUERY_FLAG (op, FLAG_WIZ)) 1193 if (op->flag [FLAG_WIZ])
1037 { 1194 {
1038 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!");
1039 return 0; 1196 return 0;
1040 } 1197 }
1041 1198
1042 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1199 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1043 { 1200 {
1044 SET_FLAG (op, FLAG_WIZ); 1201 op->set_flag (FLAG_WIZ);
1045 SET_FLAG (op, FLAG_WIZPASS); 1202 op->set_flag (FLAG_WIZPASS);
1046 SET_FLAG (op, FLAG_WIZCAST); 1203 op->set_flag (FLAG_WIZCAST);
1204 op->set_flag (FLAG_WIZLOOK);
1205 op->contr->do_los = 1;
1047 1206
1048 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!");
1049 /*
1050 * Remove setting flying here - that won't work, because next
1051 * fix_player() is called that will get cleared - proper solution
1052 * is probably something like a wiz_force which gives that and any
1053 * other desired abilities.
1054 */
1055 clear_los (op->contr);
1056 op->contr->write_buf[0] = '\0'; 1208 op->contr->write_buf[0] = '\0';
1057 1209
1058 if (!silent) 1210 if (!silent)
1059 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!");
1060 1212
… …
1100 * Returns spell object (from archetypes) by name. 1252 * Returns spell object (from archetypes) by name.
1101 * Returns NULL if 0 or more than one spell matches. 1253 * Returns NULL if 0 or more than one spell matches.
1102 * Used for wizard's learn spell/prayer. 1254 * Used for wizard's learn spell/prayer.
1103 * 1255 *
1104 * op is the player issuing the command. 1256 * op is the player issuing the command.
1105 *
1106 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1107 * anymore (but may still be present in some player's inventories and thus
1108 * cannot be removed). We have to ignore them here since they have the same
1109 * name than other "spell_xxx" archetypes and would always conflict.
1110 */ 1257 */
1111static object * 1258static object *
1112get_spell_by_name (object *op, const char *spell_name) 1259get_spell_by_name (object *op, shstr_cmp spell_name)
1113{ 1260{
1114 archetype *at;
1115 archetype *found;
1116 int conflict_found;
1117 size_t spell_name_length;
1118
1119 /* First check for full name matches. */ 1261 /* First check for full name matches. */
1120 conflict_found = 0; 1262 int conflict_found = 0;
1121 found = NULL; 1263 archetype *found = 0;
1264
1122 for_all_archetypes (at) 1265 for_all_archetypes (at)
1123 { 1266 {
1124 if (at->type != SPELL) 1267 if (at->type != SPELL)
1125 continue; 1268 continue;
1126 1269
1127 if (strncmp (at->archname, "spelldirect_", 12) == 0) 1270 if (at->object::name != spell_name)
1128 continue; 1271 continue;
1129 1272
1130 if (strcmp (at->object::name, spell_name) != 0)
1131 continue;
1132
1133 if (found != NULL) 1273 if (found)
1134 { 1274 {
1135 if (!conflict_found) 1275 if (!conflict_found)
1136 { 1276 {
1137 conflict_found = 1; 1277 conflict_found = 1;
1138 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);
1139 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname); 1279 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1140 } 1280 }
1141 1281
1142 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname); 1282 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1143 continue; 1283 return 0;
1144 } 1284 }
1145 1285
1146 found = at; 1286 found = at;
1147 } 1287 }
1148 1288
1149 /* No match if more more than one archetype matches. */
1150 if (conflict_found)
1151 return NULL;
1152
1153 /* Return if exactly one archetype matches. */ 1289 /* Return if exactly one archetype matches. */
1154 if (found != NULL) 1290 if (found)
1155 return arch_to_object (found); 1291 return found->instance ();
1156
1157 /* No full match found: now check for partial matches. */
1158 spell_name_length = strlen (spell_name);
1159 conflict_found = 0;
1160 found = NULL;
1161 for_all_archetypes (at)
1162 {
1163 if (at->type != SPELL)
1164 continue;
1165
1166 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1167 continue;
1168
1169 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1170 continue;
1171
1172 if (found != NULL)
1173 {
1174 if (!conflict_found)
1175 {
1176 conflict_found = 1;
1177 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1178 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1179 }
1180 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1181 continue;
1182 }
1183
1184 found = at;
1185 }
1186
1187 /* No match if more more than one archetype matches. */
1188 if (conflict_found)
1189 return NULL;
1190
1191 /* Return if exactly one archetype matches. */
1192 if (found != NULL)
1193 return arch_to_object (found);
1194 1292
1195 /* No spell found: just print an error message. */ 1293 /* No spell found: just print an error message. */
1196 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
1197 return NULL; 1296 return 0;
1198} 1297}
1199 1298
1200static int 1299static int
1201command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1300command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1202{ 1301{
… …
1246 { 1345 {
1247 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?");
1248 return 0; 1347 return 0;
1249 } 1348 }
1250 1349
1251 spell = lookup_spell_by_name (op, params); 1350 spell = op->find_spell (params);
1252 if (spell == NULL) 1351 if (spell == NULL)
1253 { 1352 {
1254 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);
1255 return 0; 1354 return 0;
1256 } 1355 }
… …
1271 return 0; 1370 return 0;
1272 1371
1273 do_wizard_hide (op, 1); 1372 do_wizard_hide (op, 1);
1274 1373
1275 return 1; 1374 return 1;
1276}
1277
1278void
1279dm_stack_pop (player *pl)
1280{
1281 if (!pl->stack_items || !pl->stack_position)
1282 {
1283 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1284 return;
1285 }
1286
1287 pl->stack_position--;
1288 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1289}
1290
1291/**
1292 * Get current stack top item for player.
1293 * Returns NULL if no stacked item.
1294 * If stacked item disappeared (freed), remove it.
1295 *
1296 * Ryo, august 2004
1297 */
1298object *
1299dm_stack_peek (player *pl)
1300{
1301 object *ob;
1302
1303 if (!pl->stack_position)
1304 {
1305 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1306 return NULL;
1307 }
1308
1309 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1310 if (!ob)
1311 {
1312 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1313 dm_stack_pop (pl);
1314 return NULL;
1315 }
1316
1317 return ob;
1318}
1319
1320/**
1321 * Push specified item on player stack.
1322 * Inform player of position.
1323 * Initializes variables if needed.
1324 */
1325void
1326dm_stack_push (player *pl, tag_t item)
1327{
1328 if (!pl->stack_items)
1329 {
1330 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1331 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1332 }
1333
1334 if (pl->stack_position == STACK_SIZE)
1335 {
1336 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1337 return;
1338 }
1339
1340 pl->stack_items[pl->stack_position] = item;
1341 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1342 pl->stack_position++;
1343}
1344
1345/**
1346 * Checks 'params' for object code.
1347 *
1348 * Can be:
1349 * * empty => get current object stack top for player
1350 * * number => get item with that tag, stack it for future use
1351 * * $number => get specified stack item
1352 * * "me" => player himself
1353 *
1354 * At function exit, params points to first non-object char
1355 *
1356 * 'from', if not NULL, contains at exit:
1357 * * STACK_FROM_NONE => object not found
1358 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1359 * * STACK_FROM_STACK => item from somewhere in the stack
1360 * * STACK_FROM_NUMBER => item by number, pushed on stack
1361 *
1362 * Ryo, august 2004
1363 */
1364object *
1365get_dm_object (player *pl, char **params, int *from)
1366{
1367 int item_tag, item_position;
1368 object *ob;
1369
1370 if (!pl)
1371 return NULL;
1372
1373 if (!params || !*params || **params == '\0')
1374 {
1375 if (from)
1376 *from = STACK_FROM_TOP;
1377 /* No parameter => get stack item */
1378 return dm_stack_peek (pl);
1379 }
1380
1381 /* Let's clean white spaces */
1382 while (**params == ' ')
1383 (*params)++;
1384
1385 /* Next case: number => item tag */
1386 if (sscanf (*params, "%d", &item_tag))
1387 {
1388 /* Move parameter to next item */
1389 while (isdigit (**params))
1390 (*params)++;
1391
1392 /* And skip blanks, too */
1393 while (**params == ' ')
1394 (*params)++;
1395
1396 /* Get item */
1397 ob = find_object (item_tag);
1398 if (!ob)
1399 {
1400 if (from)
1401 *from = STACK_FROM_NONE;
1402 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1403 return NULL;
1404 }
1405
1406 /* Got one, let's push it on stack */
1407 dm_stack_push (pl, item_tag);
1408 if (from)
1409 *from = STACK_FROM_NUMBER;
1410 return ob;
1411 }
1412
1413 /* Next case: $number => stack item */
1414 if (sscanf (*params, "$%d", &item_position))
1415 {
1416 /* Move parameter to next item */
1417 (*params)++;
1418
1419 while (isdigit (**params))
1420 (*params)++;
1421 while (**params == ' ')
1422 (*params)++;
1423
1424 if (item_position >= pl->stack_position)
1425 {
1426 if (from)
1427 *from = STACK_FROM_NONE;
1428 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1429 return NULL;
1430 }
1431
1432 ob = find_object (pl->stack_items[item_position]);
1433 if (!ob)
1434 {
1435 if (from)
1436 *from = STACK_FROM_NONE;
1437 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1438 return NULL;
1439 }
1440
1441 if (from)
1442 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1443 return ob;
1444 }
1445
1446 /* Next case: 'me' => return pl->ob */
1447 if (!strncmp (*params, "me", 2))
1448 {
1449 if (from)
1450 *from = STACK_FROM_NUMBER;
1451 dm_stack_push (pl, pl->ob->count);
1452
1453 /* Skip to next token */
1454 (*params) += 2;
1455 while (**params == ' ')
1456 (*params)++;
1457
1458 return pl->ob;
1459 }
1460
1461 /* Last case: get stack top */
1462 if (from)
1463 *from = STACK_FROM_TOP;
1464 return dm_stack_peek (pl);
1465} 1375}
1466 1376
1467/** 1377/**
1468 * Pop the stack top. 1378 * Pop the stack top.
1469 */ 1379 */
… …
1529} 1439}
1530 1440
1531int 1441int
1532command_insert_into (object *op, char *params) 1442command_insert_into (object *op, char *params)
1533{ 1443{
1534 object *left, *right, *inserted; 1444 object *left, *right;
1535 int left_from, right_from; 1445 int left_from, right_from;
1536 1446
1537 left = get_dm_object (op->contr, &params, &left_from); 1447 left = get_dm_object (op->contr, &params, &left_from);
1538 if (!left) 1448 if (!left)
1539 { 1449 {
… …
1582 { 1492 {
1583 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!");
1584 return 0; 1494 return 0;
1585 } 1495 }
1586 1496
1587 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1497 if (!right->flag [FLAG_REMOVED])
1588 right->remove (); 1498 right->remove ();
1589 1499
1590 insert_ob_in_ob (right, left); 1500 object *inserted = insert_ob_in_ob (right, left);
1591 1501
1592 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));
1593 1503
1594 return 0; 1504 return 0;
1595 1505

Diff Legend

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