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.34 by root, Mon Feb 5 01:24:46 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#ifndef __CEXTRACT__
26# include <sproto.h> 26#include <sproto.h>
27#endif
28#include <spells.h> 27#include <spells.h>
29#include <treasure.h> 28#include <treasure.h>
30#include <skills.h> 29#include <skills.h>
31 30
32/** Defines for DM item stack **/ 31/** Defines for DM item stack **/
… …
47 * other player, or NULL otherwise. 46 * other player, or NULL otherwise.
48 */ 47 */
49static player * 48static player *
50get_other_player_from_name (object *op, char *name) 49get_other_player_from_name (object *op, char *name)
51{ 50{
52 player *pl;
53
54 if (!name) 51 if (!name)
55 return NULL; 52 return NULL;
56 53
57 for (pl = first_player; pl != NULL; pl = pl->next) 54 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 55 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 56 {
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
64 return NULL;
65 }
66
67 if (pl->ob == op) 57 if (pl->ob == op)
68 { 58 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 59 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 60 return NULL;
71 } 61 }
62
72 if (pl->state != ST_PLAYING) 63 if (pl->ns->state != ST_PLAYING)
73 { 64 {
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 65 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
75 return NULL; 66 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 } 67 }
68
69 return pl;
111 } 70 }
112 71
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
113 return 0; 73 return 0;
114} 74}
115 75
116/** 76/**
117 * Actually hides specified player (obviously a DM). 77 * Actually hides specified player (obviously a DM).
… …
252 now = time (NULL); 212 now = time (NULL);
253 /* 213 /*
254 * Record this as a comment - then we don't have to worry about changing 214 * Record this as a comment - then we don't have to worry about changing
255 * the parsing code. 215 * the parsing code.
256 */ 216 */
257 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket.host, &op->name, ctime (&now)); 217 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); 218 fprintf (banishfile, "*@%s\n", pl->ns->host);
259 fclose (banishfile); 219 fclose (banishfile);
260 220
261 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host); 221 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); 222 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); 223 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); 224 command_kick (op, (char *) &pl->ob->name);
265 return 1; 225 return 1;
266} 226}
267 227
268int 228int
269command_kick (object *op, char *params) 229command_kick (object *op, char *params)
270{ 230{
271 struct pl *pl; 231 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))) 232 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
275 { 233 {
276 object *op = pl->ob; 234 object *op = pl->ob;
277 235
278 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 236 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
279 { 237 {
280 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 238 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"); 239 strcpy (op->contr->killer, "kicked");
282 } 240 }
283 241
284 pl->socket.status = Ns_Dead; 242 pl->ns->destroy ();
285 } 243 }
286 244
287 return 1; 245 return 1;
288} 246}
289 247
248//TODO
249#if 0
290int 250int
291command_save_overlay (object *op, char *params) 251command_save_overlay (object *op, char *params)
292{ 252{
293 if (!op) 253 if (!op)
294 return 0; 254 return 0;
… …
305 265
306 ready_map_name (op->map->path, 0); 266 ready_map_name (op->map->path, 0);
307 267
308 return 1; 268 return 1;
309} 269}
270#endif
310 271
311int 272int
312command_shutdown (object *op, char *params) 273command_shutdown (object *op, char *params)
313{ 274{
314 struct pl *pl;
315
316 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ)) 275 if (op && !QUERY_FLAG (op, FLAG_WIZ))
317 { 276 {
318 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server."); 277 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
319 return 1; 278 return 1;
320 } 279 }
321 280
322 for (pl = first_player; pl != NULL; pl = pl->next) 281 cleanup ("dm initiated shutdown", 0);
323 save_player (pl->ob, 0);
324 282
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 ();
330 /* not reached */ 283 /* 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; 284 return 1;
391} 285}
392 286
393int 287int
394command_freeze (object *op, char *params) 288command_freeze (object *op, char *params)
… …
432 object *dummy; 326 object *dummy;
433 player *pl; 327 player *pl;
434 328
435 if (!op) 329 if (!op)
436 return 0; 330 return 0;
331
437 if (params == NULL) 332 if (params == NULL)
438 { 333 {
439 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 334 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
440 return 1; 335 return 1;
441 } 336 }
337
442 pl = get_other_player_from_name (op, params); 338 pl = get_other_player_from_name (op, params);
443 if (!pl) 339 if (!pl)
444 return 1; 340 return 1;
341
445 dummy = get_jail_exit (pl->ob); 342 dummy = get_jail_exit (pl->ob);
446 if (!dummy) 343 if (!dummy)
447 { 344 {
448 /* we have nowhere to send the prisoner.... */ 345 /* 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"); 346 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
450 return 0; 347 return 0;
451 } 348 }
452 enter_exit (pl->ob, dummy); 349
453 free_object (dummy); 350 pl->ob->enter_exit (dummy);
351 dummy->destroy ();
454 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 352 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
455 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 353 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
456 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 354 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
457 return 1; 355 return 1;
458} 356}
… …
482 { 380 {
483 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 381 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
484 return 1; 382 return 1;
485 } 383 }
486 384
487 dummy = get_object (); 385 dummy = object::create ();
488 EXIT_PATH (dummy) = op->map->path; 386 EXIT_PATH (dummy) = op->map->path;
489 EXIT_X (dummy) = op->x + freearr_x[i]; 387 EXIT_X (dummy) = op->x + freearr_x[i];
490 EXIT_Y (dummy) = op->y + freearr_y[i]; 388 EXIT_Y (dummy) = op->y + freearr_y[i];
491 enter_exit (pl->ob, dummy); 389 pl->ob->enter_exit (dummy);
492 free_object (dummy); 390 dummy->destroy ();
493 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 391 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
494 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 392 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
495 393
496 return 1;
497}
498
499/**
500 * Teleport next to target player.
501 */
502
503/* mids 01/16/2002 */
504int
505command_teleport (object *op, char *params)
506{
507 int i;
508 object *dummy;
509 player *pl;
510
511 if (!op)
512 return 0;
513
514 if (params == NULL)
515 {
516 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
517 return 1;
518 }
519
520 pl = get_other_player_from_name (op, params);
521 if (!pl)
522 return 1;
523
524 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
525 if (i == -1)
526 {
527 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
528 return 1;
529 }
530
531 dummy = get_object ();
532 EXIT_PATH (dummy) = pl->ob->map->path;
533 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
534 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
535 enter_exit (op, dummy);
536 free_object (dummy);
537 if (!op->contr->hidden)
538 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
539 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
540 return 1; 394 return 1;
541} 395}
542 396
543/** 397/**
544 * This function is a real mess, because we're stucking getting 398 * This function is a real mess, because we're stucking getting
… …
638 at_spell = archetype::find (cp); 492 at_spell = archetype::find (cp);
639 if (!at_spell || at_spell->clone.type != SPELL) 493 if (!at_spell || at_spell->clone.type != SPELL)
640 at_spell = find_archetype_by_object_name (cp); 494 at_spell = find_archetype_by_object_name (cp);
641 if (!at_spell || at_spell->clone.type != SPELL) 495 if (!at_spell || at_spell->clone.type != SPELL)
642 { 496 {
643 strcpy (spell_name, cp); 497 assign (spell_name, cp);
644 fsp = strchr (spell_name, ' '); 498 fsp = strchr (spell_name, ' ');
645 if (fsp) 499 if (fsp)
646 { 500 {
647 *fsp = 0; 501 *fsp = 0;
648 fsp++; 502 fsp++;
… …
828 * so just copying it over should be fine. 682 * so just copying it over should be fine.
829 */ 683 */
830 if (!head) 684 if (!head)
831 { 685 {
832 head = dup; 686 head = dup;
833 copy_object (tmp, dup); 687 tmp->copy_to (dup);
834 } 688 }
835 689
836 if (settings.real_wiz == FALSE) 690 if (settings.real_wiz == FALSE)
837 SET_FLAG (dup, FLAG_WAS_WIZ); 691 SET_FLAG (dup, FLAG_WAS_WIZ);
838 692
… …
865 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 719 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
866 { 720 {
867 if (head->x < size_x || head->y < size_y) 721 if (head->x < size_x || head->y < size_y)
868 { 722 {
869 dm_stack_pop (op->contr); 723 dm_stack_pop (op->contr);
870 free_object (head); 724 head->destroy ();
871 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 725 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
872 free_object (tmp); 726 tmp->destroy ();
873 return 1; 727 return 1;
874 } 728 }
875 729
876 check = head; 730 check = head;
877 731
… …
899 753
900 esrv_send_item (op, head); 754 esrv_send_item (op, head);
901 } 755 }
902 756
903 /* free the one we used to copy */ 757 /* free the one we used to copy */
904 free_object (tmp); 758 tmp->destroy ();
905 } 759 }
906 760
907 return 1; 761 return 1;
908} 762}
909 763
… …
951 805
952 tmp = get_dm_object (op->contr, &params, NULL); 806 tmp = get_dm_object (op->contr, &params, NULL);
953 if (!tmp) 807 if (!tmp)
954 return 1; 808 return 1;
955 809
956 dump_object (tmp); 810 char *dump = dump_object (tmp);
957 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 811 new_draw_info (NDI_UNIQUE, 0, op, dump);
812 free (dump);
813
958 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 814 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
959 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 815 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
816
960 return 1; 817 return 1;
961} 818}
962 819
963/** 820/**
964 * When DM is possessing a monster, flip aggression on and off, to allow 821 * When DM is possessing a monster, flip aggression on and off, to allow
… …
1055 victim->body_info[i] = 1; 912 victim->body_info[i] = 1;
1056 913
1057 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */ 914 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
1058 esrv_send_inventory (victim, victim); 915 esrv_send_inventory (victim, victim);
1059 916
1060 fix_player (victim); 917 victim->update_stats ();
1061 918
1062 do_some_living (victim); 919 do_some_living (victim);
1063 return 1; 920 return 1;
1064} 921}
1065 922
… …
1126 dm_stack_pop (op->contr); 983 dm_stack_pop (op->contr);
1127 984
1128 /* Always work on the head - otherwise object will get in odd state */ 985 /* Always work on the head - otherwise object will get in odd state */
1129 if (tmp->head) 986 if (tmp->head)
1130 tmp = tmp->head; 987 tmp = tmp->head;
1131 remove_ob (tmp); 988 tmp->remove ();
1132 return 1; 989 return 1;
1133} 990}
1134 991
1135int 992int
1136command_free (object *op, char *params) 993command_free (object *op, char *params)
… …
1148 1005
1149 if (from != STACK_FROM_STACK) 1006 if (from != STACK_FROM_STACK)
1150 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 1007 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1151 dm_stack_pop (op->contr); 1008 dm_stack_pop (op->contr);
1152 1009
1153 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1154 {
1155 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1156 remove_ob (tmp);
1157 }
1158
1159 if (tmp->head) 1010 if (tmp->head)
1160 tmp = tmp->head; 1011 tmp = tmp->head;
1161 free_object (tmp); 1012
1013 tmp->destroy ();
1162 return 1; 1014 return 1;
1163} 1015}
1164 1016
1165/** 1017/**
1166 * This adds exp to a player. We now allow adding to a specific skill. 1018 * This adds exp to a player. We now allow adding to a specific skill.
… …
1169command_addexp (object *op, char *params) 1021command_addexp (object *op, char *params)
1170{ 1022{
1171 char buf[MAX_BUF], skill[MAX_BUF]; 1023 char buf[MAX_BUF], skill[MAX_BUF];
1172 int i, q; 1024 int i, q;
1173 object *skillob = NULL; 1025 object *skillob = NULL;
1174 player *pl;
1175 1026
1176 skill[0] = '\0'; 1027 skill[0] = '\0';
1177 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 1028 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2))
1178 { 1029 {
1179 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 1030 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1180 return 1; 1031 return 1;
1181 } 1032 }
1182 1033
1183 for (pl = first_player; pl != NULL; pl = pl->next) 1034 for_all_players (pl)
1184 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1035 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1185 break;
1186
1187 if (pl == NULL)
1188 { 1036 {
1189 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1190 return 1;
1191 }
1192
1193 if (q >= 3) 1037 if (q >= 3)
1194 { 1038 {
1195 skillob = find_skill_by_name (pl->ob, skill); 1039 skillob = find_skill_by_name (pl->ob, skill);
1196 if (!skillob) 1040 if (!skillob)
1197 { 1041 {
1198 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 1042 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
1043 return 1;
1044 }
1045
1046 i = check_exp_adjust (skillob, i);
1047 skillob->stats.exp += i;
1048 calc_perm_exp (skillob);
1049 player_lvl_adj (pl->ob, skillob);
1050 }
1051
1052 pl->ob->stats.exp += i;
1053 calc_perm_exp (pl->ob);
1054 player_lvl_adj (pl->ob, NULL);
1055
1056 if (settings.real_wiz == FALSE)
1057 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1058
1199 return 1; 1059 return 1;
1200 } 1060 }
1201 1061
1202 i = check_exp_adjust (skillob, i); 1062 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; 1063 return 1;
1215} 1064}
1216 1065
1217/**************************************************************************/ 1066/**************************************************************************/
1218 1067
… …
1224 1073
1225int 1074int
1226command_stats (object *op, char *params) 1075command_stats (object *op, char *params)
1227{ 1076{
1228 char thing[20]; 1077 char thing[20];
1229 player *pl;
1230 char buf[MAX_BUF]; 1078 char buf[MAX_BUF];
1231 1079
1232 thing[0] = '\0'; 1080 thing[0] = '\0';
1233 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1081 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1234 { 1082 {
1235 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1083 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1236 return 1; 1084 return 1;
1237 } 1085 }
1238 1086
1239 for (pl = first_player; pl != NULL; pl = pl->next) 1087 for_all_players (pl)
1240 if (!strcmp (pl->ob->name, thing)) 1088 if (!strcmp (pl->ob->name, thing))
1241 { 1089 {
1242 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1090 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); 1091 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); 1092 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); 1093 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); 1094 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); 1095 new_draw_info (NDI_UNIQUE, 0, op, buf);
1248 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 1096 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1249 new_draw_info (NDI_UNIQUE, 0, op, buf); 1097 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); 1098 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1251 new_draw_info (NDI_UNIQUE, 0, op, buf); 1099 new_draw_info (NDI_UNIQUE, 0, op, buf);
1252 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1100 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1253 new_draw_info (NDI_UNIQUE, 0, op, buf); 1101 new_draw_info (NDI_UNIQUE, 0, op, buf);
1254 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1102 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1255 new_draw_info (NDI_UNIQUE, 0, op, buf); 1103 new_draw_info (NDI_UNIQUE, 0, op, buf);
1256 break; 1104 return 1;
1257 } 1105 }
1258 if (pl == NULL) 1106
1259 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1107 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1260 return 1; 1108 return 1;
1261} 1109}
1262 1110
1263int 1111int
1264command_abil (object *op, char *params) 1112command_abil (object *op, char *params)
… …
1287 { 1135 {
1288 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 1136 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1289 return 1; 1137 return 1;
1290 } 1138 }
1291 1139
1292 for (pl = first_player; pl != NULL; pl = pl->next) 1140 for_all_players (pl)
1293 { 1141 {
1294 if (!strcmp (pl->ob->name, thing)) 1142 if (!strcmp (pl->ob->name, thing))
1295 { 1143 {
1296 if (settings.real_wiz == FALSE) 1144 if (settings.real_wiz == FALSE)
1297 SET_FLAG (pl->ob, FLAG_WAS_WIZ); 1145 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
… …
1309 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1157 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1310 if (!strcmp ("pow", thing2)) 1158 if (!strcmp ("pow", thing2))
1311 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1159 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1312 sprintf (buf, "%s has been altered.", &pl->ob->name); 1160 sprintf (buf, "%s has been altered.", &pl->ob->name);
1313 new_draw_info (NDI_UNIQUE, 0, op, buf); 1161 new_draw_info (NDI_UNIQUE, 0, op, buf);
1314 fix_player (pl->ob); 1162 pl->ob->update_stats ();
1315 return 1; 1163 return 1;
1316 } 1164 }
1317 } 1165 }
1318 1166
1319 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1167 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1320 return 1; 1168 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} 1169}
1411 1170
1412int 1171int
1413command_nowiz (object *op, char *params) 1172command_nowiz (object *op, char *params)
1414{ /* 'noadm' is alias */ 1173{ /* 'noadm' is alias */
… …
1484 { 1243 {
1485 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1244 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1486 return 0; 1245 return 0;
1487 } 1246 }
1488 1247
1489 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1248 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1490 { 1249 {
1491 SET_FLAG (op, FLAG_WIZ); 1250 SET_FLAG (op, FLAG_WIZ);
1492 SET_FLAG (op, FLAG_WAS_WIZ); 1251 SET_FLAG (op, FLAG_WAS_WIZ);
1493 SET_FLAG (op, FLAG_WIZPASS); 1252 SET_FLAG (op, FLAG_WIZPASS);
1494 SET_FLAG (op, FLAG_WIZCAST); 1253 SET_FLAG (op, FLAG_WIZCAST);
… …
1665 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1424 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1666 return 0; 1425 return 0;
1667 } 1426 }
1668 1427
1669 do_learn_spell (op, tmp, special_prayer); 1428 do_learn_spell (op, tmp, special_prayer);
1670 free_object (tmp); 1429 tmp->destroy ();
1671 return 1; 1430 return 1;
1672} 1431}
1673 1432
1674int 1433int
1675command_learn_spell (object *op, char *params) 1434command_learn_spell (object *op, char *params)
… …
2087 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1846 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
2088 return 0; 1847 return 0;
2089 } 1848 }
2090 1849
2091 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1850 if (!QUERY_FLAG (right, FLAG_REMOVED))
2092 remove_ob (right); 1851 right->remove ();
2093 inserted = insert_ob_in_ob (right, left); 1852 inserted = insert_ob_in_ob (right, left);
2094 if (left->type == PLAYER) 1853 if (left->type == PLAYER)
2095 if (inserted == right) 1854 if (inserted == right)
2096 esrv_send_item (left, right); 1855 esrv_send_item (left, right);
2097 else 1856 else

Diff Legend

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