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.16 by root, Tue Nov 7 16:30:55 2006 UTC vs.
Revision 1.34 by root, Mon Feb 5 01:24:46 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;
67 }
68
69 return pl;
76 } 70 }
71
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
77 return pl; 73 return 0;
78} 74}
79 75
80/** 76/**
81 * Actually hides specified player (obviously a DM). 77 * Actually hides specified player (obviously a DM).
82 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 78 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
… …
216 now = time (NULL); 212 now = time (NULL);
217 /* 213 /*
218 * Record this as a comment - then we don't have to worry about changing 214 * Record this as a comment - then we don't have to worry about changing
219 * the parsing code. 215 * the parsing code.
220 */ 216 */
221 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket.host, &op->name, ctime (&now)); 217 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
222 fprintf (banishfile, "*@%s\n", pl->socket.host); 218 fprintf (banishfile, "*@%s\n", pl->ns->host);
223 fclose (banishfile); 219 fclose (banishfile);
224 220
225 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host); 221 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
226 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name); 222 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
227 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name); 223 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
228 command_kick (op, (char *) &pl->ob->name); 224 command_kick (op, (char *) &pl->ob->name);
229 return 1; 225 return 1;
230} 226}
231 227
232int 228int
233command_kick (object *op, char *params) 229command_kick (object *op, char *params)
234{ 230{
235 for (player *pl = first_player; pl; pl = pl->next) 231 for_all_players (pl)
236 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) 232 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
237 { 233 {
238 object *op = pl->ob; 234 object *op = pl->ob;
239 235
240 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 236 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
241 { 237 {
242 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 238 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
243 strcpy (op->contr->killer, "kicked"); 239 strcpy (op->contr->killer, "kicked");
244 } 240 }
245 241
246 pl->socket.status = Ns_Dead; 242 pl->ns->destroy ();
247 } 243 }
248 244
249 return 1; 245 return 1;
250} 246}
251 247
248//TODO
249#if 0
252int 250int
253command_save_overlay (object *op, char *params) 251command_save_overlay (object *op, char *params)
254{ 252{
255 if (!op) 253 if (!op)
256 return 0; 254 return 0;
… …
267 265
268 ready_map_name (op->map->path, 0); 266 ready_map_name (op->map->path, 0);
269 267
270 return 1; 268 return 1;
271} 269}
270#endif
272 271
273int 272int
274command_shutdown (object *op, char *params) 273command_shutdown (object *op, char *params)
275{ 274{
276 struct pl *pl;
277
278 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ)) 275 if (op && !QUERY_FLAG (op, FLAG_WIZ))
279 { 276 {
280 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server."); 277 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
281 return 1; 278 return 1;
282 } 279 }
283 280
284 cleanup (); 281 cleanup ("dm initiated shutdown", 0);
282
285 /* not reached */ 283 /* not reached */
286 return 1; 284 return 1;
287} 285}
288 286
289int 287int
… …
328 object *dummy; 326 object *dummy;
329 player *pl; 327 player *pl;
330 328
331 if (!op) 329 if (!op)
332 return 0; 330 return 0;
331
333 if (params == NULL) 332 if (params == NULL)
334 { 333 {
335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 334 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
336 return 1; 335 return 1;
337 } 336 }
337
338 pl = get_other_player_from_name (op, params); 338 pl = get_other_player_from_name (op, params);
339 if (!pl) 339 if (!pl)
340 return 1; 340 return 1;
341
341 dummy = get_jail_exit (pl->ob); 342 dummy = get_jail_exit (pl->ob);
342 if (!dummy) 343 if (!dummy)
343 { 344 {
344 /* we have nowhere to send the prisoner.... */ 345 /* we have nowhere to send the prisoner.... */
345 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 346 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
346 return 0; 347 return 0;
347 } 348 }
348 enter_exit (pl->ob, dummy); 349
349 free_object (dummy); 350 pl->ob->enter_exit (dummy);
351 dummy->destroy ();
350 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 352 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
351 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 353 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
352 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 354 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
353 return 1; 355 return 1;
354} 356}
… …
378 { 380 {
379 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 381 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
380 return 1; 382 return 1;
381 } 383 }
382 384
383 dummy = get_object (); 385 dummy = object::create ();
384 EXIT_PATH (dummy) = op->map->path; 386 EXIT_PATH (dummy) = op->map->path;
385 EXIT_X (dummy) = op->x + freearr_x[i]; 387 EXIT_X (dummy) = op->x + freearr_x[i];
386 EXIT_Y (dummy) = op->y + freearr_y[i]; 388 EXIT_Y (dummy) = op->y + freearr_y[i];
387 enter_exit (pl->ob, dummy); 389 pl->ob->enter_exit (dummy);
388 free_object (dummy); 390 dummy->destroy ();
389 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 391 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
390 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 392 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
391 393
392 return 1;
393}
394
395/**
396 * Teleport next to target player.
397 */
398
399/* mids 01/16/2002 */
400int
401command_teleport (object *op, char *params)
402{
403 int i;
404 object *dummy;
405 player *pl;
406
407 if (!op)
408 return 0;
409
410 if (params == NULL)
411 {
412 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
413 return 1;
414 }
415
416 pl = get_other_player_from_name (op, params);
417 if (!pl)
418 return 1;
419
420 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
421 if (i == -1)
422 {
423 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
424 return 1;
425 }
426
427 dummy = get_object ();
428 EXIT_PATH (dummy) = pl->ob->map->path;
429 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
430 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
431 enter_exit (op, dummy);
432 free_object (dummy);
433 if (!op->contr->hidden)
434 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
435 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
436 return 1; 394 return 1;
437} 395}
438 396
439/** 397/**
440 * This function is a real mess, because we're stucking getting 398 * This function is a real mess, because we're stucking getting
… …
534 at_spell = archetype::find (cp); 492 at_spell = archetype::find (cp);
535 if (!at_spell || at_spell->clone.type != SPELL) 493 if (!at_spell || at_spell->clone.type != SPELL)
536 at_spell = find_archetype_by_object_name (cp); 494 at_spell = find_archetype_by_object_name (cp);
537 if (!at_spell || at_spell->clone.type != SPELL) 495 if (!at_spell || at_spell->clone.type != SPELL)
538 { 496 {
539 strcpy (spell_name, cp); 497 assign (spell_name, cp);
540 fsp = strchr (spell_name, ' '); 498 fsp = strchr (spell_name, ' ');
541 if (fsp) 499 if (fsp)
542 { 500 {
543 *fsp = 0; 501 *fsp = 0;
544 fsp++; 502 fsp++;
… …
724 * so just copying it over should be fine. 682 * so just copying it over should be fine.
725 */ 683 */
726 if (!head) 684 if (!head)
727 { 685 {
728 head = dup; 686 head = dup;
729 copy_object (tmp, dup); 687 tmp->copy_to (dup);
730 } 688 }
731 689
732 if (settings.real_wiz == FALSE) 690 if (settings.real_wiz == FALSE)
733 SET_FLAG (dup, FLAG_WAS_WIZ); 691 SET_FLAG (dup, FLAG_WAS_WIZ);
734 692
… …
761 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 719 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
762 { 720 {
763 if (head->x < size_x || head->y < size_y) 721 if (head->x < size_x || head->y < size_y)
764 { 722 {
765 dm_stack_pop (op->contr); 723 dm_stack_pop (op->contr);
766 free_object (head); 724 head->destroy ();
767 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 725 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
768 free_object (tmp); 726 tmp->destroy ();
769 return 1; 727 return 1;
770 } 728 }
771 729
772 check = head; 730 check = head;
773 731
… …
795 753
796 esrv_send_item (op, head); 754 esrv_send_item (op, head);
797 } 755 }
798 756
799 /* free the one we used to copy */ 757 /* free the one we used to copy */
800 free_object (tmp); 758 tmp->destroy ();
801 } 759 }
802 760
803 return 1; 761 return 1;
804} 762}
805 763
… …
954 victim->body_info[i] = 1; 912 victim->body_info[i] = 1;
955 913
956 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */ 914 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
957 esrv_send_inventory (victim, victim); 915 esrv_send_inventory (victim, victim);
958 916
959 fix_player (victim); 917 victim->update_stats ();
960 918
961 do_some_living (victim); 919 do_some_living (victim);
962 return 1; 920 return 1;
963} 921}
964 922
… …
1025 dm_stack_pop (op->contr); 983 dm_stack_pop (op->contr);
1026 984
1027 /* Always work on the head - otherwise object will get in odd state */ 985 /* Always work on the head - otherwise object will get in odd state */
1028 if (tmp->head) 986 if (tmp->head)
1029 tmp = tmp->head; 987 tmp = tmp->head;
1030 remove_ob (tmp); 988 tmp->remove ();
1031 return 1; 989 return 1;
1032} 990}
1033 991
1034int 992int
1035command_free (object *op, char *params) 993command_free (object *op, char *params)
… …
1047 1005
1048 if (from != STACK_FROM_STACK) 1006 if (from != STACK_FROM_STACK)
1049 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 1007 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1050 dm_stack_pop (op->contr); 1008 dm_stack_pop (op->contr);
1051 1009
1052 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1053 {
1054 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1055 remove_ob (tmp);
1056 }
1057
1058 if (tmp->head) 1010 if (tmp->head)
1059 tmp = tmp->head; 1011 tmp = tmp->head;
1060 free_object (tmp); 1012
1013 tmp->destroy ();
1061 return 1; 1014 return 1;
1062} 1015}
1063 1016
1064/** 1017/**
1065 * This adds exp to a player. We now allow adding to a specific skill. 1018 * This adds exp to a player. We now allow adding to a specific skill.
… …
1068command_addexp (object *op, char *params) 1021command_addexp (object *op, char *params)
1069{ 1022{
1070 char buf[MAX_BUF], skill[MAX_BUF]; 1023 char buf[MAX_BUF], skill[MAX_BUF];
1071 int i, q; 1024 int i, q;
1072 object *skillob = NULL; 1025 object *skillob = NULL;
1073 player *pl;
1074 1026
1075 skill[0] = '\0'; 1027 skill[0] = '\0';
1076 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 1028 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2))
1077 { 1029 {
1078 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 1030 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1079 return 1; 1031 return 1;
1080 } 1032 }
1081 1033
1082 for (pl = first_player; pl != NULL; pl = pl->next) 1034 for_all_players (pl)
1083 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1035 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1084 break;
1085
1086 if (pl == NULL)
1087 { 1036 {
1088 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1089 return 1;
1090 }
1091
1092 if (q >= 3) 1037 if (q >= 3)
1093 { 1038 {
1094 skillob = find_skill_by_name (pl->ob, skill); 1039 skillob = find_skill_by_name (pl->ob, skill);
1095 if (!skillob) 1040 if (!skillob)
1096 { 1041 {
1097 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 1042 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
1043 return 1;
1044 }
1045
1046 i = check_exp_adjust (skillob, i);
1047 skillob->stats.exp += i;
1048 calc_perm_exp (skillob);
1049 player_lvl_adj (pl->ob, skillob);
1050 }
1051
1052 pl->ob->stats.exp += i;
1053 calc_perm_exp (pl->ob);
1054 player_lvl_adj (pl->ob, NULL);
1055
1056 if (settings.real_wiz == FALSE)
1057 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1058
1098 return 1; 1059 return 1;
1099 } 1060 }
1100 1061
1101 i = check_exp_adjust (skillob, i); 1062 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1102 skillob->stats.exp += i;
1103 calc_perm_exp (skillob);
1104 player_lvl_adj (pl->ob, skillob);
1105 }
1106
1107 pl->ob->stats.exp += i;
1108 calc_perm_exp (pl->ob);
1109 player_lvl_adj (pl->ob, NULL);
1110
1111 if (settings.real_wiz == FALSE)
1112 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1113 return 1; 1063 return 1;
1114} 1064}
1115 1065
1116/**************************************************************************/ 1066/**************************************************************************/
1117 1067
… …
1123 1073
1124int 1074int
1125command_stats (object *op, char *params) 1075command_stats (object *op, char *params)
1126{ 1076{
1127 char thing[20]; 1077 char thing[20];
1128 player *pl;
1129 char buf[MAX_BUF]; 1078 char buf[MAX_BUF];
1130 1079
1131 thing[0] = '\0'; 1080 thing[0] = '\0';
1132 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1081 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1133 { 1082 {
1134 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1083 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1135 return 1; 1084 return 1;
1136 } 1085 }
1137 1086
1138 for (pl = first_player; pl != NULL; pl = pl->next) 1087 for_all_players (pl)
1139 if (!strcmp (pl->ob->name, thing)) 1088 if (!strcmp (pl->ob->name, thing))
1140 { 1089 {
1141 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1090 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1142 new_draw_info (NDI_UNIQUE, 0, op, buf); 1091 new_draw_info (NDI_UNIQUE, 0, op, buf);
1143 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 1092 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
1144 new_draw_info (NDI_UNIQUE, 0, op, buf); 1093 new_draw_info (NDI_UNIQUE, 0, op, buf);
1145 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 1094 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1146 new_draw_info (NDI_UNIQUE, 0, op, buf); 1095 new_draw_info (NDI_UNIQUE, 0, op, buf);
1147 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 1096 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 1097 new_draw_info (NDI_UNIQUE, 0, op, buf);
1149 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 1098 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1150 new_draw_info (NDI_UNIQUE, 0, op, buf); 1099 new_draw_info (NDI_UNIQUE, 0, op, buf);
1151 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1100 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1152 new_draw_info (NDI_UNIQUE, 0, op, buf); 1101 new_draw_info (NDI_UNIQUE, 0, op, buf);
1153 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1102 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1154 new_draw_info (NDI_UNIQUE, 0, op, buf); 1103 new_draw_info (NDI_UNIQUE, 0, op, buf);
1155 break; 1104 return 1;
1156 } 1105 }
1157 if (pl == NULL) 1106
1158 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1107 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1159 return 1; 1108 return 1;
1160} 1109}
1161 1110
1162int 1111int
1163command_abil (object *op, char *params) 1112command_abil (object *op, char *params)
… …
1186 { 1135 {
1187 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 1136 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1188 return 1; 1137 return 1;
1189 } 1138 }
1190 1139
1191 for (pl = first_player; pl != NULL; pl = pl->next) 1140 for_all_players (pl)
1192 { 1141 {
1193 if (!strcmp (pl->ob->name, thing)) 1142 if (!strcmp (pl->ob->name, thing))
1194 { 1143 {
1195 if (settings.real_wiz == FALSE) 1144 if (settings.real_wiz == FALSE)
1196 SET_FLAG (pl->ob, FLAG_WAS_WIZ); 1145 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
… …
1208 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1157 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1209 if (!strcmp ("pow", thing2)) 1158 if (!strcmp ("pow", thing2))
1210 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1159 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1211 sprintf (buf, "%s has been altered.", &pl->ob->name); 1160 sprintf (buf, "%s has been altered.", &pl->ob->name);
1212 new_draw_info (NDI_UNIQUE, 0, op, buf); 1161 new_draw_info (NDI_UNIQUE, 0, op, buf);
1213 fix_player (pl->ob); 1162 pl->ob->update_stats ();
1214 return 1; 1163 return 1;
1215 } 1164 }
1216 } 1165 }
1217 1166
1218 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1167 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1219 return 1; 1168 return 1;
1220}
1221
1222int
1223command_reset (object *op, char *params)
1224{
1225 maptile *m;
1226 object *dummy = NULL, *tmp = NULL;
1227
1228 if (params == NULL)
1229 {
1230 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1231 return 1;
1232 }
1233
1234 if (strcmp (params, ".") == 0)
1235 params = op->map->path;
1236 m = has_been_loaded (params);
1237 if (m == NULL)
1238 {
1239 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1240 return 1;
1241 }
1242
1243 if (m->in_memory != MAP_SWAPPED)
1244 {
1245 if (m->in_memory != MAP_IN_MEMORY)
1246 {
1247 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1248 return 0;
1249 }
1250
1251 /*
1252 * Only attempt to remove the player that is doing the reset, and not other
1253 * players or wiz's.
1254 */
1255 if (op->map == m)
1256 {
1257 dummy = get_object ();
1258 dummy->map = NULL;
1259 EXIT_X (dummy) = op->x;
1260 EXIT_Y (dummy) = op->y;
1261 EXIT_PATH (dummy) = op->map->path;
1262 remove_ob (op);
1263 op->map = NULL;
1264 tmp = op;
1265 }
1266 swap_map (m);
1267 }
1268
1269 if (m->in_memory == MAP_SWAPPED)
1270 {
1271 LOG (llevDebug, "Resetting map %s.\n", m->path);
1272
1273 /* setting this effectively causes an immediate reload */
1274 m->reset_time = 1;
1275 flush_old_maps ();
1276 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1277 if (tmp)
1278 {
1279 enter_exit (tmp, dummy);
1280 free_object (dummy);
1281 }
1282 return 1;
1283 }
1284 else
1285 {
1286 player *pl;
1287 int playercount = 0;
1288
1289 /* Need to re-insert player if swap failed for some reason */
1290 if (tmp)
1291 {
1292 insert_ob_in_map (op, m, NULL, 0);
1293 free_object (dummy);
1294 }
1295
1296 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1297 for (pl = first_player; pl != NULL; pl = pl->next)
1298 {
1299 if (pl->ob->map == m && pl->ob != op)
1300 {
1301 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1302 playercount++;
1303 }
1304 }
1305 if (!playercount)
1306 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1307 return 1;
1308 }
1309} 1169}
1310 1170
1311int 1171int
1312command_nowiz (object *op, char *params) 1172command_nowiz (object *op, char *params)
1313{ /* 'noadm' is alias */ 1173{ /* 'noadm' is alias */
… …
1383 { 1243 {
1384 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1244 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1385 return 0; 1245 return 0;
1386 } 1246 }
1387 1247
1388 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1248 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1389 { 1249 {
1390 SET_FLAG (op, FLAG_WIZ); 1250 SET_FLAG (op, FLAG_WIZ);
1391 SET_FLAG (op, FLAG_WAS_WIZ); 1251 SET_FLAG (op, FLAG_WAS_WIZ);
1392 SET_FLAG (op, FLAG_WIZPASS); 1252 SET_FLAG (op, FLAG_WIZPASS);
1393 SET_FLAG (op, FLAG_WIZCAST); 1253 SET_FLAG (op, FLAG_WIZCAST);
… …
1564 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1424 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1565 return 0; 1425 return 0;
1566 } 1426 }
1567 1427
1568 do_learn_spell (op, tmp, special_prayer); 1428 do_learn_spell (op, tmp, special_prayer);
1569 free_object (tmp); 1429 tmp->destroy ();
1570 return 1; 1430 return 1;
1571} 1431}
1572 1432
1573int 1433int
1574command_learn_spell (object *op, char *params) 1434command_learn_spell (object *op, char *params)
… …
1986 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1846 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1987 return 0; 1847 return 0;
1988 } 1848 }
1989 1849
1990 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1850 if (!QUERY_FLAG (right, FLAG_REMOVED))
1991 remove_ob (right); 1851 right->remove ();
1992 inserted = insert_ob_in_ob (right, left); 1852 inserted = insert_ob_in_ob (right, left);
1993 if (left->type == PLAYER) 1853 if (left->type == PLAYER)
1994 if (inserted == right) 1854 if (inserted == right)
1995 esrv_send_item (left, right); 1855 esrv_send_item (left, right);
1996 else 1856 else

Diff Legend

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