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.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 cleanup (); 281 cleanup ("dm initiated shutdown", 0);
282
323 /* not reached */ 283 /* 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; 284 return 1;
384} 285}
385 286
386int 287int
387command_freeze (object *op, char *params) 288command_freeze (object *op, char *params)
… …
425 object *dummy; 326 object *dummy;
426 player *pl; 327 player *pl;
427 328
428 if (!op) 329 if (!op)
429 return 0; 330 return 0;
331
430 if (params == NULL) 332 if (params == NULL)
431 { 333 {
432 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 334 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
433 return 1; 335 return 1;
434 } 336 }
337
435 pl = get_other_player_from_name (op, params); 338 pl = get_other_player_from_name (op, params);
436 if (!pl) 339 if (!pl)
437 return 1; 340 return 1;
341
438 dummy = get_jail_exit (pl->ob); 342 dummy = get_jail_exit (pl->ob);
439 if (!dummy) 343 if (!dummy)
440 { 344 {
441 /* we have nowhere to send the prisoner.... */ 345 /* 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"); 346 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
443 return 0; 347 return 0;
444 } 348 }
445 enter_exit (pl->ob, dummy); 349
446 free_object (dummy); 350 pl->ob->enter_exit (dummy);
351 dummy->destroy ();
447 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.");
448 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 353 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
449 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);
450 return 1; 355 return 1;
451} 356}
… …
475 { 380 {
476 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.");
477 return 1; 382 return 1;
478 } 383 }
479 384
480 dummy = get_object (); 385 dummy = object::create ();
481 EXIT_PATH (dummy) = op->map->path; 386 EXIT_PATH (dummy) = op->map->path;
482 EXIT_X (dummy) = op->x + freearr_x[i]; 387 EXIT_X (dummy) = op->x + freearr_x[i];
483 EXIT_Y (dummy) = op->y + freearr_y[i]; 388 EXIT_Y (dummy) = op->y + freearr_y[i];
484 enter_exit (pl->ob, dummy); 389 pl->ob->enter_exit (dummy);
485 free_object (dummy); 390 dummy->destroy ();
486 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 391 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
487 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 392 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
488 393
489 return 1;
490}
491
492/**
493 * Teleport next to target player.
494 */
495
496/* mids 01/16/2002 */
497int
498command_teleport (object *op, char *params)
499{
500 int i;
501 object *dummy;
502 player *pl;
503
504 if (!op)
505 return 0;
506
507 if (params == NULL)
508 {
509 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
510 return 1;
511 }
512
513 pl = get_other_player_from_name (op, params);
514 if (!pl)
515 return 1;
516
517 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
518 if (i == -1)
519 {
520 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
521 return 1;
522 }
523
524 dummy = get_object ();
525 EXIT_PATH (dummy) = pl->ob->map->path;
526 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
527 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
528 enter_exit (op, dummy);
529 free_object (dummy);
530 if (!op->contr->hidden)
531 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
532 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
533 return 1; 394 return 1;
534} 395}
535 396
536/** 397/**
537 * This function is a real mess, because we're stucking getting 398 * This function is a real mess, because we're stucking getting
… …
631 at_spell = archetype::find (cp); 492 at_spell = archetype::find (cp);
632 if (!at_spell || at_spell->clone.type != SPELL) 493 if (!at_spell || at_spell->clone.type != SPELL)
633 at_spell = find_archetype_by_object_name (cp); 494 at_spell = find_archetype_by_object_name (cp);
634 if (!at_spell || at_spell->clone.type != SPELL) 495 if (!at_spell || at_spell->clone.type != SPELL)
635 { 496 {
636 strcpy (spell_name, cp); 497 assign (spell_name, cp);
637 fsp = strchr (spell_name, ' '); 498 fsp = strchr (spell_name, ' ');
638 if (fsp) 499 if (fsp)
639 { 500 {
640 *fsp = 0; 501 *fsp = 0;
641 fsp++; 502 fsp++;
… …
821 * so just copying it over should be fine. 682 * so just copying it over should be fine.
822 */ 683 */
823 if (!head) 684 if (!head)
824 { 685 {
825 head = dup; 686 head = dup;
826 copy_object (tmp, dup); 687 tmp->copy_to (dup);
827 } 688 }
828 689
829 if (settings.real_wiz == FALSE) 690 if (settings.real_wiz == FALSE)
830 SET_FLAG (dup, FLAG_WAS_WIZ); 691 SET_FLAG (dup, FLAG_WAS_WIZ);
831 692
… …
858 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))
859 { 720 {
860 if (head->x < size_x || head->y < size_y) 721 if (head->x < size_x || head->y < size_y)
861 { 722 {
862 dm_stack_pop (op->contr); 723 dm_stack_pop (op->contr);
863 free_object (head); 724 head->destroy ();
864 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.");
865 free_object (tmp); 726 tmp->destroy ();
866 return 1; 727 return 1;
867 } 728 }
868 729
869 check = head; 730 check = head;
870 731
… …
892 753
893 esrv_send_item (op, head); 754 esrv_send_item (op, head);
894 } 755 }
895 756
896 /* free the one we used to copy */ 757 /* free the one we used to copy */
897 free_object (tmp); 758 tmp->destroy ();
898 } 759 }
899 760
900 return 1; 761 return 1;
901} 762}
902 763
… …
944 805
945 tmp = get_dm_object (op->contr, &params, NULL); 806 tmp = get_dm_object (op->contr, &params, NULL);
946 if (!tmp) 807 if (!tmp)
947 return 1; 808 return 1;
948 809
949 dump_object (tmp); 810 char *dump = dump_object (tmp);
950 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 811 new_draw_info (NDI_UNIQUE, 0, op, dump);
812 free (dump);
813
951 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 814 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
952 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 815 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
816
953 return 1; 817 return 1;
954} 818}
955 819
956/** 820/**
957 * 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
… …
1048 victim->body_info[i] = 1; 912 victim->body_info[i] = 1;
1049 913
1050 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 */
1051 esrv_send_inventory (victim, victim); 915 esrv_send_inventory (victim, victim);
1052 916
1053 fix_player (victim); 917 victim->update_stats ();
1054 918
1055 do_some_living (victim); 919 do_some_living (victim);
1056 return 1; 920 return 1;
1057} 921}
1058 922
… …
1119 dm_stack_pop (op->contr); 983 dm_stack_pop (op->contr);
1120 984
1121 /* 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 */
1122 if (tmp->head) 986 if (tmp->head)
1123 tmp = tmp->head; 987 tmp = tmp->head;
1124 remove_ob (tmp); 988 tmp->remove ();
1125 return 1; 989 return 1;
1126} 990}
1127 991
1128int 992int
1129command_free (object *op, char *params) 993command_free (object *op, char *params)
… …
1141 1005
1142 if (from != STACK_FROM_STACK) 1006 if (from != STACK_FROM_STACK)
1143 /* 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 */
1144 dm_stack_pop (op->contr); 1008 dm_stack_pop (op->contr);
1145 1009
1146 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1147 {
1148 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1149 remove_ob (tmp);
1150 }
1151
1152 if (tmp->head) 1010 if (tmp->head)
1153 tmp = tmp->head; 1011 tmp = tmp->head;
1154 free_object (tmp); 1012
1013 tmp->destroy ();
1155 return 1; 1014 return 1;
1156} 1015}
1157 1016
1158/** 1017/**
1159 * 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.
… …
1162command_addexp (object *op, char *params) 1021command_addexp (object *op, char *params)
1163{ 1022{
1164 char buf[MAX_BUF], skill[MAX_BUF]; 1023 char buf[MAX_BUF], skill[MAX_BUF];
1165 int i, q; 1024 int i, q;
1166 object *skillob = NULL; 1025 object *skillob = NULL;
1167 player *pl;
1168 1026
1169 skill[0] = '\0'; 1027 skill[0] = '\0';
1170 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))
1171 { 1029 {
1172 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>].");
1173 return 1; 1031 return 1;
1174 } 1032 }
1175 1033
1176 for (pl = first_player; pl != NULL; pl = pl->next) 1034 for_all_players (pl)
1177 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1035 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1178 break;
1179
1180 if (pl == NULL)
1181 { 1036 {
1182 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1183 return 1;
1184 }
1185
1186 if (q >= 3) 1037 if (q >= 3)
1187 { 1038 {
1188 skillob = find_skill_by_name (pl->ob, skill); 1039 skillob = find_skill_by_name (pl->ob, skill);
1189 if (!skillob) 1040 if (!skillob)
1190 { 1041 {
1191 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
1192 return 1; 1059 return 1;
1193 } 1060 }
1194 1061
1195 i = check_exp_adjust (skillob, i); 1062 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; 1063 return 1;
1208} 1064}
1209 1065
1210/**************************************************************************/ 1066/**************************************************************************/
1211 1067
… …
1217 1073
1218int 1074int
1219command_stats (object *op, char *params) 1075command_stats (object *op, char *params)
1220{ 1076{
1221 char thing[20]; 1077 char thing[20];
1222 player *pl;
1223 char buf[MAX_BUF]; 1078 char buf[MAX_BUF];
1224 1079
1225 thing[0] = '\0'; 1080 thing[0] = '\0';
1226 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1081 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1227 { 1082 {
1228 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1083 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1229 return 1; 1084 return 1;
1230 } 1085 }
1231 1086
1232 for (pl = first_player; pl != NULL; pl = pl->next) 1087 for_all_players (pl)
1233 if (!strcmp (pl->ob->name, thing)) 1088 if (!strcmp (pl->ob->name, thing))
1234 { 1089 {
1235 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);
1236 new_draw_info (NDI_UNIQUE, 0, op, buf); 1091 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); 1092 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); 1093 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); 1094 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); 1095 new_draw_info (NDI_UNIQUE, 0, op, buf);
1241 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);
1242 new_draw_info (NDI_UNIQUE, 0, op, buf); 1097 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); 1098 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1244 new_draw_info (NDI_UNIQUE, 0, op, buf); 1099 new_draw_info (NDI_UNIQUE, 0, op, buf);
1245 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);
1246 new_draw_info (NDI_UNIQUE, 0, op, buf); 1101 new_draw_info (NDI_UNIQUE, 0, op, buf);
1247 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);
1248 new_draw_info (NDI_UNIQUE, 0, op, buf); 1103 new_draw_info (NDI_UNIQUE, 0, op, buf);
1249 break; 1104 return 1;
1250 } 1105 }
1251 if (pl == NULL) 1106
1252 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1107 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1253 return 1; 1108 return 1;
1254} 1109}
1255 1110
1256int 1111int
1257command_abil (object *op, char *params) 1112command_abil (object *op, char *params)
… …
1280 { 1135 {
1281 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");
1282 return 1; 1137 return 1;
1283 } 1138 }
1284 1139
1285 for (pl = first_player; pl != NULL; pl = pl->next) 1140 for_all_players (pl)
1286 { 1141 {
1287 if (!strcmp (pl->ob->name, thing)) 1142 if (!strcmp (pl->ob->name, thing))
1288 { 1143 {
1289 if (settings.real_wiz == FALSE) 1144 if (settings.real_wiz == FALSE)
1290 SET_FLAG (pl->ob, FLAG_WAS_WIZ); 1145 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
… …
1302 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1157 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1303 if (!strcmp ("pow", thing2)) 1158 if (!strcmp ("pow", thing2))
1304 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1159 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1305 sprintf (buf, "%s has been altered.", &pl->ob->name); 1160 sprintf (buf, "%s has been altered.", &pl->ob->name);
1306 new_draw_info (NDI_UNIQUE, 0, op, buf); 1161 new_draw_info (NDI_UNIQUE, 0, op, buf);
1307 fix_player (pl->ob); 1162 pl->ob->update_stats ();
1308 return 1; 1163 return 1;
1309 } 1164 }
1310 } 1165 }
1311 1166
1312 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1167 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1313 return 1; 1168 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} 1169}
1404 1170
1405int 1171int
1406command_nowiz (object *op, char *params) 1172command_nowiz (object *op, char *params)
1407{ /* 'noadm' is alias */ 1173{ /* 'noadm' is alias */
… …
1477 { 1243 {
1478 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!");
1479 return 0; 1245 return 0;
1480 } 1246 }
1481 1247
1482 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1248 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1483 { 1249 {
1484 SET_FLAG (op, FLAG_WIZ); 1250 SET_FLAG (op, FLAG_WIZ);
1485 SET_FLAG (op, FLAG_WAS_WIZ); 1251 SET_FLAG (op, FLAG_WAS_WIZ);
1486 SET_FLAG (op, FLAG_WIZPASS); 1252 SET_FLAG (op, FLAG_WIZPASS);
1487 SET_FLAG (op, FLAG_WIZCAST); 1253 SET_FLAG (op, FLAG_WIZCAST);
… …
1658 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);
1659 return 0; 1425 return 0;
1660 } 1426 }
1661 1427
1662 do_learn_spell (op, tmp, special_prayer); 1428 do_learn_spell (op, tmp, special_prayer);
1663 free_object (tmp); 1429 tmp->destroy ();
1664 return 1; 1430 return 1;
1665} 1431}
1666 1432
1667int 1433int
1668command_learn_spell (object *op, char *params) 1434command_learn_spell (object *op, char *params)
… …
2080 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!");
2081 return 0; 1847 return 0;
2082 } 1848 }
2083 1849
2084 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1850 if (!QUERY_FLAG (right, FLAG_REMOVED))
2085 remove_ob (right); 1851 right->remove ();
2086 inserted = insert_ob_in_ob (right, left); 1852 inserted = insert_ob_in_ob (right, left);
2087 if (left->type == PLAYER) 1853 if (left->type == PLAYER)
2088 if (inserted == right) 1854 if (inserted == right)
2089 esrv_send_item (left, right); 1855 esrv_send_item (left, right);
2090 else 1856 else

Diff Legend

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