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.12 by root, Thu Sep 14 22:34:03 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;
76 }
77 return pl;
78}
79
80/**
81 * This command will stress server.
82 */
83int
84command_loadtest (object *op, char *params)
85{
86 uint32 x, y;
87 char buf[1024];
88
89 new_draw_info (NDI_UNIQUE, 0, op, "loadtest will stress server through teleporting");
90 new_draw_info (NDI_UNIQUE, 0, op, "at different map places.");
91 new_draw_info (NDI_UNIQUE, 0, op, "use at your own risks.");
92 new_draw_info (NDI_UNIQUE, 0, op, "Very long loop used so server may have to be reset.");
93 new_draw_info (NDI_UNIQUE, 0, op, "type loadtest TRUE to run");
94 new_draw_info_format (NDI_UNIQUE, 0, op, "{%s}", params);
95
96 if (!params)
97 return 0;
98
99 if (strncmp (params, "TRUE", 4))
100 return 0;
101
102 new_draw_info_format (NDI_UNIQUE, 0, op, "gogogo");
103
104 for (x = 0; x < settings.worldmaptilesx; x++)
105 {
106 for (y = 0; y < settings.worldmaptilesy; y++)
107 {
108 sprintf (buf, "/world/world_%d_%d", x + settings.worldmapstartx, y + settings.worldmapstarty);
109 command_goto (op, buf);
110 } 68 }
69
70 return pl;
111 } 71 }
112 72
73 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
113 return 0; 74 return 0;
114} 75}
115 76
116/** 77/**
117 * Actually hides specified player (obviously a DM). 78 * Actually hides specified player (obviously a DM).
… …
252 now = time (NULL); 213 now = time (NULL);
253 /* 214 /*
254 * 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
255 * the parsing code. 216 * the parsing code.
256 */ 217 */
257 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));
258 fprintf (banishfile, "*@%s\n", pl->socket.host); 219 fprintf (banishfile, "*@%s\n", pl->ns->host);
259 fclose (banishfile); 220 fclose (banishfile);
260 221
261 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);
262 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);
263 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);
264 command_kick (op, (char *) &pl->ob->name); 225 command_kick (op, (char *) &pl->ob->name);
265 return 1; 226 return 1;
266} 227}
267 228
268int 229int
269command_kick (object *op, char *params) 230command_kick (object *op, char *params)
270{ 231{
271 struct pl *pl; 232 for_all_players (pl)
272
273 for (pl = first_player; pl != NULL; pl = pl->next)
274 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)))
275 { 234 {
276 object *op = pl->ob; 235 object *op = pl->ob;
277 236
278 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 237 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
279 { 238 {
280 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);
281 strcpy (op->contr->killer, "kicked"); 240 strcpy (op->contr->killer, "kicked");
282 } 241 }
283 242
284 pl->socket.status = Ns_Dead; 243 pl->ns->destroy ();
285 } 244 }
286 245
287 return 1; 246 return 1;
288} 247}
289 248
249//TODO
250#if 0
290int 251int
291command_save_overlay (object *op, char *params) 252command_save_overlay (object *op, char *params)
292{ 253{
293 if (!op) 254 if (!op)
294 return 0; 255 return 0;
… …
305 266
306 ready_map_name (op->map->path, 0); 267 ready_map_name (op->map->path, 0);
307 268
308 return 1; 269 return 1;
309} 270}
271#endif
310 272
311int 273int
312command_shutdown (object *op, char *params) 274command_shutdown (object *op, char *params)
313{ 275{
314 struct pl *pl;
315
316 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ)) 276 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
317 { 277 {
318 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.");
319 return 1; 279 return 1;
320 } 280 }
321 281
322 for (pl = first_player; pl != NULL; pl = pl->next)
323 save_player (pl->ob, 0);
324
325 for (pl = first_player; pl != NULL; pl = pl->next)
326 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
327 leave_map (pl->ob);
328
329 cleanup (); 282 cleanup (0);
283
330 /* not reached */ 284 /* not reached */
331 return 1;
332}
333
334int
335command_goto (object *op, char *params)
336{
337 char *name;
338 object *dummy;
339
340 if (!op)
341 return 0;
342
343 if (params == NULL)
344 {
345 new_draw_info (NDI_UNIQUE, 0, op, "Go to what level?");
346 return 1;
347 }
348
349 name = params;
350 dummy = get_object ();
351 dummy->map = op->map;
352 EXIT_PATH (dummy) = name;
353 dummy->name = name;
354
355 enter_exit (op, dummy);
356 free_object (dummy);
357 if (op->contr->loading == NULL)
358 {
359 new_draw_info_format (NDI_UNIQUE, 0, op, "Difficulty: %d.", op->map->difficulty);
360 }
361
362 return 1;
363}
364
365/* is this function called from somewhere ? -Tero */
366int
367command_generate (object *op, char *params)
368{
369 object *tmp;
370 int nr = 1, i, retry;
371
372 if (!op)
373 return 0;
374
375 if (params != NULL)
376 sscanf (params, "%d", &nr);
377 for (i = 0; i < nr; i++)
378 {
379 retry = 50;
380 while ((tmp = generate_treasure (0, op->map->difficulty)) == NULL && --retry)
381 ;
382 if (tmp != NULL)
383 {
384 tmp = insert_ob_in_ob (tmp, op);
385 if (op->type == PLAYER)
386 esrv_send_item (op, tmp);
387 }
388 }
389
390 return 1; 285 return 1;
391} 286}
392 287
393int 288int
394command_freeze (object *op, char *params) 289command_freeze (object *op, char *params)
… …
432 object *dummy; 327 object *dummy;
433 player *pl; 328 player *pl;
434 329
435 if (!op) 330 if (!op)
436 return 0; 331 return 0;
332
437 if (params == NULL) 333 if (params == NULL)
438 { 334 {
439 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
440 return 1; 336 return 1;
441 } 337 }
338
442 pl = get_other_player_from_name (op, params); 339 pl = get_other_player_from_name (op, params);
443 if (!pl) 340 if (!pl)
444 return 1; 341 return 1;
342
445 dummy = get_jail_exit (pl->ob); 343 dummy = get_jail_exit (pl->ob);
446 if (!dummy) 344 if (!dummy)
447 { 345 {
448 /* we have nowhere to send the prisoner.... */ 346 /* we have nowhere to send the prisoner.... */
449 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");
450 return 0; 348 return 0;
451 } 349 }
452 enter_exit (pl->ob, dummy); 350
453 free_object (dummy); 351 pl->ob->enter_exit (dummy);
352 dummy->destroy ();
454 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.");
455 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 354 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
456 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);
457 return 1; 356 return 1;
458} 357}
… …
482 { 381 {
483 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.");
484 return 1; 383 return 1;
485 } 384 }
486 385
487 dummy = get_object (); 386 dummy = object::create ();
488 EXIT_PATH (dummy) = op->map->path; 387 EXIT_PATH (dummy) = op->map->path;
489 EXIT_X (dummy) = op->x + freearr_x[i]; 388 EXIT_X (dummy) = op->x + freearr_x[i];
490 EXIT_Y (dummy) = op->y + freearr_y[i]; 389 EXIT_Y (dummy) = op->y + freearr_y[i];
491 enter_exit (pl->ob, dummy); 390 pl->ob->enter_exit (dummy);
492 free_object (dummy); 391 dummy->destroy ();
493 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 392 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
494 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 393 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
495 394
496 return 1; 395 return 1;
497} 396}
… …
526 { 425 {
527 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.");
528 return 1; 427 return 1;
529 } 428 }
530 429
531 dummy = get_object (); 430 dummy = object::create ();
532 EXIT_PATH (dummy) = pl->ob->map->path; 431 EXIT_PATH (dummy) = pl->ob->map->path;
533 EXIT_X (dummy) = pl->ob->x + freearr_x[i]; 432 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
534 EXIT_Y (dummy) = pl->ob->y + freearr_y[i]; 433 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
535 enter_exit (op, dummy); 434 op->enter_exit (dummy);
536 free_object (dummy); 435 dummy->destroy ();
537 if (!op->contr->hidden) 436 if (!op->contr->hidden)
538 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.");
539 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 438 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
540 return 1; 439 return 1;
541} 440}
… …
828 * so just copying it over should be fine. 727 * so just copying it over should be fine.
829 */ 728 */
830 if (!head) 729 if (!head)
831 { 730 {
832 head = dup; 731 head = dup;
833 copy_object (tmp, dup); 732 tmp->copy_to (dup);
834 } 733 }
835 734
836 if (settings.real_wiz == FALSE) 735 if (settings.real_wiz == FALSE)
837 SET_FLAG (dup, FLAG_WAS_WIZ); 736 SET_FLAG (dup, FLAG_WAS_WIZ);
838 737
… …
865 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))
866 { 765 {
867 if (head->x < size_x || head->y < size_y) 766 if (head->x < size_x || head->y < size_y)
868 { 767 {
869 dm_stack_pop (op->contr); 768 dm_stack_pop (op->contr);
870 free_object (head); 769 head->destroy ();
871 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.");
872 free_object (tmp); 771 tmp->destroy ();
873 return 1; 772 return 1;
874 } 773 }
875 774
876 check = head; 775 check = head;
877 776
… …
899 798
900 esrv_send_item (op, head); 799 esrv_send_item (op, head);
901 } 800 }
902 801
903 /* free the one we used to copy */ 802 /* free the one we used to copy */
904 free_object (tmp); 803 tmp->destroy ();
905 } 804 }
906 805
907 return 1; 806 return 1;
908} 807}
909 808
… …
951 850
952 tmp = get_dm_object (op->contr, &params, NULL); 851 tmp = get_dm_object (op->contr, &params, NULL);
953 if (!tmp) 852 if (!tmp)
954 return 1; 853 return 1;
955 854
956 dump_object (tmp); 855 char *dump = dump_object (tmp);
957 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 856 new_draw_info (NDI_UNIQUE, 0, op, dump);
857 free (dump);
858
958 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 859 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
959 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 860 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
861
960 return 1; 862 return 1;
961} 863}
962 864
963/** 865/**
964 * When DM is possessing a monster, flip aggression on and off, to allow 866 * When DM is possessing a monster, flip aggression on and off, to allow
… …
1055 victim->body_info[i] = 1; 957 victim->body_info[i] = 1;
1056 958
1057 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 */
1058 esrv_send_inventory (victim, victim); 960 esrv_send_inventory (victim, victim);
1059 961
1060 fix_player (victim); 962 victim->update_stats ();
1061 963
1062 do_some_living (victim); 964 do_some_living (victim);
1063 return 1; 965 return 1;
1064} 966}
1065 967
… …
1126 dm_stack_pop (op->contr); 1028 dm_stack_pop (op->contr);
1127 1029
1128 /* 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 */
1129 if (tmp->head) 1031 if (tmp->head)
1130 tmp = tmp->head; 1032 tmp = tmp->head;
1131 remove_ob (tmp); 1033 tmp->remove ();
1132 return 1; 1034 return 1;
1133} 1035}
1134 1036
1135int 1037int
1136command_free (object *op, char *params) 1038command_free (object *op, char *params)
… …
1151 dm_stack_pop (op->contr); 1053 dm_stack_pop (op->contr);
1152 1054
1153 if (!QUERY_FLAG (tmp, FLAG_REMOVED)) 1055 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1154 { 1056 {
1155 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.");
1156 remove_ob (tmp); 1058 tmp->remove ();
1157 } 1059 }
1158 1060
1159 if (tmp->head) 1061 if (tmp->head)
1160 tmp = tmp->head; 1062 tmp = tmp->head;
1161 free_object (tmp); 1063
1064 tmp->destroy ();
1162 return 1; 1065 return 1;
1163} 1066}
1164 1067
1165/** 1068/**
1166 * 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.
… …
1169command_addexp (object *op, char *params) 1072command_addexp (object *op, char *params)
1170{ 1073{
1171 char buf[MAX_BUF], skill[MAX_BUF]; 1074 char buf[MAX_BUF], skill[MAX_BUF];
1172 int i, q; 1075 int i, q;
1173 object *skillob = NULL; 1076 object *skillob = NULL;
1174 player *pl;
1175 1077
1176 skill[0] = '\0'; 1078 skill[0] = '\0';
1177 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))
1178 { 1080 {
1179 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>].");
1180 return 1; 1082 return 1;
1181 } 1083 }
1182 1084
1183 for (pl = first_player; pl != NULL; pl = pl->next) 1085 for_all_players (pl)
1184 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1086 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1185 break;
1186
1187 if (pl == NULL)
1188 { 1087 {
1189 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1190 return 1;
1191 }
1192
1193 if (q >= 3) 1088 if (q >= 3)
1194 { 1089 {
1195 skillob = find_skill_by_name (pl->ob, skill); 1090 skillob = find_skill_by_name (pl->ob, skill);
1196 if (!skillob) 1091 if (!skillob)
1197 { 1092 {
1198 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
1199 return 1; 1110 return 1;
1200 } 1111 }
1201 1112
1202 i = check_exp_adjust (skillob, i); 1113 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1203 skillob->stats.exp += i;
1204 calc_perm_exp (skillob);
1205 player_lvl_adj (pl->ob, skillob);
1206 }
1207
1208 pl->ob->stats.exp += i;
1209 calc_perm_exp (pl->ob);
1210 player_lvl_adj (pl->ob, NULL);
1211
1212 if (settings.real_wiz == FALSE)
1213 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1214 return 1; 1114 return 1;
1215} 1115}
1216 1116
1217/**************************************************************************/ 1117/**************************************************************************/
1218 1118
… …
1224 1124
1225int 1125int
1226command_stats (object *op, char *params) 1126command_stats (object *op, char *params)
1227{ 1127{
1228 char thing[20]; 1128 char thing[20];
1229 player *pl;
1230 char buf[MAX_BUF]; 1129 char buf[MAX_BUF];
1231 1130
1232 thing[0] = '\0'; 1131 thing[0] = '\0';
1233 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1132 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1234 { 1133 {
1235 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1134 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1236 return 1; 1135 return 1;
1237 } 1136 }
1238 1137
1239 for (pl = first_player; pl != NULL; pl = pl->next) 1138 for_all_players (pl)
1240 if (!strcmp (pl->ob->name, thing)) 1139 if (!strcmp (pl->ob->name, thing))
1241 { 1140 {
1242 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);
1243 new_draw_info (NDI_UNIQUE, 0, op, buf); 1142 new_draw_info (NDI_UNIQUE, 0, op, buf);
1244 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);
1245 new_draw_info (NDI_UNIQUE, 0, op, buf); 1144 new_draw_info (NDI_UNIQUE, 0, op, buf);
1246 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);
1247 new_draw_info (NDI_UNIQUE, 0, op, buf); 1146 new_draw_info (NDI_UNIQUE, 0, op, buf);
1248 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);
1249 new_draw_info (NDI_UNIQUE, 0, op, buf); 1148 new_draw_info (NDI_UNIQUE, 0, op, buf);
1250 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);
1251 new_draw_info (NDI_UNIQUE, 0, op, buf); 1150 new_draw_info (NDI_UNIQUE, 0, op, buf);
1252 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);
1253 new_draw_info (NDI_UNIQUE, 0, op, buf); 1152 new_draw_info (NDI_UNIQUE, 0, op, buf);
1254 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);
1255 new_draw_info (NDI_UNIQUE, 0, op, buf); 1154 new_draw_info (NDI_UNIQUE, 0, op, buf);
1256 break; 1155 return 1;
1257 } 1156 }
1258 if (pl == NULL) 1157
1259 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1158 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1260 return 1; 1159 return 1;
1261} 1160}
1262 1161
1263int 1162int
1264command_abil (object *op, char *params) 1163command_abil (object *op, char *params)
… …
1287 { 1186 {
1288 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");
1289 return 1; 1188 return 1;
1290 } 1189 }
1291 1190
1292 for (pl = first_player; pl != NULL; pl = pl->next) 1191 for_all_players (pl)
1293 { 1192 {
1294 if (!strcmp (pl->ob->name, thing)) 1193 if (!strcmp (pl->ob->name, thing))
1295 { 1194 {
1296 if (settings.real_wiz == FALSE) 1195 if (settings.real_wiz == FALSE)
1297 SET_FLAG (pl->ob, FLAG_WAS_WIZ); 1196 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
… …
1309 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1208 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1310 if (!strcmp ("pow", thing2)) 1209 if (!strcmp ("pow", thing2))
1311 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1210 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1312 sprintf (buf, "%s has been altered.", &pl->ob->name); 1211 sprintf (buf, "%s has been altered.", &pl->ob->name);
1313 new_draw_info (NDI_UNIQUE, 0, op, buf); 1212 new_draw_info (NDI_UNIQUE, 0, op, buf);
1314 fix_player (pl->ob); 1213 pl->ob->update_stats ();
1315 return 1; 1214 return 1;
1316 } 1215 }
1317 } 1216 }
1318 1217
1319 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1218 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1320 return 1; 1219 return 1;
1321}
1322
1323int
1324command_reset (object *op, char *params)
1325{
1326 mapstruct *m;
1327 object *dummy = NULL, *tmp = NULL;
1328
1329 if (params == NULL)
1330 {
1331 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1332 return 1;
1333 }
1334
1335 if (strcmp (params, ".") == 0)
1336 params = op->map->path;
1337 m = has_been_loaded (params);
1338 if (m == NULL)
1339 {
1340 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1341 return 1;
1342 }
1343
1344 if (m->in_memory != MAP_SWAPPED)
1345 {
1346 if (m->in_memory != MAP_IN_MEMORY)
1347 {
1348 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1349 return 0;
1350 }
1351
1352 /*
1353 * Only attempt to remove the player that is doing the reset, and not other
1354 * players or wiz's.
1355 */
1356 if (op->map == m)
1357 {
1358 dummy = get_object ();
1359 dummy->map = NULL;
1360 EXIT_X (dummy) = op->x;
1361 EXIT_Y (dummy) = op->y;
1362 EXIT_PATH (dummy) = op->map->path;
1363 remove_ob (op);
1364 op->map = NULL;
1365 tmp = op;
1366 }
1367 swap_map (m);
1368 }
1369
1370 if (m->in_memory == MAP_SWAPPED)
1371 {
1372 LOG (llevDebug, "Resetting map %s.\n", m->path);
1373
1374 /* setting this effectively causes an immediate reload */
1375 m->reset_time = 1;
1376 flush_old_maps ();
1377 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1378 if (tmp)
1379 {
1380 enter_exit (tmp, dummy);
1381 free_object (dummy);
1382 }
1383 return 1;
1384 }
1385 else
1386 {
1387 player *pl;
1388 int playercount = 0;
1389
1390 /* Need to re-insert player if swap failed for some reason */
1391 if (tmp)
1392 {
1393 insert_ob_in_map (op, m, NULL, 0);
1394 free_object (dummy);
1395 }
1396
1397 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1398 for (pl = first_player; pl != NULL; pl = pl->next)
1399 {
1400 if (pl->ob->map == m && pl->ob != op)
1401 {
1402 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1403 playercount++;
1404 }
1405 }
1406 if (!playercount)
1407 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1408 return 1;
1409 }
1410} 1220}
1411 1221
1412int 1222int
1413command_nowiz (object *op, char *params) 1223command_nowiz (object *op, char *params)
1414{ /* 'noadm' is alias */ 1224{ /* 'noadm' is alias */
… …
1484 { 1294 {
1485 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!");
1486 return 0; 1296 return 0;
1487 } 1297 }
1488 1298
1489 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1299 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1490 { 1300 {
1491 SET_FLAG (op, FLAG_WIZ); 1301 SET_FLAG (op, FLAG_WIZ);
1492 SET_FLAG (op, FLAG_WAS_WIZ); 1302 SET_FLAG (op, FLAG_WAS_WIZ);
1493 SET_FLAG (op, FLAG_WIZPASS); 1303 SET_FLAG (op, FLAG_WIZPASS);
1494 SET_FLAG (op, FLAG_WIZCAST); 1304 SET_FLAG (op, FLAG_WIZCAST);
… …
1665 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);
1666 return 0; 1476 return 0;
1667 } 1477 }
1668 1478
1669 do_learn_spell (op, tmp, special_prayer); 1479 do_learn_spell (op, tmp, special_prayer);
1670 free_object (tmp); 1480 tmp->destroy ();
1671 return 1; 1481 return 1;
1672} 1482}
1673 1483
1674int 1484int
1675command_learn_spell (object *op, char *params) 1485command_learn_spell (object *op, char *params)
… …
2087 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!");
2088 return 0; 1898 return 0;
2089 } 1899 }
2090 1900
2091 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1901 if (!QUERY_FLAG (right, FLAG_REMOVED))
2092 remove_ob (right); 1902 right->remove ();
2093 inserted = insert_ob_in_ob (right, left); 1903 inserted = insert_ob_in_ob (right, left);
2094 if (left->type == PLAYER) 1904 if (left->type == PLAYER)
2095 if (inserted == right) 1905 if (inserted == right)
2096 esrv_send_item (left, right); 1906 esrv_send_item (left, right);
2097 else 1907 else

Diff Legend

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