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

Diff Legend

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