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.25 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.38 by pippijn, Fri Mar 2 13:43:59 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 }
72 62
73 if (pl->ns->state != ST_PLAYING) 63 if (pl->ns->state != ST_PLAYING)
74 { 64 {
75 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.");
76 return NULL; 66 return NULL;
67 }
68
69 return pl;
77 } 70 }
78 71
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
79 return pl; 73 return 0;
80} 74}
81 75
82/** 76/**
83 * Actually hides specified player (obviously a DM). 77 * Actually hides specified player (obviously a DM).
84 * 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,
92 op->contr->hidden = 0; 86 op->contr->hidden = 0;
93 op->invisible = 1; 87 op->invisible = 1;
94 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");
95 op->map->players++; 89 op->map->players++;
96 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
97 if (!silent_dm) 92 if (!silent_dm)
98 {
99 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!");
100 }
101 } 94 }
102 else 95 else
103 { 96 {
104 op->contr->hidden = 1; 97 op->contr->hidden = 1;
105 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.");
106 op->map->players--; 99 op->map->players--;
100
107 if (!silent_dm) 101 if (!silent_dm)
108 {
109 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..");
110 } 103
111 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);
112 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);
113 } 106 }
114} 107}
115 108
176 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str); 169 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str);
177 return 1; 170 return 1;
178 } 171 }
179 172
180 become_follower (ob, god); 173 become_follower (ob, god);
174 return 1;
175}
176
177// TODO: Rewrite banish in perl and get rid of the following two functions
178int
179command_kick (object *op, char *params)
180{
181 for_all_players (pl)
182 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
183 {
184 object *op = pl->ob;
185
186 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
187 {
188 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
189 strcpy (op->contr->killer, "kicked");
190 }
191
192 pl->ns->destroy ();
193 }
194
181 return 1; 195 return 1;
182} 196}
183 197
184/** 198/**
185 * Add player's IP to ban_file and kick them off the server 199 * Add player's IP to ban_file and kick them off the server
229 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name); 243 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
230 command_kick (op, (char *) &pl->ob->name); 244 command_kick (op, (char *) &pl->ob->name);
231 return 1; 245 return 1;
232} 246}
233 247
234int 248//TODO
235command_kick (object *op, char *params) 249#if 0
236{
237 for (player *pl = first_player; pl; pl = pl->next)
238 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
239 {
240 object *op = pl->ob;
241
242 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
243 {
244 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
245 strcpy (op->contr->killer, "kicked");
246 }
247
248 pl->ns->destroy ();
249 }
250
251 return 1;
252}
253
254int 250int
255command_save_overlay (object *op, char *params) 251command_save_overlay (object *op, char *params)
256{ 252{
257 if (!op) 253 if (!op)
258 return 0; 254 return 0;
269 265
270 ready_map_name (op->map->path, 0); 266 ready_map_name (op->map->path, 0);
271 267
272 return 1; 268 return 1;
273} 269}
274 270#endif
275int
276command_shutdown (object *op, char *params)
277{
278 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
279 {
280 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
281 return 1;
282 }
283
284 cleanup ();
285 /* not reached */
286 return 1;
287}
288 271
289int 272int
290command_freeze (object *op, char *params) 273command_freeze (object *op, char *params)
291{ 274{
292 int ticks; 275 int ticks;
328 object *dummy; 311 object *dummy;
329 player *pl; 312 player *pl;
330 313
331 if (!op) 314 if (!op)
332 return 0; 315 return 0;
316
333 if (params == NULL) 317 if (params == NULL)
334 { 318 {
335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 319 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
336 return 1; 320 return 1;
337 } 321 }
322
338 pl = get_other_player_from_name (op, params); 323 pl = get_other_player_from_name (op, params);
339 if (!pl) 324 if (!pl)
340 return 1; 325 return 1;
326
341 dummy = get_jail_exit (pl->ob); 327 dummy = get_jail_exit (pl->ob);
342 if (!dummy) 328 if (!dummy)
343 { 329 {
344 /* we have nowhere to send the prisoner.... */ 330 /* 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"); 331 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
346 return 0; 332 return 0;
347 } 333 }
348 enter_exit (pl->ob, dummy); 334
335 pl->ob->enter_exit (dummy);
349 dummy->destroy (); 336 dummy->destroy ();
350 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 337 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
351 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 338 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
352 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 339 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
353 return 1; 340 return 1;
382 369
383 dummy = object::create (); 370 dummy = object::create ();
384 EXIT_PATH (dummy) = op->map->path; 371 EXIT_PATH (dummy) = op->map->path;
385 EXIT_X (dummy) = op->x + freearr_x[i]; 372 EXIT_X (dummy) = op->x + freearr_x[i];
386 EXIT_Y (dummy) = op->y + freearr_y[i]; 373 EXIT_Y (dummy) = op->y + freearr_y[i];
387 enter_exit (pl->ob, dummy); 374 pl->ob->enter_exit (dummy);
388 dummy->destroy (); 375 dummy->destroy ();
389 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 376 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
390 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 377 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
391 378
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 = object::create ();
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 dummy->destroy ();
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; 379 return 1;
437} 380}
438 381
439/** 382/**
440 * This function is a real mess, because we're stucking getting 383 * This function is a real mess, because we're stucking getting
534 at_spell = archetype::find (cp); 477 at_spell = archetype::find (cp);
535 if (!at_spell || at_spell->clone.type != SPELL) 478 if (!at_spell || at_spell->clone.type != SPELL)
536 at_spell = find_archetype_by_object_name (cp); 479 at_spell = find_archetype_by_object_name (cp);
537 if (!at_spell || at_spell->clone.type != SPELL) 480 if (!at_spell || at_spell->clone.type != SPELL)
538 { 481 {
539 strcpy (spell_name, cp); 482 assign (spell_name, cp);
540 fsp = strchr (spell_name, ' '); 483 fsp = strchr (spell_name, ' ');
541 if (fsp) 484 if (fsp)
542 { 485 {
543 *fsp = 0; 486 *fsp = 0;
544 fsp++; 487 fsp++;
954 victim->body_info[i] = 1; 897 victim->body_info[i] = 1;
955 898
956 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */ 899 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
957 esrv_send_inventory (victim, victim); 900 esrv_send_inventory (victim, victim);
958 901
959 fix_player (victim); 902 victim->update_stats ();
960 903
961 do_some_living (victim); 904 do_some_living (victim);
962 return 1; 905 return 1;
963} 906}
964 907
1047 990
1048 if (from != STACK_FROM_STACK) 991 if (from != STACK_FROM_STACK)
1049 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 992 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1050 dm_stack_pop (op->contr); 993 dm_stack_pop (op->contr);
1051 994
1052 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1053 {
1054 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1055 tmp->remove ();
1056 }
1057
1058 if (tmp->head) 995 if (tmp->head)
1059 tmp = tmp->head; 996 tmp = tmp->head;
1060 997
1061 tmp->destroy (); 998 tmp->destroy ();
1062 return 1; 999 return 1;
1069command_addexp (object *op, char *params) 1006command_addexp (object *op, char *params)
1070{ 1007{
1071 char buf[MAX_BUF], skill[MAX_BUF]; 1008 char buf[MAX_BUF], skill[MAX_BUF];
1072 int i, q; 1009 int i, q;
1073 object *skillob = NULL; 1010 object *skillob = NULL;
1074 player *pl;
1075 1011
1076 skill[0] = '\0'; 1012 skill[0] = '\0';
1077 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 1013 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2))
1078 { 1014 {
1079 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 1015 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1080 return 1; 1016 return 1;
1081 } 1017 }
1082 1018
1083 for (pl = first_player; pl != NULL; pl = pl->next) 1019 for_all_players (pl)
1084 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1020 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1085 break;
1086
1087 if (pl == NULL)
1088 { 1021 {
1089 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1090 return 1;
1091 }
1092
1093 if (q >= 3) 1022 if (q >= 3)
1094 { 1023 {
1095 skillob = find_skill_by_name (pl->ob, skill); 1024 skillob = find_skill_by_name (pl->ob, skill);
1096 if (!skillob) 1025 if (!skillob)
1097 { 1026 {
1098 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 1027 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
1028 return 1;
1029 }
1030
1031 i = check_exp_adjust (skillob, i);
1032 skillob->stats.exp += i;
1033 calc_perm_exp (skillob);
1034 player_lvl_adj (pl->ob, skillob);
1035 }
1036
1037 pl->ob->stats.exp += i;
1038 calc_perm_exp (pl->ob);
1039 player_lvl_adj (pl->ob, NULL);
1040
1041 if (settings.real_wiz == FALSE)
1042 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1043
1099 return 1; 1044 return 1;
1100 } 1045 }
1101 1046
1102 i = check_exp_adjust (skillob, i); 1047 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1103 skillob->stats.exp += i;
1104 calc_perm_exp (skillob);
1105 player_lvl_adj (pl->ob, skillob);
1106 }
1107
1108 pl->ob->stats.exp += i;
1109 calc_perm_exp (pl->ob);
1110 player_lvl_adj (pl->ob, NULL);
1111
1112 if (settings.real_wiz == FALSE)
1113 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1114 return 1; 1048 return 1;
1115} 1049}
1116 1050
1117/**************************************************************************/ 1051/**************************************************************************/
1118 1052
1124 1058
1125int 1059int
1126command_stats (object *op, char *params) 1060command_stats (object *op, char *params)
1127{ 1061{
1128 char thing[20]; 1062 char thing[20];
1129 player *pl;
1130 char buf[MAX_BUF]; 1063 char buf[MAX_BUF];
1131 1064
1132 thing[0] = '\0'; 1065 thing[0] = '\0';
1133 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1066 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1134 { 1067 {
1135 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1068 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1136 return 1; 1069 return 1;
1137 } 1070 }
1138 1071
1139 for (pl = first_player; pl != NULL; pl = pl->next) 1072 for_all_players (pl)
1140 if (!strcmp (pl->ob->name, thing)) 1073 if (!strcmp (pl->ob->name, thing))
1141 { 1074 {
1142 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1075 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1143 new_draw_info (NDI_UNIQUE, 0, op, buf); 1076 new_draw_info (NDI_UNIQUE, 0, op, buf);
1144 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 1077 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 1084 new_draw_info (NDI_UNIQUE, 0, op, buf);
1152 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1085 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1153 new_draw_info (NDI_UNIQUE, 0, op, buf); 1086 new_draw_info (NDI_UNIQUE, 0, op, buf);
1154 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1087 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1155 new_draw_info (NDI_UNIQUE, 0, op, buf); 1088 new_draw_info (NDI_UNIQUE, 0, op, buf);
1156 break; 1089 return 1;
1157 } 1090 }
1158 if (pl == NULL) 1091
1159 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1092 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1160 return 1; 1093 return 1;
1161} 1094}
1162 1095
1163int 1096int
1164command_abil (object *op, char *params) 1097command_abil (object *op, char *params)
1165{ 1098{
1166 char thing[20], thing2[20]; 1099 char thing[20], thing2[20];
1167 int iii; 1100 int iii;
1168 player *pl;
1169 char buf[MAX_BUF]; 1101 char buf[MAX_BUF];
1170 1102
1171 iii = 0; 1103 iii = 0;
1172 thing[0] = '\0'; 1104 thing[0] = '\0';
1173 thing2[0] = '\0'; 1105 thing2[0] = '\0';
1187 { 1119 {
1188 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 1120 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1189 return 1; 1121 return 1;
1190 } 1122 }
1191 1123
1192 for (pl = first_player; pl != NULL; pl = pl->next) 1124 for_all_players (pl)
1193 { 1125 {
1194 if (!strcmp (pl->ob->name, thing)) 1126 if (!strcmp (pl->ob->name, thing))
1195 { 1127 {
1196 if (settings.real_wiz == FALSE) 1128 if (settings.real_wiz == FALSE)
1197 SET_FLAG (pl->ob, FLAG_WAS_WIZ); 1129 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1209 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1141 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1210 if (!strcmp ("pow", thing2)) 1142 if (!strcmp ("pow", thing2))
1211 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1143 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1212 sprintf (buf, "%s has been altered.", &pl->ob->name); 1144 sprintf (buf, "%s has been altered.", &pl->ob->name);
1213 new_draw_info (NDI_UNIQUE, 0, op, buf); 1145 new_draw_info (NDI_UNIQUE, 0, op, buf);
1214 fix_player (pl->ob); 1146 pl->ob->update_stats ();
1215 return 1; 1147 return 1;
1216 } 1148 }
1217 } 1149 }
1218 1150
1219 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1151 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1220 return 1; 1152 return 1;
1221}
1222
1223int
1224command_reset (object *op, char *params)
1225{
1226 maptile *m;
1227 object *dummy = NULL, *tmp = NULL;
1228
1229 if (params == NULL)
1230 {
1231 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1232 return 1;
1233 }
1234
1235 if (strcmp (params, ".") == 0)
1236 params = op->map->path;
1237
1238 m = has_been_loaded (params);
1239 if (m == NULL)
1240 {
1241 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1242 return 1;
1243 }
1244
1245 if (m->in_memory != MAP_SWAPPED)
1246 {
1247 if (m->in_memory != MAP_IN_MEMORY)
1248 {
1249 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1250 return 0;
1251 }
1252
1253 /*
1254 * Only attempt to remove the player that is doing the reset, and not other
1255 * players or wiz's.
1256 */
1257 if (op->map == m)
1258 {
1259 dummy = object::create ();
1260 dummy->map = NULL;
1261 EXIT_X (dummy) = op->x;
1262 EXIT_Y (dummy) = op->y;
1263 EXIT_PATH (dummy) = op->map->path;
1264 op->remove ();
1265 op->map = NULL;
1266 tmp = op;
1267 }
1268 swap_map (m);
1269 }
1270
1271 if (m->in_memory == MAP_SWAPPED)
1272 {
1273 LOG (llevDebug, "Resetting map %s.\n", m->path);
1274
1275 /* setting this effectively causes an immediate reload */
1276 m->reset_time = 1;
1277 flush_old_maps ();
1278 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1279
1280 if (tmp)
1281 {
1282 enter_exit (tmp, dummy);
1283 dummy->destroy ();
1284 }
1285
1286 return 1;
1287 }
1288 else
1289 {
1290 player *pl;
1291 int playercount = 0;
1292
1293 /* Need to re-insert player if swap failed for some reason */
1294 if (tmp)
1295 {
1296 insert_ob_in_map (op, m, NULL, 0);
1297 dummy->destroy ();
1298 }
1299
1300 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1301 for (pl = first_player; pl != NULL; pl = pl->next)
1302 {
1303 if (pl->ob->map == m && pl->ob != op)
1304 {
1305 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1306 playercount++;
1307 }
1308 }
1309 if (!playercount)
1310 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1311 return 1;
1312 }
1313} 1153}
1314 1154
1315int 1155int
1316command_nowiz (object *op, char *params) 1156command_nowiz (object *op, char *params)
1317{ /* 'noadm' is alias */ 1157{ /* 'noadm' is alias */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines