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.23 by root, Thu Dec 14 04:30:32 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 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ)) 275 if (op && !QUERY_FLAG (op, FLAG_WIZ))
277 { 276 {
278 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.");
279 return 1; 278 return 1;
280 } 279 }
281 280
282 cleanup (); 281 cleanup ("dm initiated shutdown", 0);
282
283 /* not reached */ 283 /* not reached */
284 return 1; 284 return 1;
285} 285}
286 286
287int 287int
… …
326 object *dummy; 326 object *dummy;
327 player *pl; 327 player *pl;
328 328
329 if (!op) 329 if (!op)
330 return 0; 330 return 0;
331
331 if (params == NULL) 332 if (params == NULL)
332 { 333 {
333 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 334 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
334 return 1; 335 return 1;
335 } 336 }
337
336 pl = get_other_player_from_name (op, params); 338 pl = get_other_player_from_name (op, params);
337 if (!pl) 339 if (!pl)
338 return 1; 340 return 1;
341
339 dummy = get_jail_exit (pl->ob); 342 dummy = get_jail_exit (pl->ob);
340 if (!dummy) 343 if (!dummy)
341 { 344 {
342 /* we have nowhere to send the prisoner.... */ 345 /* 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"); 346 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
344 return 0; 347 return 0;
345 } 348 }
346 enter_exit (pl->ob, dummy); 349
350 pl->ob->enter_exit (dummy);
347 dummy->destroy (); 351 dummy->destroy ();
348 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.");
349 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 353 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
350 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);
351 return 1; 355 return 1;
… …
380 384
381 dummy = object::create (); 385 dummy = object::create ();
382 EXIT_PATH (dummy) = op->map->path; 386 EXIT_PATH (dummy) = op->map->path;
383 EXIT_X (dummy) = op->x + freearr_x[i]; 387 EXIT_X (dummy) = op->x + freearr_x[i];
384 EXIT_Y (dummy) = op->y + freearr_y[i]; 388 EXIT_Y (dummy) = op->y + freearr_y[i];
385 enter_exit (pl->ob, dummy); 389 pl->ob->enter_exit (dummy);
386 dummy->destroy (); 390 dummy->destroy ();
387 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 391 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
388 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 392 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
389 393
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 = object::create ();
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 dummy->destroy ();
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; 394 return 1;
435} 395}
436 396
437/** 397/**
438 * This function is a real mess, because we're stucking getting 398 * This function is a real mess, because we're stucking getting
… …
532 at_spell = archetype::find (cp); 492 at_spell = archetype::find (cp);
533 if (!at_spell || at_spell->clone.type != SPELL) 493 if (!at_spell || at_spell->clone.type != SPELL)
534 at_spell = find_archetype_by_object_name (cp); 494 at_spell = find_archetype_by_object_name (cp);
535 if (!at_spell || at_spell->clone.type != SPELL) 495 if (!at_spell || at_spell->clone.type != SPELL)
536 { 496 {
537 strcpy (spell_name, cp); 497 assign (spell_name, cp);
538 fsp = strchr (spell_name, ' '); 498 fsp = strchr (spell_name, ' ');
539 if (fsp) 499 if (fsp)
540 { 500 {
541 *fsp = 0; 501 *fsp = 0;
542 fsp++; 502 fsp++;
… …
952 victim->body_info[i] = 1; 912 victim->body_info[i] = 1;
953 913
954 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 */
955 esrv_send_inventory (victim, victim); 915 esrv_send_inventory (victim, victim);
956 916
957 fix_player (victim); 917 victim->update_stats ();
958 918
959 do_some_living (victim); 919 do_some_living (victim);
960 return 1; 920 return 1;
961} 921}
962 922
… …
1045 1005
1046 if (from != STACK_FROM_STACK) 1006 if (from != STACK_FROM_STACK)
1047 /* 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 */
1048 dm_stack_pop (op->contr); 1008 dm_stack_pop (op->contr);
1049 1009
1050 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1051 {
1052 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1053 tmp->remove ();
1054 }
1055
1056 if (tmp->head) 1010 if (tmp->head)
1057 tmp = tmp->head; 1011 tmp = tmp->head;
1058 1012
1059 tmp->destroy (); 1013 tmp->destroy ();
1060 return 1; 1014 return 1;
… …
1067command_addexp (object *op, char *params) 1021command_addexp (object *op, char *params)
1068{ 1022{
1069 char buf[MAX_BUF], skill[MAX_BUF]; 1023 char buf[MAX_BUF], skill[MAX_BUF];
1070 int i, q; 1024 int i, q;
1071 object *skillob = NULL; 1025 object *skillob = NULL;
1072 player *pl;
1073 1026
1074 skill[0] = '\0'; 1027 skill[0] = '\0';
1075 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))
1076 { 1029 {
1077 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>].");
1078 return 1; 1031 return 1;
1079 } 1032 }
1080 1033
1081 for (pl = first_player; pl != NULL; pl = pl->next) 1034 for_all_players (pl)
1082 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1035 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1083 break;
1084
1085 if (pl == NULL)
1086 { 1036 {
1087 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1088 return 1;
1089 }
1090
1091 if (q >= 3) 1037 if (q >= 3)
1092 { 1038 {
1093 skillob = find_skill_by_name (pl->ob, skill); 1039 skillob = find_skill_by_name (pl->ob, skill);
1094 if (!skillob) 1040 if (!skillob)
1095 { 1041 {
1096 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
1097 return 1; 1059 return 1;
1098 } 1060 }
1099 1061
1100 i = check_exp_adjust (skillob, i); 1062 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1101 skillob->stats.exp += i;
1102 calc_perm_exp (skillob);
1103 player_lvl_adj (pl->ob, skillob);
1104 }
1105
1106 pl->ob->stats.exp += i;
1107 calc_perm_exp (pl->ob);
1108 player_lvl_adj (pl->ob, NULL);
1109
1110 if (settings.real_wiz == FALSE)
1111 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1112 return 1; 1063 return 1;
1113} 1064}
1114 1065
1115/**************************************************************************/ 1066/**************************************************************************/
1116 1067
… …
1122 1073
1123int 1074int
1124command_stats (object *op, char *params) 1075command_stats (object *op, char *params)
1125{ 1076{
1126 char thing[20]; 1077 char thing[20];
1127 player *pl;
1128 char buf[MAX_BUF]; 1078 char buf[MAX_BUF];
1129 1079
1130 thing[0] = '\0'; 1080 thing[0] = '\0';
1131 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1081 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1132 { 1082 {
1133 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1083 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1134 return 1; 1084 return 1;
1135 } 1085 }
1136 1086
1137 for (pl = first_player; pl != NULL; pl = pl->next) 1087 for_all_players (pl)
1138 if (!strcmp (pl->ob->name, thing)) 1088 if (!strcmp (pl->ob->name, thing))
1139 { 1089 {
1140 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);
1141 new_draw_info (NDI_UNIQUE, 0, op, buf); 1091 new_draw_info (NDI_UNIQUE, 0, op, buf);
1142 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);
… …
1149 new_draw_info (NDI_UNIQUE, 0, op, buf); 1099 new_draw_info (NDI_UNIQUE, 0, op, buf);
1150 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);
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 1101 new_draw_info (NDI_UNIQUE, 0, op, buf);
1152 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);
1153 new_draw_info (NDI_UNIQUE, 0, op, buf); 1103 new_draw_info (NDI_UNIQUE, 0, op, buf);
1154 break; 1104 return 1;
1155 } 1105 }
1156 if (pl == NULL) 1106
1157 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1107 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1158 return 1; 1108 return 1;
1159} 1109}
1160 1110
1161int 1111int
1162command_abil (object *op, char *params) 1112command_abil (object *op, char *params)
… …
1185 { 1135 {
1186 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");
1187 return 1; 1137 return 1;
1188 } 1138 }
1189 1139
1190 for (pl = first_player; pl != NULL; pl = pl->next) 1140 for_all_players (pl)
1191 { 1141 {
1192 if (!strcmp (pl->ob->name, thing)) 1142 if (!strcmp (pl->ob->name, thing))
1193 { 1143 {
1194 if (settings.real_wiz == FALSE) 1144 if (settings.real_wiz == FALSE)
1195 SET_FLAG (pl->ob, FLAG_WAS_WIZ); 1145 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
… …
1207 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1157 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1208 if (!strcmp ("pow", thing2)) 1158 if (!strcmp ("pow", thing2))
1209 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1159 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1210 sprintf (buf, "%s has been altered.", &pl->ob->name); 1160 sprintf (buf, "%s has been altered.", &pl->ob->name);
1211 new_draw_info (NDI_UNIQUE, 0, op, buf); 1161 new_draw_info (NDI_UNIQUE, 0, op, buf);
1212 fix_player (pl->ob); 1162 pl->ob->update_stats ();
1213 return 1; 1163 return 1;
1214 } 1164 }
1215 } 1165 }
1216 1166
1217 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1167 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1218 return 1; 1168 return 1;
1219}
1220
1221int
1222command_reset (object *op, char *params)
1223{
1224 maptile *m;
1225 object *dummy = NULL, *tmp = NULL;
1226
1227 if (params == NULL)
1228 {
1229 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1230 return 1;
1231 }
1232
1233 if (strcmp (params, ".") == 0)
1234 params = op->map->path;
1235
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 = object::create ();
1258 dummy->map = NULL;
1259 EXIT_X (dummy) = op->x;
1260 EXIT_Y (dummy) = op->y;
1261 EXIT_PATH (dummy) = op->map->path;
1262 op->remove ();
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
1278 if (tmp)
1279 {
1280 enter_exit (tmp, dummy);
1281 dummy->destroy ();
1282 }
1283
1284 return 1;
1285 }
1286 else
1287 {
1288 player *pl;
1289 int playercount = 0;
1290
1291 /* Need to re-insert player if swap failed for some reason */
1292 if (tmp)
1293 {
1294 insert_ob_in_map (op, m, NULL, 0);
1295 dummy->destroy ();
1296 }
1297
1298 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1299 for (pl = first_player; pl != NULL; pl = pl->next)
1300 {
1301 if (pl->ob->map == m && pl->ob != op)
1302 {
1303 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1304 playercount++;
1305 }
1306 }
1307 if (!playercount)
1308 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1309 return 1;
1310 }
1311} 1169}
1312 1170
1313int 1171int
1314command_nowiz (object *op, char *params) 1172command_nowiz (object *op, char *params)
1315{ /* 'noadm' is alias */ 1173{ /* 'noadm' is alias */
… …
1385 { 1243 {
1386 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!");
1387 return 0; 1245 return 0;
1388 } 1246 }
1389 1247
1390 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket->host)) 1248 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1391 { 1249 {
1392 SET_FLAG (op, FLAG_WIZ); 1250 SET_FLAG (op, FLAG_WIZ);
1393 SET_FLAG (op, FLAG_WAS_WIZ); 1251 SET_FLAG (op, FLAG_WAS_WIZ);
1394 SET_FLAG (op, FLAG_WIZPASS); 1252 SET_FLAG (op, FLAG_WIZPASS);
1395 SET_FLAG (op, FLAG_WIZCAST); 1253 SET_FLAG (op, FLAG_WIZCAST);

Diff Legend

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