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.20 by root, Mon Dec 11 21:32:18 2006 UTC vs.
Revision 1.28 by root, Sat Dec 30 10:16:11 2006 UTC

… …
47 * other player, or NULL otherwise. 47 * other player, or NULL otherwise.
48 */ 48 */
49static player * 49static player *
50get_other_player_from_name (object *op, char *name) 50get_other_player_from_name (object *op, char *name)
51{ 51{
52 player *pl;
53
54 if (!name) 52 if (!name)
55 return NULL; 53 return NULL;
56 54
57 for (pl = first_player; pl != NULL; pl = pl->next) 55 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 56 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 57 {
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
64 return NULL;
65 }
66
67 if (pl->ob == op) 58 if (pl->ob == op)
68 { 59 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 60 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 61 return NULL;
71 } 62 }
63
72 if (pl->state != ST_PLAYING) 64 if (pl->ns->state != ST_PLAYING)
73 { 65 {
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 66 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
75 return NULL; 67 return NULL;
68 }
69
70 return pl;
76 } 71 }
72
73 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
77 return pl; 74 return 0;
78} 75}
79 76
80/** 77/**
81 * Actually hides specified player (obviously a DM). 78 * Actually hides specified player (obviously a DM).
82 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 79 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
… …
216 now = time (NULL); 213 now = time (NULL);
217 /* 214 /*
218 * Record this as a comment - then we don't have to worry about changing 215 * Record this as a comment - then we don't have to worry about changing
219 * the parsing code. 216 * the parsing code.
220 */ 217 */
221 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket.host, &op->name, ctime (&now)); 218 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); 219 fprintf (banishfile, "*@%s\n", pl->ns->host);
223 fclose (banishfile); 220 fclose (banishfile);
224 221
225 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host); 222 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); 223 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); 224 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); 225 command_kick (op, (char *) &pl->ob->name);
229 return 1; 226 return 1;
230} 227}
231 228
232int 229int
233command_kick (object *op, char *params) 230command_kick (object *op, char *params)
234{ 231{
235 for (player *pl = first_player; pl; pl = pl->next) 232 for_all_players (pl)
236 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) 233 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
237 { 234 {
238 object *op = pl->ob; 235 object *op = pl->ob;
239 236
240 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 237 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
241 { 238 {
242 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 239 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"); 240 strcpy (op->contr->killer, "kicked");
244 } 241 }
245 242
246 pl->socket.status = Ns_Dead; 243 pl->ns->destroy ();
247 } 244 }
248 245
249 return 1; 246 return 1;
250} 247}
251 248
249//TODO
250#if 0
252int 251int
253command_save_overlay (object *op, char *params) 252command_save_overlay (object *op, char *params)
254{ 253{
255 if (!op) 254 if (!op)
256 return 0; 255 return 0;
… …
267 266
268 ready_map_name (op->map->path, 0); 267 ready_map_name (op->map->path, 0);
269 268
270 return 1; 269 return 1;
271} 270}
271#endif
272 272
273int 273int
274command_shutdown (object *op, char *params) 274command_shutdown (object *op, char *params)
275{ 275{
276 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ)) 276 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
277 { 277 {
278 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server."); 278 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
279 return 1; 279 return 1;
280 } 280 }
281 281
282 cleanup (); 282 cleanup (0);
283
283 /* not reached */ 284 /* not reached */
284 return 1; 285 return 1;
285} 286}
286 287
287int 288int
… …
326 object *dummy; 327 object *dummy;
327 player *pl; 328 player *pl;
328 329
329 if (!op) 330 if (!op)
330 return 0; 331 return 0;
332
331 if (params == NULL) 333 if (params == NULL)
332 { 334 {
333 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
334 return 1; 336 return 1;
335 } 337 }
338
336 pl = get_other_player_from_name (op, params); 339 pl = get_other_player_from_name (op, params);
337 if (!pl) 340 if (!pl)
338 return 1; 341 return 1;
342
339 dummy = get_jail_exit (pl->ob); 343 dummy = get_jail_exit (pl->ob);
340 if (!dummy) 344 if (!dummy)
341 { 345 {
342 /* we have nowhere to send the prisoner.... */ 346 /* 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"); 347 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
344 return 0; 348 return 0;
345 } 349 }
346 enter_exit (pl->ob, dummy); 350
347 free_object (dummy); 351 pl->ob->enter_exit (dummy);
352 dummy->destroy ();
348 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 353 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
349 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 354 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
350 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 355 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
351 return 1; 356 return 1;
352} 357}
… …
376 { 381 {
377 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 382 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
378 return 1; 383 return 1;
379 } 384 }
380 385
381 dummy = get_object (); 386 dummy = object::create ();
382 EXIT_PATH (dummy) = op->map->path; 387 EXIT_PATH (dummy) = op->map->path;
383 EXIT_X (dummy) = op->x + freearr_x[i]; 388 EXIT_X (dummy) = op->x + freearr_x[i];
384 EXIT_Y (dummy) = op->y + freearr_y[i]; 389 EXIT_Y (dummy) = op->y + freearr_y[i];
385 enter_exit (pl->ob, dummy); 390 pl->ob->enter_exit (dummy);
386 free_object (dummy); 391 dummy->destroy ();
387 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 392 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
388 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 393 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
389 394
390 return 1; 395 return 1;
391} 396}
… …
420 { 425 {
421 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to."); 426 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
422 return 1; 427 return 1;
423 } 428 }
424 429
425 dummy = get_object (); 430 dummy = object::create ();
426 EXIT_PATH (dummy) = pl->ob->map->path; 431 EXIT_PATH (dummy) = pl->ob->map->path;
427 EXIT_X (dummy) = pl->ob->x + freearr_x[i]; 432 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
428 EXIT_Y (dummy) = pl->ob->y + freearr_y[i]; 433 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
429 enter_exit (op, dummy); 434 op->enter_exit (dummy);
430 free_object (dummy); 435 dummy->destroy ();
431 if (!op->contr->hidden) 436 if (!op->contr->hidden)
432 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open."); 437 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
433 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 438 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
434 return 1; 439 return 1;
435} 440}
… …
722 * so just copying it over should be fine. 727 * so just copying it over should be fine.
723 */ 728 */
724 if (!head) 729 if (!head)
725 { 730 {
726 head = dup; 731 head = dup;
727 copy_object (tmp, dup); 732 tmp->copy_to (dup);
728 } 733 }
729 734
730 if (settings.real_wiz == FALSE) 735 if (settings.real_wiz == FALSE)
731 SET_FLAG (dup, FLAG_WAS_WIZ); 736 SET_FLAG (dup, FLAG_WAS_WIZ);
732 737
… …
759 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 764 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
760 { 765 {
761 if (head->x < size_x || head->y < size_y) 766 if (head->x < size_x || head->y < size_y)
762 { 767 {
763 dm_stack_pop (op->contr); 768 dm_stack_pop (op->contr);
764 free_object (head); 769 head->destroy ();
765 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 770 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
766 free_object (tmp); 771 tmp->destroy ();
767 return 1; 772 return 1;
768 } 773 }
769 774
770 check = head; 775 check = head;
771 776
… …
793 798
794 esrv_send_item (op, head); 799 esrv_send_item (op, head);
795 } 800 }
796 801
797 /* free the one we used to copy */ 802 /* free the one we used to copy */
798 free_object (tmp); 803 tmp->destroy ();
799 } 804 }
800 805
801 return 1; 806 return 1;
802} 807}
803 808
… …
952 victim->body_info[i] = 1; 957 victim->body_info[i] = 1;
953 958
954 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */ 959 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
955 esrv_send_inventory (victim, victim); 960 esrv_send_inventory (victim, victim);
956 961
957 fix_player (victim); 962 victim->update_stats ();
958 963
959 do_some_living (victim); 964 do_some_living (victim);
960 return 1; 965 return 1;
961} 966}
962 967
… …
1023 dm_stack_pop (op->contr); 1028 dm_stack_pop (op->contr);
1024 1029
1025 /* Always work on the head - otherwise object will get in odd state */ 1030 /* Always work on the head - otherwise object will get in odd state */
1026 if (tmp->head) 1031 if (tmp->head)
1027 tmp = tmp->head; 1032 tmp = tmp->head;
1028 remove_ob (tmp); 1033 tmp->remove ();
1029 return 1; 1034 return 1;
1030} 1035}
1031 1036
1032int 1037int
1033command_free (object *op, char *params) 1038command_free (object *op, char *params)
… …
1048 dm_stack_pop (op->contr); 1053 dm_stack_pop (op->contr);
1049 1054
1050 if (!QUERY_FLAG (tmp, FLAG_REMOVED)) 1055 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1051 { 1056 {
1052 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed."); 1057 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1053 remove_ob (tmp); 1058 tmp->remove ();
1054 } 1059 }
1055 1060
1056 if (tmp->head) 1061 if (tmp->head)
1057 tmp = tmp->head; 1062 tmp = tmp->head;
1058 free_object (tmp); 1063
1064 tmp->destroy ();
1059 return 1; 1065 return 1;
1060} 1066}
1061 1067
1062/** 1068/**
1063 * This adds exp to a player. We now allow adding to a specific skill. 1069 * This adds exp to a player. We now allow adding to a specific skill.
… …
1066command_addexp (object *op, char *params) 1072command_addexp (object *op, char *params)
1067{ 1073{
1068 char buf[MAX_BUF], skill[MAX_BUF]; 1074 char buf[MAX_BUF], skill[MAX_BUF];
1069 int i, q; 1075 int i, q;
1070 object *skillob = NULL; 1076 object *skillob = NULL;
1071 player *pl;
1072 1077
1073 skill[0] = '\0'; 1078 skill[0] = '\0';
1074 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 1079 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2))
1075 { 1080 {
1076 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 1081 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1077 return 1; 1082 return 1;
1078 } 1083 }
1079 1084
1080 for (pl = first_player; pl != NULL; pl = pl->next) 1085 for_all_players (pl)
1081 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1086 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1082 break;
1083
1084 if (pl == NULL)
1085 { 1087 {
1086 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1087 return 1;
1088 }
1089
1090 if (q >= 3) 1088 if (q >= 3)
1091 { 1089 {
1092 skillob = find_skill_by_name (pl->ob, skill); 1090 skillob = find_skill_by_name (pl->ob, skill);
1093 if (!skillob) 1091 if (!skillob)
1094 { 1092 {
1095 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 1093 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
1094 return 1;
1095 }
1096
1097 i = check_exp_adjust (skillob, i);
1098 skillob->stats.exp += i;
1099 calc_perm_exp (skillob);
1100 player_lvl_adj (pl->ob, skillob);
1101 }
1102
1103 pl->ob->stats.exp += i;
1104 calc_perm_exp (pl->ob);
1105 player_lvl_adj (pl->ob, NULL);
1106
1107 if (settings.real_wiz == FALSE)
1108 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1109
1096 return 1; 1110 return 1;
1097 } 1111 }
1098 1112
1099 i = check_exp_adjust (skillob, i); 1113 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; 1114 return 1;
1112} 1115}
1113 1116
1114/**************************************************************************/ 1117/**************************************************************************/
1115 1118
… …
1121 1124
1122int 1125int
1123command_stats (object *op, char *params) 1126command_stats (object *op, char *params)
1124{ 1127{
1125 char thing[20]; 1128 char thing[20];
1126 player *pl;
1127 char buf[MAX_BUF]; 1129 char buf[MAX_BUF];
1128 1130
1129 thing[0] = '\0'; 1131 thing[0] = '\0';
1130 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1132 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1131 { 1133 {
1132 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1134 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1133 return 1; 1135 return 1;
1134 } 1136 }
1135 1137
1136 for (pl = first_player; pl != NULL; pl = pl->next) 1138 for_all_players (pl)
1137 if (!strcmp (pl->ob->name, thing)) 1139 if (!strcmp (pl->ob->name, thing))
1138 { 1140 {
1139 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1141 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); 1142 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); 1143 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
… …
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 1150 new_draw_info (NDI_UNIQUE, 0, op, buf);
1149 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1151 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1150 new_draw_info (NDI_UNIQUE, 0, op, buf); 1152 new_draw_info (NDI_UNIQUE, 0, op, buf);
1151 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1153 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1152 new_draw_info (NDI_UNIQUE, 0, op, buf); 1154 new_draw_info (NDI_UNIQUE, 0, op, buf);
1153 break; 1155 return 1;
1154 } 1156 }
1155 if (pl == NULL) 1157
1156 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1158 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1157 return 1; 1159 return 1;
1158} 1160}
1159 1161
1160int 1162int
1161command_abil (object *op, char *params) 1163command_abil (object *op, char *params)
… …
1184 { 1186 {
1185 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 1187 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1186 return 1; 1188 return 1;
1187 } 1189 }
1188 1190
1189 for (pl = first_player; pl != NULL; pl = pl->next) 1191 for_all_players (pl)
1190 { 1192 {
1191 if (!strcmp (pl->ob->name, thing)) 1193 if (!strcmp (pl->ob->name, thing))
1192 { 1194 {
1193 if (settings.real_wiz == FALSE) 1195 if (settings.real_wiz == FALSE)
1194 SET_FLAG (pl->ob, FLAG_WAS_WIZ); 1196 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
… …
1206 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1208 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1207 if (!strcmp ("pow", thing2)) 1209 if (!strcmp ("pow", thing2))
1208 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1210 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1209 sprintf (buf, "%s has been altered.", &pl->ob->name); 1211 sprintf (buf, "%s has been altered.", &pl->ob->name);
1210 new_draw_info (NDI_UNIQUE, 0, op, buf); 1212 new_draw_info (NDI_UNIQUE, 0, op, buf);
1211 fix_player (pl->ob); 1213 pl->ob->update_stats ();
1212 return 1; 1214 return 1;
1213 } 1215 }
1214 } 1216 }
1215 1217
1216 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1218 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1217 return 1; 1219 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} 1220}
1309 1221
1310int 1222int
1311command_nowiz (object *op, char *params) 1223command_nowiz (object *op, char *params)
1312{ /* 'noadm' is alias */ 1224{ /* 'noadm' is alias */
… …
1382 { 1294 {
1383 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1295 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1384 return 0; 1296 return 0;
1385 } 1297 }
1386 1298
1387 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1299 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1388 { 1300 {
1389 SET_FLAG (op, FLAG_WIZ); 1301 SET_FLAG (op, FLAG_WIZ);
1390 SET_FLAG (op, FLAG_WAS_WIZ); 1302 SET_FLAG (op, FLAG_WAS_WIZ);
1391 SET_FLAG (op, FLAG_WIZPASS); 1303 SET_FLAG (op, FLAG_WIZPASS);
1392 SET_FLAG (op, FLAG_WIZCAST); 1304 SET_FLAG (op, FLAG_WIZCAST);
… …
1563 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1475 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1564 return 0; 1476 return 0;
1565 } 1477 }
1566 1478
1567 do_learn_spell (op, tmp, special_prayer); 1479 do_learn_spell (op, tmp, special_prayer);
1568 free_object (tmp); 1480 tmp->destroy ();
1569 return 1; 1481 return 1;
1570} 1482}
1571 1483
1572int 1484int
1573command_learn_spell (object *op, char *params) 1485command_learn_spell (object *op, char *params)
… …
1985 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1897 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1986 return 0; 1898 return 0;
1987 } 1899 }
1988 1900
1989 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1901 if (!QUERY_FLAG (right, FLAG_REMOVED))
1990 remove_ob (right); 1902 right->remove ();
1991 inserted = insert_ob_in_ob (right, left); 1903 inserted = insert_ob_in_ob (right, left);
1992 if (left->type == PLAYER) 1904 if (left->type == PLAYER)
1993 if (inserted == right) 1905 if (inserted == right)
1994 esrv_send_item (left, right); 1906 esrv_send_item (left, right);
1995 else 1907 else

Diff Legend

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