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.55 by root, Wed Apr 30 06:40:28 2008 UTC vs.
Revision 1.88 by root, Fri Jan 27 22:00:40 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 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>
… …
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;
… …
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 tmp->insert (arch_to_object (at_spell)); 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;
583 tmp->map = op->map; 734 tmp->map = op->map;
584 735
… …
598 { 749 {
599 object *prev = 0, *head = 0; 750 object *prev = 0, *head = 0;
600 751
601 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more) 752 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
602 { 753 {
603 object *dup = arch_to_object (atmp); 754 object *dup = atmp->instance ();
604 755
605 if (at_spell) 756 if (at_spell)
606 insert_ob_in_ob (arch_to_object (at_spell), dup); 757 insert_ob_in_ob (at_spell->instance (), dup);
607 758
608 /* 759 /*
609 * The head is what contains all the important bits, 760 * The head is what contains all the important bits,
610 * so just copying it over should be fine. 761 * so just copying it over should be fine.
611 */ 762 */
… …
626 } 777 }
627 778
628 prev = dup; 779 prev = dup;
629 } 780 }
630 781
631 if (QUERY_FLAG (head, FLAG_ALIVE)) 782 if (head->flag [FLAG_ALIVE])
632 { 783 {
633 object *check = head; 784 object *check = head;
634 int size_x = 0; 785 int size_x = 0;
635 int size_y = 0; 786 int size_y = 0;
636 787
637 while (check) 788 while (check)
638 { 789 {
639 size_x = MAX (size_x, check->arch->x); 790 size_x = max (size_x, check->arch->x);
640 size_y = MAX (size_y, check->arch->y); 791 size_y = max (size_y, check->arch->y);
641 check = check->more; 792 check = check->more;
642 } 793 }
643 794
644 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))
645 { 796 {
… …
727 878
728 char *dump = dump_object (tmp); 879 char *dump = dump_object (tmp);
729 new_draw_info (NDI_UNIQUE, 0, op, dump); 880 new_draw_info (NDI_UNIQUE, 0, op, dump);
730 free (dump); 881 free (dump);
731 882
732 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 883 if (tmp->flag [FLAG_OBJ_ORIGINAL])
733 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 884 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
734 885
735 return 1; 886 return 1;
736} 887}
737 888
… …
782 { 933 {
783 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!");
784 return 1; 935 return 1;
785 } 936 }
786 937
787 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 938 if (tmp->flag [FLAG_REMOVED])
788 { 939 {
789 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));
790 return 1; 941 return 1;
791 } 942 }
792 943
… …
836 int q; 987 int q;
837 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
838 object *skillob = NULL; 989 object *skillob = NULL;
839 990
840 skill[0] = '\0'; 991 skill[0] = '\0';
841 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))
842 { 993 {
843 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>].");
844 return 1; 995 return 1;
845 } 996 }
846 997
… …
893 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1044 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
894 return 1; 1045 return 1;
895 } 1046 }
896 1047
897 for_all_players (pl) 1048 for_all_players (pl)
898 if (!strcmp (pl->ob->name, thing)) 1049 if (!strcmp (&pl->ob->name, thing))
899 { 1050 {
900 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1051 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
901 new_draw_info (NDI_UNIQUE, 0, op, buf); 1052 new_draw_info (NDI_UNIQUE, 0, op, buf);
902 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 1053 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
903 new_draw_info (NDI_UNIQUE, 0, op, buf); 1054 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
946 return 1; 1097 return 1;
947 } 1098 }
948 1099
949 for_all_players (pl) 1100 for_all_players (pl)
950 { 1101 {
951 if (!strcmp (pl->ob->name, thing)) 1102 if (!strcmp (&pl->ob->name, thing))
952 { 1103 {
953 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 1104 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
954 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 1105 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
955 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 1106 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
956 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 1107 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
… …
970} 1121}
971 1122
972int 1123int
973command_nowiz (object *op, char *params) 1124command_nowiz (object *op, char *params)
974{ /* 'nodm' is alias */ 1125{ /* 'nodm' is alias */
975 CLEAR_FLAG (op, FLAG_WIZ); 1126 op->clr_flag (FLAG_WIZ);
976 CLEAR_FLAG (op, FLAG_WIZPASS); 1127 op->clr_flag (FLAG_WIZPASS);
977 CLEAR_FLAG (op, FLAG_WIZCAST); 1128 op->clr_flag (FLAG_WIZCAST);
1129 op->clr_flag (FLAG_WIZLOOK);
1130 op->contr->do_los = 1;
978 1131
979 if (op->contr->hidden) 1132 if (op->contr->hidden)
980 { 1133 {
981 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 1134 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
982 op->map->players++; 1135 op->map->players++;
… …
984 op->contr->hidden = 0; 1137 op->contr->hidden = 0;
985 op->invisible = 1; 1138 op->invisible = 1;
986 } 1139 }
987 else 1140 else
988 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 1141 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
1142
989 return 1; 1143 return 1;
990} 1144}
991 1145
992/** 1146/**
993 * object *op is trying to become dm. 1147 * object *op is trying to become dm.
… …
1030 } 1184 }
1031 fclose (dmfile); 1185 fclose (dmfile);
1032 return (0); 1186 return (0);
1033} 1187}
1034 1188
1035int 1189static int
1036do_wizard_dm (object *op, char *params, int silent) 1190do_wizard_dm (object *op, char *params, int silent)
1037{ 1191{
1038 if (!op->contr) 1192 if (!op->contr)
1039 return 0; 1193 return 0;
1040 1194
1041 if (QUERY_FLAG (op, FLAG_WIZ)) 1195 if (op->flag [FLAG_WIZ])
1042 { 1196 {
1043 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1197 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1044 return 0; 1198 return 0;
1045 } 1199 }
1046 1200
1047 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1201 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1048 { 1202 {
1049 SET_FLAG (op, FLAG_WIZ); 1203 op->set_flag (FLAG_WIZ);
1050 SET_FLAG (op, FLAG_WIZPASS); 1204 op->set_flag (FLAG_WIZPASS);
1051 SET_FLAG (op, FLAG_WIZCAST); 1205 op->set_flag (FLAG_WIZCAST);
1206 op->set_flag (FLAG_WIZLOOK);
1207 op->contr->do_los = 1;
1052 1208
1053 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1209 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1054 /*
1055 * Remove setting flying here - that won't work, because next
1056 * fix_player() is called that will get cleared - proper solution
1057 * is probably something like a wiz_force which gives that and any
1058 * other desired abilities.
1059 */
1060 clear_los (op->contr);
1061 op->contr->write_buf[0] = '\0'; 1210 op->contr->write_buf[0] = '\0';
1062 1211
1063 if (!silent) 1212 if (!silent)
1064 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1213 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1065 1214
… …
1105 * Returns spell object (from archetypes) by name. 1254 * Returns spell object (from archetypes) by name.
1106 * Returns NULL if 0 or more than one spell matches. 1255 * Returns NULL if 0 or more than one spell matches.
1107 * Used for wizard's learn spell/prayer. 1256 * Used for wizard's learn spell/prayer.
1108 * 1257 *
1109 * op is the player issuing the command. 1258 * op is the player issuing the command.
1110 *
1111 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1112 * anymore (but may still be present in some player's inventories and thus
1113 * cannot be removed). We have to ignore them here since they have the same
1114 * name than other "spell_xxx" archetypes and would always conflict.
1115 */ 1259 */
1116static object * 1260static object *
1117get_spell_by_name (object *op, const char *spell_name) 1261get_spell_by_name (object *op, shstr_cmp spell_name)
1118{ 1262{
1119 archetype *at;
1120 archetype *found;
1121 int conflict_found;
1122 size_t spell_name_length;
1123
1124 /* First check for full name matches. */ 1263 /* First check for full name matches. */
1125 conflict_found = 0; 1264 int conflict_found = 0;
1126 found = NULL; 1265 archetype *found = 0;
1266
1127 for_all_archetypes (at) 1267 for_all_archetypes (at)
1128 { 1268 {
1129 if (at->type != SPELL) 1269 if (at->type != SPELL)
1130 continue; 1270 continue;
1131 1271
1132 if (strncmp (at->archname, "spelldirect_", 12) == 0) 1272 if (at->object::name != spell_name)
1133 continue; 1273 continue;
1134 1274
1135 if (strcmp (at->object::name, spell_name) != 0)
1136 continue;
1137
1138 if (found != NULL) 1275 if (found)
1139 { 1276 {
1140 if (!conflict_found) 1277 if (!conflict_found)
1141 { 1278 {
1142 conflict_found = 1; 1279 conflict_found = 1;
1143 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1280 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", &spell_name);
1144 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname); 1281 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1145 } 1282 }
1146 1283
1147 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname); 1284 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1148 continue; 1285 return 0;
1149 } 1286 }
1150 1287
1151 found = at; 1288 found = at;
1152 } 1289 }
1153 1290
1154 /* No match if more more than one archetype matches. */
1155 if (conflict_found)
1156 return NULL;
1157
1158 /* Return if exactly one archetype matches. */ 1291 /* Return if exactly one archetype matches. */
1159 if (found != NULL) 1292 if (found)
1160 return arch_to_object (found); 1293 return found->instance ();
1161
1162 /* No full match found: now check for partial matches. */
1163 spell_name_length = strlen (spell_name);
1164 conflict_found = 0;
1165 found = NULL;
1166 for_all_archetypes (at)
1167 {
1168 if (at->type != SPELL)
1169 continue;
1170
1171 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1172 continue;
1173
1174 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1175 continue;
1176
1177 if (found != NULL)
1178 {
1179 if (!conflict_found)
1180 {
1181 conflict_found = 1;
1182 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1183 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1184 }
1185 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1186 continue;
1187 }
1188
1189 found = at;
1190 }
1191
1192 /* No match if more more than one archetype matches. */
1193 if (conflict_found)
1194 return NULL;
1195
1196 /* Return if exactly one archetype matches. */
1197 if (found != NULL)
1198 return arch_to_object (found);
1199 1294
1200 /* No spell found: just print an error message. */ 1295 /* No spell found: just print an error message. */
1201 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", spell_name); 1296 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell does not exist.");
1297
1202 return NULL; 1298 return 0;
1203} 1299}
1204 1300
1205static int 1301static int
1206command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1302command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1207{ 1303{
… …
1276 return 0; 1372 return 0;
1277 1373
1278 do_wizard_hide (op, 1); 1374 do_wizard_hide (op, 1);
1279 1375
1280 return 1; 1376 return 1;
1281}
1282
1283void
1284dm_stack_pop (player *pl)
1285{
1286 if (!pl->stack_items || !pl->stack_position)
1287 {
1288 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1289 return;
1290 }
1291
1292 pl->stack_position--;
1293 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1294}
1295
1296/**
1297 * Get current stack top item for player.
1298 * Returns NULL if no stacked item.
1299 * If stacked item disappeared (freed), remove it.
1300 *
1301 * Ryo, august 2004
1302 */
1303object *
1304dm_stack_peek (player *pl)
1305{
1306 object *ob;
1307
1308 if (!pl->stack_position)
1309 {
1310 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1311 return NULL;
1312 }
1313
1314 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1315 if (!ob)
1316 {
1317 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1318 dm_stack_pop (pl);
1319 return NULL;
1320 }
1321
1322 return ob;
1323}
1324
1325/**
1326 * Push specified item on player stack.
1327 * Inform player of position.
1328 * Initializes variables if needed.
1329 */
1330void
1331dm_stack_push (player *pl, tag_t item)
1332{
1333 if (!pl->stack_items)
1334 {
1335 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1336 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1337 }
1338
1339 if (pl->stack_position == STACK_SIZE)
1340 {
1341 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1342 return;
1343 }
1344
1345 pl->stack_items[pl->stack_position] = item;
1346 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1347 pl->stack_position++;
1348}
1349
1350/**
1351 * Checks 'params' for object code.
1352 *
1353 * Can be:
1354 * * empty => get current object stack top for player
1355 * * number => get item with that tag, stack it for future use
1356 * * $number => get specified stack item
1357 * * "me" => player himself
1358 *
1359 * At function exit, params points to first non-object char
1360 *
1361 * 'from', if not NULL, contains at exit:
1362 * * STACK_FROM_NONE => object not found
1363 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1364 * * STACK_FROM_STACK => item from somewhere in the stack
1365 * * STACK_FROM_NUMBER => item by number, pushed on stack
1366 *
1367 * Ryo, august 2004
1368 */
1369object *
1370get_dm_object (player *pl, char **params, int *from)
1371{
1372 int item_tag, item_position;
1373 object *ob;
1374
1375 if (!pl)
1376 return NULL;
1377
1378 if (!params || !*params || **params == '\0')
1379 {
1380 if (from)
1381 *from = STACK_FROM_TOP;
1382 /* No parameter => get stack item */
1383 return dm_stack_peek (pl);
1384 }
1385
1386 /* Let's clean white spaces */
1387 while (**params == ' ')
1388 (*params)++;
1389
1390 /* Next case: number => item tag */
1391 if (sscanf (*params, "%d", &item_tag))
1392 {
1393 /* Move parameter to next item */
1394 while (isdigit (**params))
1395 (*params)++;
1396
1397 /* And skip blanks, too */
1398 while (**params == ' ')
1399 (*params)++;
1400
1401 /* Get item */
1402 ob = find_object (item_tag);
1403 if (!ob)
1404 {
1405 if (from)
1406 *from = STACK_FROM_NONE;
1407 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1408 return NULL;
1409 }
1410
1411 /* Got one, let's push it on stack */
1412 dm_stack_push (pl, item_tag);
1413 if (from)
1414 *from = STACK_FROM_NUMBER;
1415 return ob;
1416 }
1417
1418 /* Next case: $number => stack item */
1419 if (sscanf (*params, "$%d", &item_position))
1420 {
1421 /* Move parameter to next item */
1422 (*params)++;
1423
1424 while (isdigit (**params))
1425 (*params)++;
1426 while (**params == ' ')
1427 (*params)++;
1428
1429 if (item_position >= pl->stack_position)
1430 {
1431 if (from)
1432 *from = STACK_FROM_NONE;
1433 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1434 return NULL;
1435 }
1436
1437 ob = find_object (pl->stack_items[item_position]);
1438 if (!ob)
1439 {
1440 if (from)
1441 *from = STACK_FROM_NONE;
1442 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1443 return NULL;
1444 }
1445
1446 if (from)
1447 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1448 return ob;
1449 }
1450
1451 /* Next case: 'me' => return pl->ob */
1452 if (!strncmp (*params, "me", 2))
1453 {
1454 if (from)
1455 *from = STACK_FROM_NUMBER;
1456 dm_stack_push (pl, pl->ob->count);
1457
1458 /* Skip to next token */
1459 (*params) += 2;
1460 while (**params == ' ')
1461 (*params)++;
1462
1463 return pl->ob;
1464 }
1465
1466 /* Last case: get stack top */
1467 if (from)
1468 *from = STACK_FROM_TOP;
1469 return dm_stack_peek (pl);
1470} 1377}
1471 1378
1472/** 1379/**
1473 * Pop the stack top. 1380 * Pop the stack top.
1474 */ 1381 */
… …
1534} 1441}
1535 1442
1536int 1443int
1537command_insert_into (object *op, char *params) 1444command_insert_into (object *op, char *params)
1538{ 1445{
1539 object *left, *right, *inserted; 1446 object *left, *right;
1540 int left_from, right_from; 1447 int left_from, right_from;
1541 1448
1542 left = get_dm_object (op->contr, &params, &left_from); 1449 left = get_dm_object (op->contr, &params, &left_from);
1543 if (!left) 1450 if (!left)
1544 { 1451 {
… …
1587 { 1494 {
1588 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1495 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1589 return 0; 1496 return 0;
1590 } 1497 }
1591 1498
1592 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1499 if (!right->flag [FLAG_REMOVED])
1593 right->remove (); 1500 right->remove ();
1594 1501
1595 insert_ob_in_ob (right, left); 1502 object *inserted = insert_ob_in_ob (right, left);
1596 1503
1597 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1504 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
1598 1505
1599 return 0; 1506 return 0;
1600 1507

Diff Legend

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