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.18 by pippijn, Sat Dec 9 17:28:37 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;
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,
… …
90 op->contr->hidden = 0; 86 op->contr->hidden = 0;
91 op->invisible = 1; 87 op->invisible = 1;
92 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");
93 op->map->players++; 89 op->map->players++;
94 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
95 if (!silent_dm) 92 if (!silent_dm)
96 {
97 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!");
98 }
99 } 94 }
100 else 95 else
101 { 96 {
102 op->contr->hidden = 1; 97 op->contr->hidden = 1;
103 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.");
104 op->map->players--; 99 op->map->players--;
100
105 if (!silent_dm) 101 if (!silent_dm)
106 {
107 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..");
108 } 103
109 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);
110 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);
111 } 106 }
112} 107}
113 108
… …
216 now = time (NULL); 211 now = time (NULL);
217 /* 212 /*
218 * 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
219 * the parsing code. 214 * the parsing code.
220 */ 215 */
221 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));
222 fprintf (banishfile, "*@%s\n", pl->socket.host); 217 fprintf (banishfile, "*@%s\n", pl->ns->host);
223 fclose (banishfile); 218 fclose (banishfile);
224 219
225 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);
226 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);
227 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);
228 command_kick (op, (char *) &pl->ob->name); 223 command_kick (op, (char *) &pl->ob->name);
229 return 1; 224 return 1;
230} 225}
231 226
232int 227int
233command_kick (object *op, char *params) 228command_kick (object *op, char *params)
234{ 229{
235 for (player *pl = first_player; pl; pl = pl->next) 230 for_all_players (pl)
236 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)))
237 { 232 {
238 object *op = pl->ob; 233 object *op = pl->ob;
239 234
240 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 235 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
241 { 236 {
242 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);
243 strcpy (op->contr->killer, "kicked"); 238 strcpy (op->contr->killer, "kicked");
244 } 239 }
245 240
246 pl->socket.status = Ns_Dead; 241 pl->ns->destroy ();
247 } 242 }
248 243
249 return 1; 244 return 1;
250} 245}
251 246
247//TODO
248#if 0
252int 249int
253command_save_overlay (object *op, char *params) 250command_save_overlay (object *op, char *params)
254{ 251{
255 if (!op) 252 if (!op)
256 return 0; 253 return 0;
… …
267 264
268 ready_map_name (op->map->path, 0); 265 ready_map_name (op->map->path, 0);
269 266
270 return 1; 267 return 1;
271} 268}
269#endif
272 270
273int 271int
274command_shutdown (object *op, char *params) 272command_shutdown (object *op, char *params)
275{ 273{
276 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ)) 274 if (op && !QUERY_FLAG (op, FLAG_WIZ))
277 { 275 {
278 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.");
279 return 1; 277 return 1;
280 } 278 }
281 279
282 cleanup (); 280 cleanup ("dm initiated shutdown", 0);
281
283 /* not reached */ 282 /* not reached */
284 return 1; 283 return 1;
285} 284}
286 285
287int 286int
… …
326 object *dummy; 325 object *dummy;
327 player *pl; 326 player *pl;
328 327
329 if (!op) 328 if (!op)
330 return 0; 329 return 0;
330
331 if (params == NULL) 331 if (params == NULL)
332 { 332 {
333 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 333 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
334 return 1; 334 return 1;
335 } 335 }
336
336 pl = get_other_player_from_name (op, params); 337 pl = get_other_player_from_name (op, params);
337 if (!pl) 338 if (!pl)
338 return 1; 339 return 1;
340
339 dummy = get_jail_exit (pl->ob); 341 dummy = get_jail_exit (pl->ob);
340 if (!dummy) 342 if (!dummy)
341 { 343 {
342 /* we have nowhere to send the prisoner.... */ 344 /* we have nowhere to send the prisoner.... */
343 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");
344 return 0; 346 return 0;
345 } 347 }
346 enter_exit (pl->ob, dummy); 348
347 free_object (dummy); 349 pl->ob->enter_exit (dummy);
350 dummy->destroy ();
348 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.");
349 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 352 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
350 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);
351 return 1; 354 return 1;
352} 355}
… …
376 { 379 {
377 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.");
378 return 1; 381 return 1;
379 } 382 }
380 383
381 dummy = get_object (); 384 dummy = object::create ();
382 EXIT_PATH (dummy) = op->map->path; 385 EXIT_PATH (dummy) = op->map->path;
383 EXIT_X (dummy) = op->x + freearr_x[i]; 386 EXIT_X (dummy) = op->x + freearr_x[i];
384 EXIT_Y (dummy) = op->y + freearr_y[i]; 387 EXIT_Y (dummy) = op->y + freearr_y[i];
385 enter_exit (pl->ob, dummy); 388 pl->ob->enter_exit (dummy);
386 free_object (dummy); 389 dummy->destroy ();
387 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 390 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
388 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 391 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
389 392
390 return 1;
391}
392
393/**
394 * Teleport next to target player.
395 */
396
397/* mids 01/16/2002 */
398int
399command_teleport (object *op, char *params)
400{
401 int i;
402 object *dummy;
403 player *pl;
404
405 if (!op)
406 return 0;
407
408 if (params == NULL)
409 {
410 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
411 return 1;
412 }
413
414 pl = get_other_player_from_name (op, params);
415 if (!pl)
416 return 1;
417
418 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
419 if (i == -1)
420 {
421 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
422 return 1;
423 }
424
425 dummy = get_object ();
426 EXIT_PATH (dummy) = pl->ob->map->path;
427 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
428 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
429 enter_exit (op, dummy);
430 free_object (dummy);
431 if (!op->contr->hidden)
432 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
433 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
434 return 1; 393 return 1;
435} 394}
436 395
437/** 396/**
438 * This function is a real mess, because we're stucking getting 397 * This function is a real mess, because we're stucking getting
… …
532 at_spell = archetype::find (cp); 491 at_spell = archetype::find (cp);
533 if (!at_spell || at_spell->clone.type != SPELL) 492 if (!at_spell || at_spell->clone.type != SPELL)
534 at_spell = find_archetype_by_object_name (cp); 493 at_spell = find_archetype_by_object_name (cp);
535 if (!at_spell || at_spell->clone.type != SPELL) 494 if (!at_spell || at_spell->clone.type != SPELL)
536 { 495 {
537 strcpy (spell_name, cp); 496 assign (spell_name, cp);
538 fsp = strchr (spell_name, ' '); 497 fsp = strchr (spell_name, ' ');
539 if (fsp) 498 if (fsp)
540 { 499 {
541 *fsp = 0; 500 *fsp = 0;
542 fsp++; 501 fsp++;
… …
722 * so just copying it over should be fine. 681 * so just copying it over should be fine.
723 */ 682 */
724 if (!head) 683 if (!head)
725 { 684 {
726 head = dup; 685 head = dup;
727 copy_object (tmp, dup); 686 tmp->copy_to (dup);
728 } 687 }
729 688
730 if (settings.real_wiz == FALSE) 689 if (settings.real_wiz == FALSE)
731 SET_FLAG (dup, FLAG_WAS_WIZ); 690 SET_FLAG (dup, FLAG_WAS_WIZ);
732 691
… …
759 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))
760 { 719 {
761 if (head->x < size_x || head->y < size_y) 720 if (head->x < size_x || head->y < size_y)
762 { 721 {
763 dm_stack_pop (op->contr); 722 dm_stack_pop (op->contr);
764 free_object (head); 723 head->destroy ();
765 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.");
766 free_object (tmp); 725 tmp->destroy ();
767 return 1; 726 return 1;
768 } 727 }
769 728
770 check = head; 729 check = head;
771 730
… …
793 752
794 esrv_send_item (op, head); 753 esrv_send_item (op, head);
795 } 754 }
796 755
797 /* free the one we used to copy */ 756 /* free the one we used to copy */
798 free_object (tmp); 757 tmp->destroy ();
799 } 758 }
800 759
801 return 1; 760 return 1;
802} 761}
803 762
… …
952 victim->body_info[i] = 1; 911 victim->body_info[i] = 1;
953 912
954 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 */
955 esrv_send_inventory (victim, victim); 914 esrv_send_inventory (victim, victim);
956 915
957 fix_player (victim); 916 victim->update_stats ();
958 917
959 do_some_living (victim); 918 do_some_living (victim);
960 return 1; 919 return 1;
961} 920}
962 921
… …
1023 dm_stack_pop (op->contr); 982 dm_stack_pop (op->contr);
1024 983
1025 /* 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 */
1026 if (tmp->head) 985 if (tmp->head)
1027 tmp = tmp->head; 986 tmp = tmp->head;
1028 remove_ob (tmp); 987 tmp->remove ();
1029 return 1; 988 return 1;
1030} 989}
1031 990
1032int 991int
1033command_free (object *op, char *params) 992command_free (object *op, char *params)
… …
1045 1004
1046 if (from != STACK_FROM_STACK) 1005 if (from != STACK_FROM_STACK)
1047 /* 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 */
1048 dm_stack_pop (op->contr); 1007 dm_stack_pop (op->contr);
1049 1008
1050 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1051 {
1052 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1053 remove_ob (tmp);
1054 }
1055
1056 if (tmp->head) 1009 if (tmp->head)
1057 tmp = tmp->head; 1010 tmp = tmp->head;
1058 free_object (tmp); 1011
1012 tmp->destroy ();
1059 return 1; 1013 return 1;
1060} 1014}
1061 1015
1062/** 1016/**
1063 * 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.
… …
1066command_addexp (object *op, char *params) 1020command_addexp (object *op, char *params)
1067{ 1021{
1068 char buf[MAX_BUF], skill[MAX_BUF]; 1022 char buf[MAX_BUF], skill[MAX_BUF];
1069 int i, q; 1023 int i, q;
1070 object *skillob = NULL; 1024 object *skillob = NULL;
1071 player *pl;
1072 1025
1073 skill[0] = '\0'; 1026 skill[0] = '\0';
1074 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))
1075 { 1028 {
1076 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>].");
1077 return 1; 1030 return 1;
1078 } 1031 }
1079 1032
1080 for (pl = first_player; pl != NULL; pl = pl->next) 1033 for_all_players (pl)
1081 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1034 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1082 break;
1083
1084 if (pl == NULL)
1085 { 1035 {
1086 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1087 return 1;
1088 }
1089
1090 if (q >= 3) 1036 if (q >= 3)
1091 { 1037 {
1092 skillob = find_skill_by_name (pl->ob, skill); 1038 skillob = find_skill_by_name (pl->ob, skill);
1093 if (!skillob) 1039 if (!skillob)
1094 { 1040 {
1095 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
1096 return 1; 1058 return 1;
1097 } 1059 }
1098 1060
1099 i = check_exp_adjust (skillob, i); 1061 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1100 skillob->stats.exp += i;
1101 calc_perm_exp (skillob);
1102 player_lvl_adj (pl->ob, skillob);
1103 }
1104
1105 pl->ob->stats.exp += i;
1106 calc_perm_exp (pl->ob);
1107 player_lvl_adj (pl->ob, NULL);
1108
1109 if (settings.real_wiz == FALSE)
1110 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1111 return 1; 1062 return 1;
1112} 1063}
1113 1064
1114/**************************************************************************/ 1065/**************************************************************************/
1115 1066
… …
1121 1072
1122int 1073int
1123command_stats (object *op, char *params) 1074command_stats (object *op, char *params)
1124{ 1075{
1125 char thing[20]; 1076 char thing[20];
1126 player *pl;
1127 char buf[MAX_BUF]; 1077 char buf[MAX_BUF];
1128 1078
1129 thing[0] = '\0'; 1079 thing[0] = '\0';
1130 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1080 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1131 { 1081 {
1132 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1082 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1133 return 1; 1083 return 1;
1134 } 1084 }
1135 1085
1136 for (pl = first_player; pl != NULL; pl = pl->next) 1086 for_all_players (pl)
1137 if (!strcmp (pl->ob->name, thing)) 1087 if (!strcmp (pl->ob->name, thing))
1138 { 1088 {
1139 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);
1140 new_draw_info (NDI_UNIQUE, 0, op, buf); 1090 new_draw_info (NDI_UNIQUE, 0, op, buf);
1141 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);
1142 new_draw_info (NDI_UNIQUE, 0, op, buf); 1092 new_draw_info (NDI_UNIQUE, 0, op, buf);
1143 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);
1144 new_draw_info (NDI_UNIQUE, 0, op, buf); 1094 new_draw_info (NDI_UNIQUE, 0, op, buf);
1145 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);
1146 new_draw_info (NDI_UNIQUE, 0, op, buf); 1096 new_draw_info (NDI_UNIQUE, 0, op, buf);
1147 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);
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 1098 new_draw_info (NDI_UNIQUE, 0, op, buf);
1149 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);
1150 new_draw_info (NDI_UNIQUE, 0, op, buf); 1100 new_draw_info (NDI_UNIQUE, 0, op, buf);
1151 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);
1152 new_draw_info (NDI_UNIQUE, 0, op, buf); 1102 new_draw_info (NDI_UNIQUE, 0, op, buf);
1153 break; 1103 return 1;
1154 } 1104 }
1155 if (pl == NULL) 1105
1156 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1106 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1157 return 1; 1107 return 1;
1158} 1108}
1159 1109
1160int 1110int
1161command_abil (object *op, char *params) 1111command_abil (object *op, char *params)
… …
1184 { 1134 {
1185 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");
1186 return 1; 1136 return 1;
1187 } 1137 }
1188 1138
1189 for (pl = first_player; pl != NULL; pl = pl->next) 1139 for_all_players (pl)
1190 { 1140 {
1191 if (!strcmp (pl->ob->name, thing)) 1141 if (!strcmp (pl->ob->name, thing))
1192 { 1142 {
1193 if (settings.real_wiz == FALSE) 1143 if (settings.real_wiz == FALSE)
1194 SET_FLAG (pl->ob, FLAG_WAS_WIZ); 1144 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
… …
1206 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1156 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1207 if (!strcmp ("pow", thing2)) 1157 if (!strcmp ("pow", thing2))
1208 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1158 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1209 sprintf (buf, "%s has been altered.", &pl->ob->name); 1159 sprintf (buf, "%s has been altered.", &pl->ob->name);
1210 new_draw_info (NDI_UNIQUE, 0, op, buf); 1160 new_draw_info (NDI_UNIQUE, 0, op, buf);
1211 fix_player (pl->ob); 1161 pl->ob->update_stats ();
1212 return 1; 1162 return 1;
1213 } 1163 }
1214 } 1164 }
1215 1165
1216 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1166 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1217 return 1; 1167 return 1;
1218}
1219
1220int
1221command_reset (object *op, char *params)
1222{
1223 maptile *m;
1224 object *dummy = NULL, *tmp = NULL;
1225
1226 if (params == NULL)
1227 {
1228 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1229 return 1;
1230 }
1231
1232 if (strcmp (params, ".") == 0)
1233 params = op->map->path;
1234
1235 m = has_been_loaded (params);
1236 if (m == NULL)
1237 {
1238 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1239 return 1;
1240 }
1241
1242 if (m->in_memory != MAP_SWAPPED)
1243 {
1244 if (m->in_memory != MAP_IN_MEMORY)
1245 {
1246 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1247 return 0;
1248 }
1249
1250 /*
1251 * Only attempt to remove the player that is doing the reset, and not other
1252 * players or wiz's.
1253 */
1254 if (op->map == m)
1255 {
1256 dummy = get_object ();
1257 dummy->map = NULL;
1258 EXIT_X (dummy) = op->x;
1259 EXIT_Y (dummy) = op->y;
1260 EXIT_PATH (dummy) = op->map->path;
1261 remove_ob (op);
1262 op->map = NULL;
1263 tmp = op;
1264 }
1265 swap_map (m);
1266 }
1267
1268 if (m->in_memory == MAP_SWAPPED)
1269 {
1270 LOG (llevDebug, "Resetting map %s.\n", m->path);
1271
1272 /* setting this effectively causes an immediate reload */
1273 m->reset_time = 1;
1274 flush_old_maps ();
1275 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1276 if (tmp)
1277 {
1278 enter_exit (tmp, dummy);
1279 free_object (dummy);
1280 }
1281 return 1;
1282 }
1283 else
1284 {
1285 player *pl;
1286 int playercount = 0;
1287
1288 /* Need to re-insert player if swap failed for some reason */
1289 if (tmp)
1290 {
1291 insert_ob_in_map (op, m, NULL, 0);
1292 free_object (dummy);
1293 }
1294
1295 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1296 for (pl = first_player; pl != NULL; pl = pl->next)
1297 {
1298 if (pl->ob->map == m && pl->ob != op)
1299 {
1300 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1301 playercount++;
1302 }
1303 }
1304 if (!playercount)
1305 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1306 return 1;
1307 }
1308} 1168}
1309 1169
1310int 1170int
1311command_nowiz (object *op, char *params) 1171command_nowiz (object *op, char *params)
1312{ /* 'noadm' is alias */ 1172{ /* 'noadm' is alias */
… …
1382 { 1242 {
1383 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!");
1384 return 0; 1244 return 0;
1385 } 1245 }
1386 1246
1387 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1247 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1388 { 1248 {
1389 SET_FLAG (op, FLAG_WIZ); 1249 SET_FLAG (op, FLAG_WIZ);
1390 SET_FLAG (op, FLAG_WAS_WIZ); 1250 SET_FLAG (op, FLAG_WAS_WIZ);
1391 SET_FLAG (op, FLAG_WIZPASS); 1251 SET_FLAG (op, FLAG_WIZPASS);
1392 SET_FLAG (op, FLAG_WIZCAST); 1252 SET_FLAG (op, FLAG_WIZCAST);
… …
1563 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);
1564 return 0; 1424 return 0;
1565 } 1425 }
1566 1426
1567 do_learn_spell (op, tmp, special_prayer); 1427 do_learn_spell (op, tmp, special_prayer);
1568 free_object (tmp); 1428 tmp->destroy ();
1569 return 1; 1429 return 1;
1570} 1430}
1571 1431
1572int 1432int
1573command_learn_spell (object *op, char *params) 1433command_learn_spell (object *op, char *params)
… …
1985 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!");
1986 return 0; 1846 return 0;
1987 } 1847 }
1988 1848
1989 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1849 if (!QUERY_FLAG (right, FLAG_REMOVED))
1990 remove_ob (right); 1850 right->remove ();
1991 inserted = insert_ob_in_ob (right, left); 1851 inserted = insert_ob_in_ob (right, left);
1992 if (left->type == PLAYER) 1852 if (left->type == PLAYER)
1993 if (inserted == right) 1853 if (inserted == right)
1994 esrv_send_item (left, right); 1854 esrv_send_item (left, right);
1995 else 1855 else

Diff Legend

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