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.13 by root, Fri Sep 15 23:31:34 2006 UTC vs.
Revision 1.35 by root, Mon Feb 5 01:32:58 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#ifndef __CEXTRACT__
26# include <sproto.h> 26#include <sproto.h>
27#endif
28#include <spells.h> 27#include <spells.h>
29#include <treasure.h> 28#include <treasure.h>
30#include <skills.h> 29#include <skills.h>
31 30
32/** Defines for DM item stack **/ 31/** Defines for DM item stack **/
… …
47 * other player, or NULL otherwise. 46 * other player, or NULL otherwise.
48 */ 47 */
49static player * 48static player *
50get_other_player_from_name (object *op, char *name) 49get_other_player_from_name (object *op, char *name)
51{ 50{
52 player *pl;
53
54 if (!name) 51 if (!name)
55 return NULL; 52 return NULL;
56 53
57 for (pl = first_player; pl != NULL; pl = pl->next) 54 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 55 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 56 {
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
64 return NULL;
65 }
66
67 if (pl->ob == op) 57 if (pl->ob == op)
68 { 58 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 59 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 60 return NULL;
71 } 61 }
62
72 if (pl->state != ST_PLAYING) 63 if (pl->ns->state != ST_PLAYING)
73 { 64 {
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 65 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
75 return NULL; 66 return NULL;
76 }
77 return pl;
78}
79
80/**
81 * This command will stress server.
82 */
83int
84command_loadtest (object *op, char *params)
85{
86 uint32 x, y;
87 char buf[1024];
88
89 new_draw_info (NDI_UNIQUE, 0, op, "loadtest will stress server through teleporting");
90 new_draw_info (NDI_UNIQUE, 0, op, "at different map places.");
91 new_draw_info (NDI_UNIQUE, 0, op, "use at your own risks.");
92 new_draw_info (NDI_UNIQUE, 0, op, "Very long loop used so server may have to be reset.");
93 new_draw_info (NDI_UNIQUE, 0, op, "type loadtest TRUE to run");
94 new_draw_info_format (NDI_UNIQUE, 0, op, "{%s}", params);
95
96 if (!params)
97 return 0;
98
99 if (strncmp (params, "TRUE", 4))
100 return 0;
101
102 new_draw_info_format (NDI_UNIQUE, 0, op, "gogogo");
103
104 for (x = 0; x < settings.worldmaptilesx; x++)
105 {
106 for (y = 0; y < settings.worldmaptilesy; y++)
107 {
108 sprintf (buf, "/world/world_%d_%d", x + settings.worldmapstartx, y + settings.worldmapstarty);
109 command_goto (op, buf);
110 } 67 }
68
69 return pl;
111 } 70 }
112 71
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
113 return 0; 73 return 0;
114} 74}
115 75
116/** 76/**
117 * Actually hides specified player (obviously a DM). 77 * Actually hides specified player (obviously a DM).
… …
126 op->contr->hidden = 0; 86 op->contr->hidden = 0;
127 op->invisible = 1; 87 op->invisible = 1;
128 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 88 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
129 op->map->players++; 89 op->map->players++;
130 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 90 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
91
131 if (!silent_dm) 92 if (!silent_dm)
132 {
133 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 93 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
134 }
135 } 94 }
136 else 95 else
137 { 96 {
138 op->contr->hidden = 1; 97 op->contr->hidden = 1;
139 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); 98 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
140 op->map->players--; 99 op->map->players--;
100
141 if (!silent_dm) 101 if (!silent_dm)
142 {
143 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 102 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
144 } 103
145 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); 104 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name);
146 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); 105 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name);
147 } 106 }
148} 107}
149 108
… …
252 now = time (NULL); 211 now = time (NULL);
253 /* 212 /*
254 * Record this as a comment - then we don't have to worry about changing 213 * Record this as a comment - then we don't have to worry about changing
255 * the parsing code. 214 * the parsing code.
256 */ 215 */
257 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket.host, &op->name, ctime (&now)); 216 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
258 fprintf (banishfile, "*@%s\n", pl->socket.host); 217 fprintf (banishfile, "*@%s\n", pl->ns->host);
259 fclose (banishfile); 218 fclose (banishfile);
260 219
261 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host); 220 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
262 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name); 221 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
263 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name); 222 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
264 command_kick (op, (char *) &pl->ob->name); 223 command_kick (op, (char *) &pl->ob->name);
265 return 1; 224 return 1;
266} 225}
267 226
268int 227int
269command_kick (object *op, char *params) 228command_kick (object *op, char *params)
270{ 229{
271 struct pl *pl; 230 for_all_players (pl)
272
273 for (pl = first_player; pl != NULL; pl = pl->next)
274 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) 231 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
275 { 232 {
276 object *op = pl->ob; 233 object *op = pl->ob;
277 234
278 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 235 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
279 { 236 {
280 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 237 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
281 strcpy (op->contr->killer, "kicked"); 238 strcpy (op->contr->killer, "kicked");
282 } 239 }
283 240
284 pl->socket.status = Ns_Dead; 241 pl->ns->destroy ();
285 } 242 }
286 243
287 return 1; 244 return 1;
288} 245}
289 246
247//TODO
248#if 0
290int 249int
291command_save_overlay (object *op, char *params) 250command_save_overlay (object *op, char *params)
292{ 251{
293 if (!op) 252 if (!op)
294 return 0; 253 return 0;
… …
305 264
306 ready_map_name (op->map->path, 0); 265 ready_map_name (op->map->path, 0);
307 266
308 return 1; 267 return 1;
309} 268}
269#endif
310 270
311int 271int
312command_shutdown (object *op, char *params) 272command_shutdown (object *op, char *params)
313{ 273{
314 struct pl *pl;
315
316 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ)) 274 if (op && !QUERY_FLAG (op, FLAG_WIZ))
317 { 275 {
318 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server."); 276 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
319 return 1; 277 return 1;
320 } 278 }
321 279
322 cleanup (); 280 cleanup ("dm initiated shutdown", 0);
281
323 /* not reached */ 282 /* not reached */
324 return 1;
325}
326
327int
328command_goto (object *op, char *params)
329{
330 char *name;
331 object *dummy;
332
333 if (!op)
334 return 0;
335
336 if (params == NULL)
337 {
338 new_draw_info (NDI_UNIQUE, 0, op, "Go to what level?");
339 return 1;
340 }
341
342 name = params;
343 dummy = get_object ();
344 dummy->map = op->map;
345 EXIT_PATH (dummy) = name;
346 dummy->name = name;
347
348 enter_exit (op, dummy);
349 free_object (dummy);
350 if (op->contr->loading == NULL)
351 {
352 new_draw_info_format (NDI_UNIQUE, 0, op, "Difficulty: %d.", op->map->difficulty);
353 }
354
355 return 1;
356}
357
358/* is this function called from somewhere ? -Tero */
359int
360command_generate (object *op, char *params)
361{
362 object *tmp;
363 int nr = 1, i, retry;
364
365 if (!op)
366 return 0;
367
368 if (params != NULL)
369 sscanf (params, "%d", &nr);
370 for (i = 0; i < nr; i++)
371 {
372 retry = 50;
373 while ((tmp = generate_treasure (0, op->map->difficulty)) == NULL && --retry)
374 ;
375 if (tmp != NULL)
376 {
377 tmp = insert_ob_in_ob (tmp, op);
378 if (op->type == PLAYER)
379 esrv_send_item (op, tmp);
380 }
381 }
382
383 return 1; 283 return 1;
384} 284}
385 285
386int 286int
387command_freeze (object *op, char *params) 287command_freeze (object *op, char *params)
… …
425 object *dummy; 325 object *dummy;
426 player *pl; 326 player *pl;
427 327
428 if (!op) 328 if (!op)
429 return 0; 329 return 0;
330
430 if (params == NULL) 331 if (params == NULL)
431 { 332 {
432 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 333 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
433 return 1; 334 return 1;
434 } 335 }
336
435 pl = get_other_player_from_name (op, params); 337 pl = get_other_player_from_name (op, params);
436 if (!pl) 338 if (!pl)
437 return 1; 339 return 1;
340
438 dummy = get_jail_exit (pl->ob); 341 dummy = get_jail_exit (pl->ob);
439 if (!dummy) 342 if (!dummy)
440 { 343 {
441 /* we have nowhere to send the prisoner.... */ 344 /* we have nowhere to send the prisoner.... */
442 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 345 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
443 return 0; 346 return 0;
444 } 347 }
445 enter_exit (pl->ob, dummy); 348
446 free_object (dummy); 349 pl->ob->enter_exit (dummy);
350 dummy->destroy ();
447 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 351 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
448 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 352 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
449 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 353 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
450 return 1; 354 return 1;
451} 355}
… …
475 { 379 {
476 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 380 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
477 return 1; 381 return 1;
478 } 382 }
479 383
480 dummy = get_object (); 384 dummy = object::create ();
481 EXIT_PATH (dummy) = op->map->path; 385 EXIT_PATH (dummy) = op->map->path;
482 EXIT_X (dummy) = op->x + freearr_x[i]; 386 EXIT_X (dummy) = op->x + freearr_x[i];
483 EXIT_Y (dummy) = op->y + freearr_y[i]; 387 EXIT_Y (dummy) = op->y + freearr_y[i];
484 enter_exit (pl->ob, dummy); 388 pl->ob->enter_exit (dummy);
485 free_object (dummy); 389 dummy->destroy ();
486 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 390 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
487 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 391 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
488 392
489 return 1;
490}
491
492/**
493 * Teleport next to target player.
494 */
495
496/* mids 01/16/2002 */
497int
498command_teleport (object *op, char *params)
499{
500 int i;
501 object *dummy;
502 player *pl;
503
504 if (!op)
505 return 0;
506
507 if (params == NULL)
508 {
509 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
510 return 1;
511 }
512
513 pl = get_other_player_from_name (op, params);
514 if (!pl)
515 return 1;
516
517 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
518 if (i == -1)
519 {
520 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
521 return 1;
522 }
523
524 dummy = get_object ();
525 EXIT_PATH (dummy) = pl->ob->map->path;
526 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
527 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
528 enter_exit (op, dummy);
529 free_object (dummy);
530 if (!op->contr->hidden)
531 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
532 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
533 return 1; 393 return 1;
534} 394}
535 395
536/** 396/**
537 * This function is a real mess, because we're stucking getting 397 * This function is a real mess, because we're stucking getting
… …
631 at_spell = archetype::find (cp); 491 at_spell = archetype::find (cp);
632 if (!at_spell || at_spell->clone.type != SPELL) 492 if (!at_spell || at_spell->clone.type != SPELL)
633 at_spell = find_archetype_by_object_name (cp); 493 at_spell = find_archetype_by_object_name (cp);
634 if (!at_spell || at_spell->clone.type != SPELL) 494 if (!at_spell || at_spell->clone.type != SPELL)
635 { 495 {
636 strcpy (spell_name, cp); 496 assign (spell_name, cp);
637 fsp = strchr (spell_name, ' '); 497 fsp = strchr (spell_name, ' ');
638 if (fsp) 498 if (fsp)
639 { 499 {
640 *fsp = 0; 500 *fsp = 0;
641 fsp++; 501 fsp++;
… …
821 * so just copying it over should be fine. 681 * so just copying it over should be fine.
822 */ 682 */
823 if (!head) 683 if (!head)
824 { 684 {
825 head = dup; 685 head = dup;
826 copy_object (tmp, dup); 686 tmp->copy_to (dup);
827 } 687 }
828 688
829 if (settings.real_wiz == FALSE) 689 if (settings.real_wiz == FALSE)
830 SET_FLAG (dup, FLAG_WAS_WIZ); 690 SET_FLAG (dup, FLAG_WAS_WIZ);
831 691
… …
858 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 718 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
859 { 719 {
860 if (head->x < size_x || head->y < size_y) 720 if (head->x < size_x || head->y < size_y)
861 { 721 {
862 dm_stack_pop (op->contr); 722 dm_stack_pop (op->contr);
863 free_object (head); 723 head->destroy ();
864 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 724 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
865 free_object (tmp); 725 tmp->destroy ();
866 return 1; 726 return 1;
867 } 727 }
868 728
869 check = head; 729 check = head;
870 730
… …
892 752
893 esrv_send_item (op, head); 753 esrv_send_item (op, head);
894 } 754 }
895 755
896 /* free the one we used to copy */ 756 /* free the one we used to copy */
897 free_object (tmp); 757 tmp->destroy ();
898 } 758 }
899 759
900 return 1; 760 return 1;
901} 761}
902 762
… …
944 804
945 tmp = get_dm_object (op->contr, &params, NULL); 805 tmp = get_dm_object (op->contr, &params, NULL);
946 if (!tmp) 806 if (!tmp)
947 return 1; 807 return 1;
948 808
949 dump_object (tmp); 809 char *dump = dump_object (tmp);
950 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 810 new_draw_info (NDI_UNIQUE, 0, op, dump);
811 free (dump);
812
951 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 813 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
952 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 814 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
815
953 return 1; 816 return 1;
954} 817}
955 818
956/** 819/**
957 * When DM is possessing a monster, flip aggression on and off, to allow 820 * When DM is possessing a monster, flip aggression on and off, to allow
… …
1048 victim->body_info[i] = 1; 911 victim->body_info[i] = 1;
1049 912
1050 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */ 913 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
1051 esrv_send_inventory (victim, victim); 914 esrv_send_inventory (victim, victim);
1052 915
1053 fix_player (victim); 916 victim->update_stats ();
1054 917
1055 do_some_living (victim); 918 do_some_living (victim);
1056 return 1; 919 return 1;
1057} 920}
1058 921
… …
1119 dm_stack_pop (op->contr); 982 dm_stack_pop (op->contr);
1120 983
1121 /* Always work on the head - otherwise object will get in odd state */ 984 /* Always work on the head - otherwise object will get in odd state */
1122 if (tmp->head) 985 if (tmp->head)
1123 tmp = tmp->head; 986 tmp = tmp->head;
1124 remove_ob (tmp); 987 tmp->remove ();
1125 return 1; 988 return 1;
1126} 989}
1127 990
1128int 991int
1129command_free (object *op, char *params) 992command_free (object *op, char *params)
… …
1141 1004
1142 if (from != STACK_FROM_STACK) 1005 if (from != STACK_FROM_STACK)
1143 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 1006 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1144 dm_stack_pop (op->contr); 1007 dm_stack_pop (op->contr);
1145 1008
1146 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1147 {
1148 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1149 remove_ob (tmp);
1150 }
1151
1152 if (tmp->head) 1009 if (tmp->head)
1153 tmp = tmp->head; 1010 tmp = tmp->head;
1154 free_object (tmp); 1011
1012 tmp->destroy ();
1155 return 1; 1013 return 1;
1156} 1014}
1157 1015
1158/** 1016/**
1159 * This adds exp to a player. We now allow adding to a specific skill. 1017 * This adds exp to a player. We now allow adding to a specific skill.
… …
1162command_addexp (object *op, char *params) 1020command_addexp (object *op, char *params)
1163{ 1021{
1164 char buf[MAX_BUF], skill[MAX_BUF]; 1022 char buf[MAX_BUF], skill[MAX_BUF];
1165 int i, q; 1023 int i, q;
1166 object *skillob = NULL; 1024 object *skillob = NULL;
1167 player *pl;
1168 1025
1169 skill[0] = '\0'; 1026 skill[0] = '\0';
1170 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 1027 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2))
1171 { 1028 {
1172 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 1029 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1173 return 1; 1030 return 1;
1174 } 1031 }
1175 1032
1176 for (pl = first_player; pl != NULL; pl = pl->next) 1033 for_all_players (pl)
1177 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1034 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1178 break;
1179
1180 if (pl == NULL)
1181 { 1035 {
1182 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1183 return 1;
1184 }
1185
1186 if (q >= 3) 1036 if (q >= 3)
1187 { 1037 {
1188 skillob = find_skill_by_name (pl->ob, skill); 1038 skillob = find_skill_by_name (pl->ob, skill);
1189 if (!skillob) 1039 if (!skillob)
1190 { 1040 {
1191 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 1041 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
1042 return 1;
1043 }
1044
1045 i = check_exp_adjust (skillob, i);
1046 skillob->stats.exp += i;
1047 calc_perm_exp (skillob);
1048 player_lvl_adj (pl->ob, skillob);
1049 }
1050
1051 pl->ob->stats.exp += i;
1052 calc_perm_exp (pl->ob);
1053 player_lvl_adj (pl->ob, NULL);
1054
1055 if (settings.real_wiz == FALSE)
1056 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1057
1192 return 1; 1058 return 1;
1193 } 1059 }
1194 1060
1195 i = check_exp_adjust (skillob, i); 1061 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1196 skillob->stats.exp += i;
1197 calc_perm_exp (skillob);
1198 player_lvl_adj (pl->ob, skillob);
1199 }
1200
1201 pl->ob->stats.exp += i;
1202 calc_perm_exp (pl->ob);
1203 player_lvl_adj (pl->ob, NULL);
1204
1205 if (settings.real_wiz == FALSE)
1206 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1207 return 1; 1062 return 1;
1208} 1063}
1209 1064
1210/**************************************************************************/ 1065/**************************************************************************/
1211 1066
… …
1217 1072
1218int 1073int
1219command_stats (object *op, char *params) 1074command_stats (object *op, char *params)
1220{ 1075{
1221 char thing[20]; 1076 char thing[20];
1222 player *pl;
1223 char buf[MAX_BUF]; 1077 char buf[MAX_BUF];
1224 1078
1225 thing[0] = '\0'; 1079 thing[0] = '\0';
1226 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1080 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1227 { 1081 {
1228 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1082 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1229 return 1; 1083 return 1;
1230 } 1084 }
1231 1085
1232 for (pl = first_player; pl != NULL; pl = pl->next) 1086 for_all_players (pl)
1233 if (!strcmp (pl->ob->name, thing)) 1087 if (!strcmp (pl->ob->name, thing))
1234 { 1088 {
1235 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1089 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1236 new_draw_info (NDI_UNIQUE, 0, op, buf); 1090 new_draw_info (NDI_UNIQUE, 0, op, buf);
1237 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 1091 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
1238 new_draw_info (NDI_UNIQUE, 0, op, buf); 1092 new_draw_info (NDI_UNIQUE, 0, op, buf);
1239 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 1093 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1240 new_draw_info (NDI_UNIQUE, 0, op, buf); 1094 new_draw_info (NDI_UNIQUE, 0, op, buf);
1241 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 1095 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1242 new_draw_info (NDI_UNIQUE, 0, op, buf); 1096 new_draw_info (NDI_UNIQUE, 0, op, buf);
1243 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 1097 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1244 new_draw_info (NDI_UNIQUE, 0, op, buf); 1098 new_draw_info (NDI_UNIQUE, 0, op, buf);
1245 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1099 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1246 new_draw_info (NDI_UNIQUE, 0, op, buf); 1100 new_draw_info (NDI_UNIQUE, 0, op, buf);
1247 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1101 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1248 new_draw_info (NDI_UNIQUE, 0, op, buf); 1102 new_draw_info (NDI_UNIQUE, 0, op, buf);
1249 break; 1103 return 1;
1250 } 1104 }
1251 if (pl == NULL) 1105
1252 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1106 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1253 return 1; 1107 return 1;
1254} 1108}
1255 1109
1256int 1110int
1257command_abil (object *op, char *params) 1111command_abil (object *op, char *params)
… …
1280 { 1134 {
1281 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 1135 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1282 return 1; 1136 return 1;
1283 } 1137 }
1284 1138
1285 for (pl = first_player; pl != NULL; pl = pl->next) 1139 for_all_players (pl)
1286 { 1140 {
1287 if (!strcmp (pl->ob->name, thing)) 1141 if (!strcmp (pl->ob->name, thing))
1288 { 1142 {
1289 if (settings.real_wiz == FALSE) 1143 if (settings.real_wiz == FALSE)
1290 SET_FLAG (pl->ob, FLAG_WAS_WIZ); 1144 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
… …
1302 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1156 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1303 if (!strcmp ("pow", thing2)) 1157 if (!strcmp ("pow", thing2))
1304 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1158 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1305 sprintf (buf, "%s has been altered.", &pl->ob->name); 1159 sprintf (buf, "%s has been altered.", &pl->ob->name);
1306 new_draw_info (NDI_UNIQUE, 0, op, buf); 1160 new_draw_info (NDI_UNIQUE, 0, op, buf);
1307 fix_player (pl->ob); 1161 pl->ob->update_stats ();
1308 return 1; 1162 return 1;
1309 } 1163 }
1310 } 1164 }
1311 1165
1312 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1166 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1313 return 1; 1167 return 1;
1314}
1315
1316int
1317command_reset (object *op, char *params)
1318{
1319 mapstruct *m;
1320 object *dummy = NULL, *tmp = NULL;
1321
1322 if (params == NULL)
1323 {
1324 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1325 return 1;
1326 }
1327
1328 if (strcmp (params, ".") == 0)
1329 params = op->map->path;
1330 m = has_been_loaded (params);
1331 if (m == NULL)
1332 {
1333 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1334 return 1;
1335 }
1336
1337 if (m->in_memory != MAP_SWAPPED)
1338 {
1339 if (m->in_memory != MAP_IN_MEMORY)
1340 {
1341 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1342 return 0;
1343 }
1344
1345 /*
1346 * Only attempt to remove the player that is doing the reset, and not other
1347 * players or wiz's.
1348 */
1349 if (op->map == m)
1350 {
1351 dummy = get_object ();
1352 dummy->map = NULL;
1353 EXIT_X (dummy) = op->x;
1354 EXIT_Y (dummy) = op->y;
1355 EXIT_PATH (dummy) = op->map->path;
1356 remove_ob (op);
1357 op->map = NULL;
1358 tmp = op;
1359 }
1360 swap_map (m);
1361 }
1362
1363 if (m->in_memory == MAP_SWAPPED)
1364 {
1365 LOG (llevDebug, "Resetting map %s.\n", m->path);
1366
1367 /* setting this effectively causes an immediate reload */
1368 m->reset_time = 1;
1369 flush_old_maps ();
1370 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1371 if (tmp)
1372 {
1373 enter_exit (tmp, dummy);
1374 free_object (dummy);
1375 }
1376 return 1;
1377 }
1378 else
1379 {
1380 player *pl;
1381 int playercount = 0;
1382
1383 /* Need to re-insert player if swap failed for some reason */
1384 if (tmp)
1385 {
1386 insert_ob_in_map (op, m, NULL, 0);
1387 free_object (dummy);
1388 }
1389
1390 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1391 for (pl = first_player; pl != NULL; pl = pl->next)
1392 {
1393 if (pl->ob->map == m && pl->ob != op)
1394 {
1395 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1396 playercount++;
1397 }
1398 }
1399 if (!playercount)
1400 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1401 return 1;
1402 }
1403} 1168}
1404 1169
1405int 1170int
1406command_nowiz (object *op, char *params) 1171command_nowiz (object *op, char *params)
1407{ /* 'noadm' is alias */ 1172{ /* 'noadm' is alias */
… …
1477 { 1242 {
1478 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1243 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1479 return 0; 1244 return 0;
1480 } 1245 }
1481 1246
1482 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1247 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1483 { 1248 {
1484 SET_FLAG (op, FLAG_WIZ); 1249 SET_FLAG (op, FLAG_WIZ);
1485 SET_FLAG (op, FLAG_WAS_WIZ); 1250 SET_FLAG (op, FLAG_WAS_WIZ);
1486 SET_FLAG (op, FLAG_WIZPASS); 1251 SET_FLAG (op, FLAG_WIZPASS);
1487 SET_FLAG (op, FLAG_WIZCAST); 1252 SET_FLAG (op, FLAG_WIZCAST);
… …
1658 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1423 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1659 return 0; 1424 return 0;
1660 } 1425 }
1661 1426
1662 do_learn_spell (op, tmp, special_prayer); 1427 do_learn_spell (op, tmp, special_prayer);
1663 free_object (tmp); 1428 tmp->destroy ();
1664 return 1; 1429 return 1;
1665} 1430}
1666 1431
1667int 1432int
1668command_learn_spell (object *op, char *params) 1433command_learn_spell (object *op, char *params)
… …
2080 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1845 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
2081 return 0; 1846 return 0;
2082 } 1847 }
2083 1848
2084 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1849 if (!QUERY_FLAG (right, FLAG_REMOVED))
2085 remove_ob (right); 1850 right->remove ();
2086 inserted = insert_ob_in_ob (right, left); 1851 inserted = insert_ob_in_ob (right, left);
2087 if (left->type == PLAYER) 1852 if (left->type == PLAYER)
2088 if (inserted == right) 1853 if (inserted == right)
2089 esrv_send_item (left, right); 1854 esrv_send_item (left, right);
2090 else 1855 else

Diff Legend

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