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.13 by root, Fri Sep 15 23:31:34 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 cleanup (); 282 cleanup (0);
283
323 /* not reached */ 284 /* not reached */
324 return 1;
325}
326
327int
328command_goto (object *op, char *params)
329{
330 char *name;
331 object *dummy;
332
333 if (!op)
334 return 0;
335
336 if (params == NULL)
337 {
338 new_draw_info (NDI_UNIQUE, 0, op, "Go to what level?");
339 return 1;
340 }
341
342 name = params;
343 dummy = get_object ();
344 dummy->map = op->map;
345 EXIT_PATH (dummy) = name;
346 dummy->name = name;
347
348 enter_exit (op, dummy);
349 free_object (dummy);
350 if (op->contr->loading == NULL)
351 {
352 new_draw_info_format (NDI_UNIQUE, 0, op, "Difficulty: %d.", op->map->difficulty);
353 }
354
355 return 1;
356}
357
358/* is this function called from somewhere ? -Tero */
359int
360command_generate (object *op, char *params)
361{
362 object *tmp;
363 int nr = 1, i, retry;
364
365 if (!op)
366 return 0;
367
368 if (params != NULL)
369 sscanf (params, "%d", &nr);
370 for (i = 0; i < nr; i++)
371 {
372 retry = 50;
373 while ((tmp = generate_treasure (0, op->map->difficulty)) == NULL && --retry)
374 ;
375 if (tmp != NULL)
376 {
377 tmp = insert_ob_in_ob (tmp, op);
378 if (op->type == PLAYER)
379 esrv_send_item (op, tmp);
380 }
381 }
382
383 return 1; 285 return 1;
384} 286}
385 287
386int 288int
387command_freeze (object *op, char *params) 289command_freeze (object *op, char *params)
… …
425 object *dummy; 327 object *dummy;
426 player *pl; 328 player *pl;
427 329
428 if (!op) 330 if (!op)
429 return 0; 331 return 0;
332
430 if (params == NULL) 333 if (params == NULL)
431 { 334 {
432 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
433 return 1; 336 return 1;
434 } 337 }
338
435 pl = get_other_player_from_name (op, params); 339 pl = get_other_player_from_name (op, params);
436 if (!pl) 340 if (!pl)
437 return 1; 341 return 1;
342
438 dummy = get_jail_exit (pl->ob); 343 dummy = get_jail_exit (pl->ob);
439 if (!dummy) 344 if (!dummy)
440 { 345 {
441 /* we have nowhere to send the prisoner.... */ 346 /* we have nowhere to send the prisoner.... */
442 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");
443 return 0; 348 return 0;
444 } 349 }
445 enter_exit (pl->ob, dummy); 350
446 free_object (dummy); 351 pl->ob->enter_exit (dummy);
352 dummy->destroy ();
447 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.");
448 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 354 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
449 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);
450 return 1; 356 return 1;
451} 357}
… …
475 { 381 {
476 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.");
477 return 1; 383 return 1;
478 } 384 }
479 385
480 dummy = get_object (); 386 dummy = object::create ();
481 EXIT_PATH (dummy) = op->map->path; 387 EXIT_PATH (dummy) = op->map->path;
482 EXIT_X (dummy) = op->x + freearr_x[i]; 388 EXIT_X (dummy) = op->x + freearr_x[i];
483 EXIT_Y (dummy) = op->y + freearr_y[i]; 389 EXIT_Y (dummy) = op->y + freearr_y[i];
484 enter_exit (pl->ob, dummy); 390 pl->ob->enter_exit (dummy);
485 free_object (dummy); 391 dummy->destroy ();
486 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 392 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
487 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 393 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
488 394
489 return 1; 395 return 1;
490} 396}
… …
519 { 425 {
520 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.");
521 return 1; 427 return 1;
522 } 428 }
523 429
524 dummy = get_object (); 430 dummy = object::create ();
525 EXIT_PATH (dummy) = pl->ob->map->path; 431 EXIT_PATH (dummy) = pl->ob->map->path;
526 EXIT_X (dummy) = pl->ob->x + freearr_x[i]; 432 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
527 EXIT_Y (dummy) = pl->ob->y + freearr_y[i]; 433 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
528 enter_exit (op, dummy); 434 op->enter_exit (dummy);
529 free_object (dummy); 435 dummy->destroy ();
530 if (!op->contr->hidden) 436 if (!op->contr->hidden)
531 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.");
532 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 438 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
533 return 1; 439 return 1;
534} 440}
… …
821 * so just copying it over should be fine. 727 * so just copying it over should be fine.
822 */ 728 */
823 if (!head) 729 if (!head)
824 { 730 {
825 head = dup; 731 head = dup;
826 copy_object (tmp, dup); 732 tmp->copy_to (dup);
827 } 733 }
828 734
829 if (settings.real_wiz == FALSE) 735 if (settings.real_wiz == FALSE)
830 SET_FLAG (dup, FLAG_WAS_WIZ); 736 SET_FLAG (dup, FLAG_WAS_WIZ);
831 737
… …
858 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))
859 { 765 {
860 if (head->x < size_x || head->y < size_y) 766 if (head->x < size_x || head->y < size_y)
861 { 767 {
862 dm_stack_pop (op->contr); 768 dm_stack_pop (op->contr);
863 free_object (head); 769 head->destroy ();
864 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.");
865 free_object (tmp); 771 tmp->destroy ();
866 return 1; 772 return 1;
867 } 773 }
868 774
869 check = head; 775 check = head;
870 776
… …
892 798
893 esrv_send_item (op, head); 799 esrv_send_item (op, head);
894 } 800 }
895 801
896 /* free the one we used to copy */ 802 /* free the one we used to copy */
897 free_object (tmp); 803 tmp->destroy ();
898 } 804 }
899 805
900 return 1; 806 return 1;
901} 807}
902 808
… …
944 850
945 tmp = get_dm_object (op->contr, &params, NULL); 851 tmp = get_dm_object (op->contr, &params, NULL);
946 if (!tmp) 852 if (!tmp)
947 return 1; 853 return 1;
948 854
949 dump_object (tmp); 855 char *dump = dump_object (tmp);
950 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 856 new_draw_info (NDI_UNIQUE, 0, op, dump);
857 free (dump);
858
951 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 859 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
952 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 860 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
861
953 return 1; 862 return 1;
954} 863}
955 864
956/** 865/**
957 * 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
… …
1048 victim->body_info[i] = 1; 957 victim->body_info[i] = 1;
1049 958
1050 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 */
1051 esrv_send_inventory (victim, victim); 960 esrv_send_inventory (victim, victim);
1052 961
1053 fix_player (victim); 962 victim->update_stats ();
1054 963
1055 do_some_living (victim); 964 do_some_living (victim);
1056 return 1; 965 return 1;
1057} 966}
1058 967
… …
1119 dm_stack_pop (op->contr); 1028 dm_stack_pop (op->contr);
1120 1029
1121 /* 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 */
1122 if (tmp->head) 1031 if (tmp->head)
1123 tmp = tmp->head; 1032 tmp = tmp->head;
1124 remove_ob (tmp); 1033 tmp->remove ();
1125 return 1; 1034 return 1;
1126} 1035}
1127 1036
1128int 1037int
1129command_free (object *op, char *params) 1038command_free (object *op, char *params)
… …
1144 dm_stack_pop (op->contr); 1053 dm_stack_pop (op->contr);
1145 1054
1146 if (!QUERY_FLAG (tmp, FLAG_REMOVED)) 1055 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1147 { 1056 {
1148 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.");
1149 remove_ob (tmp); 1058 tmp->remove ();
1150 } 1059 }
1151 1060
1152 if (tmp->head) 1061 if (tmp->head)
1153 tmp = tmp->head; 1062 tmp = tmp->head;
1154 free_object (tmp); 1063
1064 tmp->destroy ();
1155 return 1; 1065 return 1;
1156} 1066}
1157 1067
1158/** 1068/**
1159 * 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.
… …
1162command_addexp (object *op, char *params) 1072command_addexp (object *op, char *params)
1163{ 1073{
1164 char buf[MAX_BUF], skill[MAX_BUF]; 1074 char buf[MAX_BUF], skill[MAX_BUF];
1165 int i, q; 1075 int i, q;
1166 object *skillob = NULL; 1076 object *skillob = NULL;
1167 player *pl;
1168 1077
1169 skill[0] = '\0'; 1078 skill[0] = '\0';
1170 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))
1171 { 1080 {
1172 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>].");
1173 return 1; 1082 return 1;
1174 } 1083 }
1175 1084
1176 for (pl = first_player; pl != NULL; pl = pl->next) 1085 for_all_players (pl)
1177 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1086 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1178 break;
1179
1180 if (pl == NULL)
1181 { 1087 {
1182 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1183 return 1;
1184 }
1185
1186 if (q >= 3) 1088 if (q >= 3)
1187 { 1089 {
1188 skillob = find_skill_by_name (pl->ob, skill); 1090 skillob = find_skill_by_name (pl->ob, skill);
1189 if (!skillob) 1091 if (!skillob)
1190 { 1092 {
1191 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
1192 return 1; 1110 return 1;
1193 } 1111 }
1194 1112
1195 i = check_exp_adjust (skillob, i); 1113 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1196 skillob->stats.exp += i;
1197 calc_perm_exp (skillob);
1198 player_lvl_adj (pl->ob, skillob);
1199 }
1200
1201 pl->ob->stats.exp += i;
1202 calc_perm_exp (pl->ob);
1203 player_lvl_adj (pl->ob, NULL);
1204
1205 if (settings.real_wiz == FALSE)
1206 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1207 return 1; 1114 return 1;
1208} 1115}
1209 1116
1210/**************************************************************************/ 1117/**************************************************************************/
1211 1118
… …
1217 1124
1218int 1125int
1219command_stats (object *op, char *params) 1126command_stats (object *op, char *params)
1220{ 1127{
1221 char thing[20]; 1128 char thing[20];
1222 player *pl;
1223 char buf[MAX_BUF]; 1129 char buf[MAX_BUF];
1224 1130
1225 thing[0] = '\0'; 1131 thing[0] = '\0';
1226 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1132 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1227 { 1133 {
1228 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1134 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1229 return 1; 1135 return 1;
1230 } 1136 }
1231 1137
1232 for (pl = first_player; pl != NULL; pl = pl->next) 1138 for_all_players (pl)
1233 if (!strcmp (pl->ob->name, thing)) 1139 if (!strcmp (pl->ob->name, thing))
1234 { 1140 {
1235 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);
1236 new_draw_info (NDI_UNIQUE, 0, op, buf); 1142 new_draw_info (NDI_UNIQUE, 0, op, buf);
1237 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);
1238 new_draw_info (NDI_UNIQUE, 0, op, buf); 1144 new_draw_info (NDI_UNIQUE, 0, op, buf);
1239 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);
1240 new_draw_info (NDI_UNIQUE, 0, op, buf); 1146 new_draw_info (NDI_UNIQUE, 0, op, buf);
1241 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);
1242 new_draw_info (NDI_UNIQUE, 0, op, buf); 1148 new_draw_info (NDI_UNIQUE, 0, op, buf);
1243 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);
1244 new_draw_info (NDI_UNIQUE, 0, op, buf); 1150 new_draw_info (NDI_UNIQUE, 0, op, buf);
1245 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);
1246 new_draw_info (NDI_UNIQUE, 0, op, buf); 1152 new_draw_info (NDI_UNIQUE, 0, op, buf);
1247 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);
1248 new_draw_info (NDI_UNIQUE, 0, op, buf); 1154 new_draw_info (NDI_UNIQUE, 0, op, buf);
1249 break; 1155 return 1;
1250 } 1156 }
1251 if (pl == NULL) 1157
1252 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1158 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1253 return 1; 1159 return 1;
1254} 1160}
1255 1161
1256int 1162int
1257command_abil (object *op, char *params) 1163command_abil (object *op, char *params)
… …
1280 { 1186 {
1281 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");
1282 return 1; 1188 return 1;
1283 } 1189 }
1284 1190
1285 for (pl = first_player; pl != NULL; pl = pl->next) 1191 for_all_players (pl)
1286 { 1192 {
1287 if (!strcmp (pl->ob->name, thing)) 1193 if (!strcmp (pl->ob->name, thing))
1288 { 1194 {
1289 if (settings.real_wiz == FALSE) 1195 if (settings.real_wiz == FALSE)
1290 SET_FLAG (pl->ob, FLAG_WAS_WIZ); 1196 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
… …
1302 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1208 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1303 if (!strcmp ("pow", thing2)) 1209 if (!strcmp ("pow", thing2))
1304 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1210 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1305 sprintf (buf, "%s has been altered.", &pl->ob->name); 1211 sprintf (buf, "%s has been altered.", &pl->ob->name);
1306 new_draw_info (NDI_UNIQUE, 0, op, buf); 1212 new_draw_info (NDI_UNIQUE, 0, op, buf);
1307 fix_player (pl->ob); 1213 pl->ob->update_stats ();
1308 return 1; 1214 return 1;
1309 } 1215 }
1310 } 1216 }
1311 1217
1312 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1218 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1313 return 1; 1219 return 1;
1314}
1315
1316int
1317command_reset (object *op, char *params)
1318{
1319 mapstruct *m;
1320 object *dummy = NULL, *tmp = NULL;
1321
1322 if (params == NULL)
1323 {
1324 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1325 return 1;
1326 }
1327
1328 if (strcmp (params, ".") == 0)
1329 params = op->map->path;
1330 m = has_been_loaded (params);
1331 if (m == NULL)
1332 {
1333 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1334 return 1;
1335 }
1336
1337 if (m->in_memory != MAP_SWAPPED)
1338 {
1339 if (m->in_memory != MAP_IN_MEMORY)
1340 {
1341 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1342 return 0;
1343 }
1344
1345 /*
1346 * Only attempt to remove the player that is doing the reset, and not other
1347 * players or wiz's.
1348 */
1349 if (op->map == m)
1350 {
1351 dummy = get_object ();
1352 dummy->map = NULL;
1353 EXIT_X (dummy) = op->x;
1354 EXIT_Y (dummy) = op->y;
1355 EXIT_PATH (dummy) = op->map->path;
1356 remove_ob (op);
1357 op->map = NULL;
1358 tmp = op;
1359 }
1360 swap_map (m);
1361 }
1362
1363 if (m->in_memory == MAP_SWAPPED)
1364 {
1365 LOG (llevDebug, "Resetting map %s.\n", m->path);
1366
1367 /* setting this effectively causes an immediate reload */
1368 m->reset_time = 1;
1369 flush_old_maps ();
1370 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1371 if (tmp)
1372 {
1373 enter_exit (tmp, dummy);
1374 free_object (dummy);
1375 }
1376 return 1;
1377 }
1378 else
1379 {
1380 player *pl;
1381 int playercount = 0;
1382
1383 /* Need to re-insert player if swap failed for some reason */
1384 if (tmp)
1385 {
1386 insert_ob_in_map (op, m, NULL, 0);
1387 free_object (dummy);
1388 }
1389
1390 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1391 for (pl = first_player; pl != NULL; pl = pl->next)
1392 {
1393 if (pl->ob->map == m && pl->ob != op)
1394 {
1395 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1396 playercount++;
1397 }
1398 }
1399 if (!playercount)
1400 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1401 return 1;
1402 }
1403} 1220}
1404 1221
1405int 1222int
1406command_nowiz (object *op, char *params) 1223command_nowiz (object *op, char *params)
1407{ /* 'noadm' is alias */ 1224{ /* 'noadm' is alias */
… …
1477 { 1294 {
1478 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!");
1479 return 0; 1296 return 0;
1480 } 1297 }
1481 1298
1482 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1299 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1483 { 1300 {
1484 SET_FLAG (op, FLAG_WIZ); 1301 SET_FLAG (op, FLAG_WIZ);
1485 SET_FLAG (op, FLAG_WAS_WIZ); 1302 SET_FLAG (op, FLAG_WAS_WIZ);
1486 SET_FLAG (op, FLAG_WIZPASS); 1303 SET_FLAG (op, FLAG_WIZPASS);
1487 SET_FLAG (op, FLAG_WIZCAST); 1304 SET_FLAG (op, FLAG_WIZCAST);
… …
1658 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);
1659 return 0; 1476 return 0;
1660 } 1477 }
1661 1478
1662 do_learn_spell (op, tmp, special_prayer); 1479 do_learn_spell (op, tmp, special_prayer);
1663 free_object (tmp); 1480 tmp->destroy ();
1664 return 1; 1481 return 1;
1665} 1482}
1666 1483
1667int 1484int
1668command_learn_spell (object *op, char *params) 1485command_learn_spell (object *op, char *params)
… …
2080 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!");
2081 return 0; 1898 return 0;
2082 } 1899 }
2083 1900
2084 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1901 if (!QUERY_FLAG (right, FLAG_REMOVED))
2085 remove_ob (right); 1902 right->remove ();
2086 inserted = insert_ob_in_ob (right, left); 1903 inserted = insert_ob_in_ob (right, left);
2087 if (left->type == PLAYER) 1904 if (left->type == PLAYER)
2088 if (inserted == right) 1905 if (inserted == right)
2089 esrv_send_item (left, right); 1906 esrv_send_item (left, right);
2090 else 1907 else

Diff Legend

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