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.17 by root, Wed Nov 8 00:52:56 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 struct pl *pl;
277
278 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ)) 276 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
279 { 277 {
280 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.");
281 return 1; 279 return 1;
282 } 280 }
283 281
284 cleanup (); 282 cleanup (0);
283
285 /* not reached */ 284 /* not reached */
286 return 1; 285 return 1;
287} 286}
288 287
289int 288int
… …
328 object *dummy; 327 object *dummy;
329 player *pl; 328 player *pl;
330 329
331 if (!op) 330 if (!op)
332 return 0; 331 return 0;
332
333 if (params == NULL) 333 if (params == NULL)
334 { 334 {
335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
336 return 1; 336 return 1;
337 } 337 }
338
338 pl = get_other_player_from_name (op, params); 339 pl = get_other_player_from_name (op, params);
339 if (!pl) 340 if (!pl)
340 return 1; 341 return 1;
342
341 dummy = get_jail_exit (pl->ob); 343 dummy = get_jail_exit (pl->ob);
342 if (!dummy) 344 if (!dummy)
343 { 345 {
344 /* we have nowhere to send the prisoner.... */ 346 /* 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"); 347 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
346 return 0; 348 return 0;
347 } 349 }
348 enter_exit (pl->ob, dummy); 350
349 free_object (dummy); 351 pl->ob->enter_exit (dummy);
352 dummy->destroy ();
350 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.");
351 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 354 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
352 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);
353 return 1; 356 return 1;
354} 357}
… …
378 { 381 {
379 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.");
380 return 1; 383 return 1;
381 } 384 }
382 385
383 dummy = get_object (); 386 dummy = object::create ();
384 EXIT_PATH (dummy) = op->map->path; 387 EXIT_PATH (dummy) = op->map->path;
385 EXIT_X (dummy) = op->x + freearr_x[i]; 388 EXIT_X (dummy) = op->x + freearr_x[i];
386 EXIT_Y (dummy) = op->y + freearr_y[i]; 389 EXIT_Y (dummy) = op->y + freearr_y[i];
387 enter_exit (pl->ob, dummy); 390 pl->ob->enter_exit (dummy);
388 free_object (dummy); 391 dummy->destroy ();
389 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 392 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
390 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 393 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
391 394
392 return 1; 395 return 1;
393} 396}
… …
422 { 425 {
423 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.");
424 return 1; 427 return 1;
425 } 428 }
426 429
427 dummy = get_object (); 430 dummy = object::create ();
428 EXIT_PATH (dummy) = pl->ob->map->path; 431 EXIT_PATH (dummy) = pl->ob->map->path;
429 EXIT_X (dummy) = pl->ob->x + freearr_x[i]; 432 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
430 EXIT_Y (dummy) = pl->ob->y + freearr_y[i]; 433 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
431 enter_exit (op, dummy); 434 op->enter_exit (dummy);
432 free_object (dummy); 435 dummy->destroy ();
433 if (!op->contr->hidden) 436 if (!op->contr->hidden)
434 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.");
435 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 438 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
436 return 1; 439 return 1;
437} 440}
… …
724 * so just copying it over should be fine. 727 * so just copying it over should be fine.
725 */ 728 */
726 if (!head) 729 if (!head)
727 { 730 {
728 head = dup; 731 head = dup;
729 copy_object (tmp, dup); 732 tmp->copy_to (dup);
730 } 733 }
731 734
732 if (settings.real_wiz == FALSE) 735 if (settings.real_wiz == FALSE)
733 SET_FLAG (dup, FLAG_WAS_WIZ); 736 SET_FLAG (dup, FLAG_WAS_WIZ);
734 737
… …
761 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))
762 { 765 {
763 if (head->x < size_x || head->y < size_y) 766 if (head->x < size_x || head->y < size_y)
764 { 767 {
765 dm_stack_pop (op->contr); 768 dm_stack_pop (op->contr);
766 free_object (head); 769 head->destroy ();
767 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.");
768 free_object (tmp); 771 tmp->destroy ();
769 return 1; 772 return 1;
770 } 773 }
771 774
772 check = head; 775 check = head;
773 776
… …
795 798
796 esrv_send_item (op, head); 799 esrv_send_item (op, head);
797 } 800 }
798 801
799 /* free the one we used to copy */ 802 /* free the one we used to copy */
800 free_object (tmp); 803 tmp->destroy ();
801 } 804 }
802 805
803 return 1; 806 return 1;
804} 807}
805 808
… …
954 victim->body_info[i] = 1; 957 victim->body_info[i] = 1;
955 958
956 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 */
957 esrv_send_inventory (victim, victim); 960 esrv_send_inventory (victim, victim);
958 961
959 fix_player (victim); 962 victim->update_stats ();
960 963
961 do_some_living (victim); 964 do_some_living (victim);
962 return 1; 965 return 1;
963} 966}
964 967
… …
1025 dm_stack_pop (op->contr); 1028 dm_stack_pop (op->contr);
1026 1029
1027 /* 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 */
1028 if (tmp->head) 1031 if (tmp->head)
1029 tmp = tmp->head; 1032 tmp = tmp->head;
1030 remove_ob (tmp); 1033 tmp->remove ();
1031 return 1; 1034 return 1;
1032} 1035}
1033 1036
1034int 1037int
1035command_free (object *op, char *params) 1038command_free (object *op, char *params)
… …
1050 dm_stack_pop (op->contr); 1053 dm_stack_pop (op->contr);
1051 1054
1052 if (!QUERY_FLAG (tmp, FLAG_REMOVED)) 1055 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1053 { 1056 {
1054 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.");
1055 remove_ob (tmp); 1058 tmp->remove ();
1056 } 1059 }
1057 1060
1058 if (tmp->head) 1061 if (tmp->head)
1059 tmp = tmp->head; 1062 tmp = tmp->head;
1060 free_object (tmp); 1063
1064 tmp->destroy ();
1061 return 1; 1065 return 1;
1062} 1066}
1063 1067
1064/** 1068/**
1065 * 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.
… …
1068command_addexp (object *op, char *params) 1072command_addexp (object *op, char *params)
1069{ 1073{
1070 char buf[MAX_BUF], skill[MAX_BUF]; 1074 char buf[MAX_BUF], skill[MAX_BUF];
1071 int i, q; 1075 int i, q;
1072 object *skillob = NULL; 1076 object *skillob = NULL;
1073 player *pl;
1074 1077
1075 skill[0] = '\0'; 1078 skill[0] = '\0';
1076 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))
1077 { 1080 {
1078 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>].");
1079 return 1; 1082 return 1;
1080 } 1083 }
1081 1084
1082 for (pl = first_player; pl != NULL; pl = pl->next) 1085 for_all_players (pl)
1083 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1086 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1084 break;
1085
1086 if (pl == NULL)
1087 { 1087 {
1088 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1089 return 1;
1090 }
1091
1092 if (q >= 3) 1088 if (q >= 3)
1093 { 1089 {
1094 skillob = find_skill_by_name (pl->ob, skill); 1090 skillob = find_skill_by_name (pl->ob, skill);
1095 if (!skillob) 1091 if (!skillob)
1096 { 1092 {
1097 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
1098 return 1; 1110 return 1;
1099 } 1111 }
1100 1112
1101 i = check_exp_adjust (skillob, i); 1113 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1102 skillob->stats.exp += i;
1103 calc_perm_exp (skillob);
1104 player_lvl_adj (pl->ob, skillob);
1105 }
1106
1107 pl->ob->stats.exp += i;
1108 calc_perm_exp (pl->ob);
1109 player_lvl_adj (pl->ob, NULL);
1110
1111 if (settings.real_wiz == FALSE)
1112 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1113 return 1; 1114 return 1;
1114} 1115}
1115 1116
1116/**************************************************************************/ 1117/**************************************************************************/
1117 1118
… …
1123 1124
1124int 1125int
1125command_stats (object *op, char *params) 1126command_stats (object *op, char *params)
1126{ 1127{
1127 char thing[20]; 1128 char thing[20];
1128 player *pl;
1129 char buf[MAX_BUF]; 1129 char buf[MAX_BUF];
1130 1130
1131 thing[0] = '\0'; 1131 thing[0] = '\0';
1132 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1132 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1133 { 1133 {
1134 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1134 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1135 return 1; 1135 return 1;
1136 } 1136 }
1137 1137
1138 for (pl = first_player; pl != NULL; pl = pl->next) 1138 for_all_players (pl)
1139 if (!strcmp (pl->ob->name, thing)) 1139 if (!strcmp (pl->ob->name, thing))
1140 { 1140 {
1141 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);
1142 new_draw_info (NDI_UNIQUE, 0, op, buf); 1142 new_draw_info (NDI_UNIQUE, 0, op, buf);
1143 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 1143 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
1144 new_draw_info (NDI_UNIQUE, 0, op, buf); 1144 new_draw_info (NDI_UNIQUE, 0, op, buf);
1145 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 1145 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1146 new_draw_info (NDI_UNIQUE, 0, op, buf); 1146 new_draw_info (NDI_UNIQUE, 0, op, buf);
1147 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 1147 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 1148 new_draw_info (NDI_UNIQUE, 0, op, buf);
1149 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 1149 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1150 new_draw_info (NDI_UNIQUE, 0, op, buf); 1150 new_draw_info (NDI_UNIQUE, 0, op, buf);
1151 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);
1152 new_draw_info (NDI_UNIQUE, 0, op, buf); 1152 new_draw_info (NDI_UNIQUE, 0, op, buf);
1153 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);
1154 new_draw_info (NDI_UNIQUE, 0, op, buf); 1154 new_draw_info (NDI_UNIQUE, 0, op, buf);
1155 break; 1155 return 1;
1156 } 1156 }
1157 if (pl == NULL) 1157
1158 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1158 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1159 return 1; 1159 return 1;
1160} 1160}
1161 1161
1162int 1162int
1163command_abil (object *op, char *params) 1163command_abil (object *op, char *params)
… …
1186 { 1186 {
1187 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");
1188 return 1; 1188 return 1;
1189 } 1189 }
1190 1190
1191 for (pl = first_player; pl != NULL; pl = pl->next) 1191 for_all_players (pl)
1192 { 1192 {
1193 if (!strcmp (pl->ob->name, thing)) 1193 if (!strcmp (pl->ob->name, thing))
1194 { 1194 {
1195 if (settings.real_wiz == FALSE) 1195 if (settings.real_wiz == FALSE)
1196 SET_FLAG (pl->ob, FLAG_WAS_WIZ); 1196 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
… …
1208 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1208 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1209 if (!strcmp ("pow", thing2)) 1209 if (!strcmp ("pow", thing2))
1210 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1210 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1211 sprintf (buf, "%s has been altered.", &pl->ob->name); 1211 sprintf (buf, "%s has been altered.", &pl->ob->name);
1212 new_draw_info (NDI_UNIQUE, 0, op, buf); 1212 new_draw_info (NDI_UNIQUE, 0, op, buf);
1213 fix_player (pl->ob); 1213 pl->ob->update_stats ();
1214 return 1; 1214 return 1;
1215 } 1215 }
1216 } 1216 }
1217 1217
1218 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1218 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1219 return 1; 1219 return 1;
1220}
1221
1222int
1223command_reset (object *op, char *params)
1224{
1225 maptile *m;
1226 object *dummy = NULL, *tmp = NULL;
1227
1228 if (params == NULL)
1229 {
1230 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1231 return 1;
1232 }
1233
1234 if (strcmp (params, ".") == 0)
1235 params = op->map->path;
1236
1237 m = has_been_loaded (params);
1238 if (m == NULL)
1239 {
1240 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1241 return 1;
1242 }
1243
1244 if (m->in_memory != MAP_SWAPPED)
1245 {
1246 if (m->in_memory != MAP_IN_MEMORY)
1247 {
1248 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1249 return 0;
1250 }
1251
1252 /*
1253 * Only attempt to remove the player that is doing the reset, and not other
1254 * players or wiz's.
1255 */
1256 if (op->map == m)
1257 {
1258 dummy = get_object ();
1259 dummy->map = NULL;
1260 EXIT_X (dummy) = op->x;
1261 EXIT_Y (dummy) = op->y;
1262 EXIT_PATH (dummy) = op->map->path;
1263 remove_ob (op);
1264 op->map = NULL;
1265 tmp = op;
1266 }
1267 swap_map (m);
1268 }
1269
1270 if (m->in_memory == MAP_SWAPPED)
1271 {
1272 LOG (llevDebug, "Resetting map %s.\n", m->path);
1273
1274 /* setting this effectively causes an immediate reload */
1275 m->reset_time = 1;
1276 flush_old_maps ();
1277 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1278 if (tmp)
1279 {
1280 enter_exit (tmp, dummy);
1281 free_object (dummy);
1282 }
1283 return 1;
1284 }
1285 else
1286 {
1287 player *pl;
1288 int playercount = 0;
1289
1290 /* Need to re-insert player if swap failed for some reason */
1291 if (tmp)
1292 {
1293 insert_ob_in_map (op, m, NULL, 0);
1294 free_object (dummy);
1295 }
1296
1297 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1298 for (pl = first_player; pl != NULL; pl = pl->next)
1299 {
1300 if (pl->ob->map == m && pl->ob != op)
1301 {
1302 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1303 playercount++;
1304 }
1305 }
1306 if (!playercount)
1307 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1308 return 1;
1309 }
1310} 1220}
1311 1221
1312int 1222int
1313command_nowiz (object *op, char *params) 1223command_nowiz (object *op, char *params)
1314{ /* 'noadm' is alias */ 1224{ /* 'noadm' is alias */
… …
1384 { 1294 {
1385 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!");
1386 return 0; 1296 return 0;
1387 } 1297 }
1388 1298
1389 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1299 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1390 { 1300 {
1391 SET_FLAG (op, FLAG_WIZ); 1301 SET_FLAG (op, FLAG_WIZ);
1392 SET_FLAG (op, FLAG_WAS_WIZ); 1302 SET_FLAG (op, FLAG_WAS_WIZ);
1393 SET_FLAG (op, FLAG_WIZPASS); 1303 SET_FLAG (op, FLAG_WIZPASS);
1394 SET_FLAG (op, FLAG_WIZCAST); 1304 SET_FLAG (op, FLAG_WIZCAST);
… …
1565 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);
1566 return 0; 1476 return 0;
1567 } 1477 }
1568 1478
1569 do_learn_spell (op, tmp, special_prayer); 1479 do_learn_spell (op, tmp, special_prayer);
1570 free_object (tmp); 1480 tmp->destroy ();
1571 return 1; 1481 return 1;
1572} 1482}
1573 1483
1574int 1484int
1575command_learn_spell (object *op, char *params) 1485command_learn_spell (object *op, char *params)
… …
1987 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!");
1988 return 0; 1898 return 0;
1989 } 1899 }
1990 1900
1991 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1901 if (!QUERY_FLAG (right, FLAG_REMOVED))
1992 remove_ob (right); 1902 right->remove ();
1993 inserted = insert_ob_in_ob (right, left); 1903 inserted = insert_ob_in_ob (right, left);
1994 if (left->type == PLAYER) 1904 if (left->type == PLAYER)
1995 if (inserted == right) 1905 if (inserted == right)
1996 esrv_send_item (left, right); 1906 esrv_send_item (left, right);
1997 else 1907 else

Diff Legend

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