ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_object.C
(Generate patch)

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.25 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.50 by root, Mon May 7 07:47:33 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
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 author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
23 *
24 */
22 25
26/*
23 Object (handling) commands 27 * Object (handling) commands
24*/ 28 */
25 29
26#include <global.h> 30#include <global.h>
27#include <loader.h> 31#include <loader.h>
28#include <skills.h> 32#include <skills.h>
29#ifndef __CEXTRACT__
30# include <sproto.h> 33#include <sproto.h>
31#endif
32#include <living.h> 34#include <living.h>
33#include <math.h> 35#include <math.h>
34 36
35/* 37/*
36 * Object id parsing functions 38 * Object id parsing functions
… …
93 if (!params) 95 if (!params)
94 { 96 {
95 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: use_skill <skill name>"); 97 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: use_skill <skill name>");
96 return 0; 98 return 0;
97 } 99 }
100
98 return use_skill (pl, params); 101 return use_skill (pl, params);
99} 102}
100 103
101int 104int
102command_rskill (object *pl, char *params) 105command_rskill (object *pl, char *params)
… …
106 if (!params) 109 if (!params)
107 { 110 {
108 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); 111 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
109 return 0; 112 return 0;
110 } 113 }
114
111 skill = find_skill_by_name (pl, params); 115 skill = find_skill_by_name (pl, params);
112 116
113 if (!skill) 117 if (!skill)
114 { 118 {
115 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 119 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);
116 return 0; 120 return 0;
117 } 121 }
122
118 return change_skill (pl, skill, 0); 123 return change_skill (pl, skill, 0);
119} 124}
120 125
121 126
122/* These functions (command_search, command_disarm) are really just wrappers for 127/* These functions (command_search, command_disarm) are really just wrappers for
… …
259 /* IF the player is flying & trying to take the item out of a container 264 /* IF the player is flying & trying to take the item out of a container
260 * that is in his inventory, let him. tmp->env points to the container 265 * that is in his inventory, let him. tmp->env points to the container
261 * (sack, luggage, etc), tmp->env->env then points to the player (nested 266 * (sack, luggage, etc), tmp->env->env then points to the player (nested
262 * containers not allowed as of now) 267 * containers not allowed as of now)
263 */ 268 */
264 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && is_player_inv (tmp) != pl) 269 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
265 { 270 {
266 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); 271 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!");
267 return; 272 return;
268 } 273 }
269 274
… …
273 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ)) 278 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
274 { 279 {
275 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!"); 280 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!");
276 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion."); 281 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
277 282
278 if (pl->type == PLAYER) 283 if (pl->contr)
279 esrv_del_item (pl->contr, tmp->count); 284 esrv_del_item (pl->contr, tmp->count);
280 285
281 tmp->destroy (); 286 tmp->destroy ();
282 return; 287 return;
283 } 288 }
… …
299 { 304 {
300 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 305 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
301 return; 306 return;
302 } 307 }
303 308
304 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ))
305 SET_FLAG (tmp, FLAG_WAS_WIZ);
306
307 if (nrof != tmp_nrof) 309 if (nrof != tmp_nrof)
308 { 310 {
309 object *tmp2 = tmp; 311 object *tmp2 = tmp;
310 312
311 tmp = get_split_ob (tmp, nrof); 313 tmp = get_split_ob (tmp, nrof);
… …
313 { 315 {
314 new_draw_info (NDI_UNIQUE, 0, pl, errmsg); 316 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
315 return; 317 return;
316 } 318 }
317 319
318 /* Tell a client what happened rest of objects */ 320 /* Tell the client what happened to the rest of objects */
319 if (pl->type == PLAYER) 321 if (pl->contr)
320 {
321 if (tmp2->destroyed ()) 322 if (tmp2->destroyed ())
322 esrv_del_item (pl->contr, tmp2->count); 323 esrv_del_item (pl->contr, tmp2->count);
323 else 324 else
324 esrv_send_item (pl, tmp2); 325 esrv_update_item (UPD_NROF, pl, tmp2);
325 }
326 } 326 }
327 else 327 else
328 { 328 {
329 /* If the object is in a container, send a delete to the client. 329 /* If the object is in a container, send a delete to the client.
330 * - we are moving all the items from the container to elsewhere, 330 * - we are moving all the items from the container to elsewhere,
… …
332 */ 332 */
333 if (!QUERY_FLAG (tmp, FLAG_REMOVED)) 333 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
334 { 334 {
335 if (tmp->env && pl->type == PLAYER) 335 if (tmp->env && pl->type == PLAYER)
336 esrv_del_item (pl->contr, tmp->count); 336 esrv_del_item (pl->contr, tmp->count);
337
337 tmp->remove (); /* Unlink it */ 338 tmp->remove (); /* Unlink it */
338 } 339 }
339 } 340 }
341
340 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 342 if (QUERY_FLAG (tmp, FLAG_UNPAID))
341 (void) sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP)); 343 sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
342 else 344 else
343 (void) sprintf (buf, "You pick up the %s.", query_name (tmp)); 345 sprintf (buf, "You pick up the %s.", query_name (tmp));
346
344 new_draw_info (NDI_UNIQUE, 0, pl, buf); 347 new_draw_info (NDI_UNIQUE, 0, pl, buf);
345 348
346 tmp = insert_ob_in_ob (tmp, op); 349 tmp = insert_ob_in_ob (tmp, op);
347 350
348 /* All the stuff below deals with client/server code, and is only 351 /* All the stuff below deals with client/server code, and is only
349 * usable by players 352 * usable by players
350 */ 353 */
351 if (pl->type != PLAYER) 354 if (pl->contr)
352 return; 355 {
353
354 esrv_send_item (pl, tmp); 356 esrv_send_item (pl, tmp);
357
355 /* These are needed to update the weight for the container we 358 /* These are needed to update the weight for the container we
356 * are putting the object in. 359 * are putting the object in.
357 */ 360 */
358 if (op != pl) 361 if (op != pl)
359 { 362 {
360 esrv_update_item (UPD_WEIGHT, pl, op); 363 esrv_update_item (UPD_WEIGHT, pl, op);
361 esrv_send_item (pl, pl); 364 esrv_send_item (pl, pl);
362 } 365 }
363 366
364 /* Update the container the object was in */ 367 /* Update the container the object was in */
365 if (env && env != pl && env != op) 368 if (env && env != pl && env != op)
366 esrv_update_item (UPD_WEIGHT, pl, env); 369 esrv_update_item (UPD_WEIGHT, pl, env);
370 }
367} 371}
368 372
369/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 373/* modified slightly to allow monsters use this -b.t. 5-31-95 */
370void 374void
371pick_up (object *op, object *alt) 375pick_up (object *op, object *alt)
… …
430 434
431 if (!alt) 435 if (!alt)
432 for (alt = op->inv; alt; alt = alt->below) 436 for (alt = op->inv; alt; alt = alt->below)
433 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count)) 437 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count))
434 break; /* General container comes next */ 438 break; /* General container comes next */
439
435 if (!alt) 440 if (!alt)
436 alt = op; /* No free containers */ 441 alt = op; /* No free containers */
437 } 442 }
438 443
439 if (tmp->env == alt) 444 if (tmp->env == alt)
… …
466 471
467leave: 472leave:
468 if (need_fix_tmp) 473 if (need_fix_tmp)
469 fix_stopped_item (tmp, tmp_map, op); 474 fix_stopped_item (tmp, tmp_map, op);
470} 475}
471
472 476
473/* This takes (picks up) and item. op is the player 477/* This takes (picks up) and item. op is the player
474 * who issued the command. params is a string to 478 * who issued the command. params is a string to
475 * match against the item name. Basically, always 479 * match against the item name. Basically, always
476 * returns zero, but that should be improved. 480 * returns zero, but that should be improved.
… …
491 495
492 if (!tmp) 496 if (!tmp)
493 tmp = op->below; 497 tmp = op->below;
494 } 498 }
495 499
496 if (tmp == NULL) 500 if (!tmp)
497 { 501 {
498 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!"); 502 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!");
499 return 0; 503 return 0;
500 } 504 }
501 505
502 /* Makes processing easier */ 506 /* Makes processing easier */
503 if (params && *params == '\0') 507 if (params && *params == '\0')
504 params = NULL; 508 params = 0;
505 509
506 while (tmp) 510 while (tmp)
507 { 511 {
508 next = tmp->below; 512 next = tmp->below;
509 513
510 if (tmp->invisible) 514 if (tmp->invisible)
511 { 515 {
512 tmp = next; 516 tmp = next;
513 continue; 517 continue;
514 } 518 }
519
515 /* This following two if and else if could be merged into line 520 /* This following two if and else if could be merged into line
516 * but that probably will make it more difficult to read, and 521 * but that probably will make it more difficult to read, and
517 * not make it any more efficient 522 * not make it any more efficient
518 */ 523 */
519 if (params && item_matched_string (op, tmp, params)) 524 if (params && item_matched_string (op, tmp, params))
520 {
521 pick_up (op, tmp); 525 pick_up (op, tmp);
522 }
523 else if (can_pick (op, tmp) && !params) 526 else if (can_pick (op, tmp) && !params)
524 { 527 {
525 pick_up (op, tmp); 528 pick_up (op, tmp);
526 break; 529 break;
527 } 530 }
531
528 tmp = next; 532 tmp = next;
529 /* Might as well just skip over the player immediately -
530 * we know it can't be picked up
531 */
532 if (tmp == op)
533 tmp = tmp->below;
534 } 533 }
534
535 if (!params && !tmp) 535 if (!params && !tmp)
536 { 536 {
537 for (tmp = op->below; tmp != NULL; tmp = tmp->next) 537 for (tmp = op->below; tmp; tmp = tmp->below)
538 if (!tmp->invisible) 538 if (!tmp->invisible)
539 { 539 {
540 char buf[MAX_BUF]; 540 char buf[MAX_BUF];
541 541
542 sprintf (buf, "You can't pick up a %s.", &tmp->name); 542 sprintf (buf, "You can't pick up a %s.", &tmp->name);
543 new_draw_info (NDI_UNIQUE, 0, op, buf); 543 new_draw_info (NDI_UNIQUE, 0, op, buf);
544 break; 544 break;
545 } 545 }
546
546 if (!tmp) 547 if (!tmp)
547 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 548 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
548 } 549 }
550
549 return 0; 551 return 0;
550} 552}
551 553
552 554
553/* 555/*
… …
633 else 635 else
634 tmp->remove (); 636 tmp->remove ();
635 637
636 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 638 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
637 tmp2 = insert_ob_in_ob (tmp, sack); 639 tmp2 = insert_ob_in_ob (tmp, sack);
638 fix_player (op); /* This is overkill, fix_player() is called somewhere */ 640 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
639 /* in object.c */ 641 /* in object.c */
640 642
641 /* If an object merged (and thus, different object), we need to 643 /* If an object merged (and thus, different object), we need to
642 * delete the original. 644 * delete the original.
643 */ 645 */
… …
667 669
668 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 670 if (QUERY_FLAG (tmp, FLAG_APPLIED))
669 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 671 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
670 return; /* can't unapply it */ 672 return; /* can't unapply it */
671 673
674 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
675
672 /* We are only dropping some of the items. We split the current object 676 /* We are only dropping some of the items. We split the current object
673 * off 677 * off
674 */ 678 */
675 if (nrof && tmp->nrof != nrof) 679 if (nrof && tmp->nrof != nrof)
676 { 680 {
… …
702 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 706 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
703 { 707 {
704 sprintf (buf, "You drop the %s.", query_name (tmp)); 708 sprintf (buf, "You drop the %s.", query_name (tmp));
705 new_draw_info (NDI_UNIQUE, 0, op, buf); 709 new_draw_info (NDI_UNIQUE, 0, op, buf);
706 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it."); 710 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
711
707 if (op->type == PLAYER) 712 if (op->type == PLAYER)
708 esrv_del_item (op->contr, tmp->count); 713 esrv_del_item (op->contr, tmp->count);
714
709 tmp->destroy (); 715 tmp->destroy ();
710 fix_player (op); 716 op->update_stats ();
711 return; 717 return;
712 } 718 }
713
714/* If SAVE_INTERVAL is commented out, we never want to save
715 * the player here.
716 */
717#ifdef SAVE_INTERVAL
718 /* I'm not sure why there is a value check - since the save
719 * is done every SAVE_INTERVAL seconds, why care the value
720 * of what he is dropping?
721 */
722 if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) &&
723 (tmp->nrof ? tmp->value * tmp->nrof : tmp->value > 2000) && (op->contr->last_save_time + SAVE_INTERVAL) <= time (NULL))
724 {
725 save_player (op, 1);
726 op->contr->last_save_time = time (NULL);
727 }
728#endif /* SAVE_INTERVAL */
729 719
730 if (op->type == PLAYER) 720 if (op->type == PLAYER)
731 esrv_del_item (op->contr, tmp->count); 721 esrv_del_item (op->contr, tmp->count);
732 722
733 /* Call this before we update the various windows/players. At least 723 /* Call this before we update the various windows/players. At least
734 * that we, we know the weight is correct. 724 * that we, we know the weight is correct.
735 */ 725 */
736 fix_player (op); /* This is overkill, fix_player() is called somewhere */ 726 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
737 /* in object.c */ 727 /* in object.c */
738 728
739 if (op->type == PLAYER) 729 if (op->type == PLAYER)
740 { 730 {
741 op->contr->socket.update_look = 1;
742 /* Need to update the weight for the player */ 731 /* Need to update the weight for the player */
743 esrv_send_item (op, op); 732 esrv_send_item (op, op);
733 op->contr->ns->floorbox_update ();
744 } 734 }
745 735
746 for (floor = get_map_ob (op->map, op->x, op->y); floor; floor = floor->above) 736 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
747 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) 737 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
748 return; 738 return;
749 739
750 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) 740 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
751 sell_item (tmp, op); 741 sell_item (tmp, op);
… …
800 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 790 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
801#endif 791#endif
802 return; 792 return;
803 } 793 }
804 794
805 if (op->type == PLAYER) 795 if (op->type == PLAYER && op->contr->last_used == tmp)
806 { 796 op->contr->last_used = tmp->below ? tmp->below
807 if (op->contr->last_used == tmp && op->contr->last_used_id == tmp->count) 797 : tmp->above ? tmp->above
808 { 798 : 0;
809 object *n = NULL;
810
811 if (tmp->below != NULL)
812 n = tmp->below;
813 else if (tmp->above != NULL)
814 n = tmp->above;
815 op->contr->last_used = n;
816 if (n != NULL)
817 op->contr->last_used_id = n->count;
818 else
819 op->contr->last_used_id = 0;
820 }
821 };
822 799
823 if (op->container) 800 if (op->container)
824 { 801 {
825 if (op->type == PLAYER) 802 if (op->type == PLAYER)
826 {
827 put_object_in_sack (op, op->container, tmp, op->contr->count); 803 put_object_in_sack (op, op->container, tmp, op->contr->count);
828 }
829 else 804 else
830 {
831 put_object_in_sack (op, op->container, tmp, 0); 805 put_object_in_sack (op, op->container, tmp, 0);
832 };
833 } 806 }
834 else 807 else
835 { 808 {
836 if (op->type == PLAYER) 809 if (op->type == PLAYER)
837 {
838 drop_object (op, tmp, op->contr->count); 810 drop_object (op, tmp, op->contr->count);
839 }
840 else 811 else
841 {
842 drop_object (op, tmp, 0); 812 drop_object (op, tmp, 0);
843 };
844 } 813 }
814
845 if (op->type == PLAYER) 815 if (op->type == PLAYER)
846 op->contr->count = 0; 816 op->contr->count = 0;
847} 817}
848 818
849 819
… …
957 } 927 }
958 } 928 }
959 curinv = nextinv; 929 curinv = nextinv;
960 } 930 }
961 } 931 }
962 op->contr->socket.update_look = 1; 932
933 op->contr->ns->floorbox_update ();
963 934
964/* draw_look(op);*/ 935/* draw_look(op);*/
965 return 0; 936 return 0;
966} 937}
967 938
… …
997 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 968 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
998 } 969 }
999 if (op->type == PLAYER) 970 if (op->type == PLAYER)
1000 { 971 {
1001 op->contr->count = 0; 972 op->contr->count = 0;
1002 op->contr->socket.update_look = 1; 973 op->contr->ns->floorbox_update ();
1003 }; 974 };
1004 975
1005/* draw_look(op);*/ 976/* draw_look(op);*/
1006 return 0; 977 return 0;
1007} 978}
… …
1011{ 982{
1012 if (!params) 983 if (!params)
1013 { 984 {
1014 object *tmp = op->below; 985 object *tmp = op->below;
1015 986
1016 while (tmp && !LOOK_OBJ (tmp)) 987 while (tmp && !tmp->client_visible ())
1017 tmp = tmp->below; 988 tmp = tmp->below;
1018 if (tmp) 989 if (tmp)
1019 examine (op, tmp); 990 examine (op, tmp);
1020 } 991 }
1021 else 992 else
… …
1073 } 1044 }
1074 1045
1075 return 0; 1046 return 0;
1076} 1047}
1077 1048
1078 1049std::string
1079/* op should be a player, params is any params. 1050object::describe_monster (object *who)
1080 * If no params given, we print out the currently marked object.
1081 * otherwise, try to find a matching object - try best match first.
1082 */
1083int
1084command_mark (object *op, char *params)
1085{ 1051{
1086 if (!op->contr) 1052 dynbuf_text buf (512, 512);
1087 return 1;
1088 1053
1089 if (!params) 1054 object *mon = head ? head : this;
1090 {
1091 object *mark = find_marked_object (op);
1092 1055
1093 if (!mark) 1056 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1094 new_draw_info (NDI_UNIQUE, 0, op, "You have no marked object."); 1057 buf << "It is an undead force.\n";
1095 else 1058
1096 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is marked.", query_name (mark)); 1059 if (mon->level > who->level)
1097 } 1060 buf << "It is likely more powerful than you.\n";
1061 else if (mon->level < who->level)
1062 buf << "It is likely less powerful than you.\n";
1098 else 1063 else
1099 { 1064 buf << "It is probably as powerful as you.\n";
1100 object *mark1 = find_best_object_match (op, params);
1101 1065
1102 if (!mark1)
1103 {
1104 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params);
1105 return 1;
1106 }
1107 else
1108 {
1109 op->contr->mark = mark1;
1110 new_draw_info_format (NDI_UNIQUE, 0, op, "Marked item %s", query_name (mark1));
1111 return 0;
1112 }
1113 }
1114
1115 return 0; /*shouldnt get here */
1116}
1117
1118
1119/* op is the player
1120 * tmp is the monster being examined.
1121 */
1122void
1123examine_monster (object *op, object *tmp)
1124{
1125 object *mon = tmp->head ? tmp->head : tmp;
1126
1127 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1128 new_draw_info (NDI_UNIQUE, 0, op, "It is an undead force.");
1129 if (mon->level > op->level)
1130 new_draw_info (NDI_UNIQUE, 0, op, "It is likely more powerful than you.");
1131 else if (mon->level < op->level)
1132 new_draw_info (NDI_UNIQUE, 0, op, "It is likely less powerful than you.");
1133 else
1134 new_draw_info (NDI_UNIQUE, 0, op, "It is probably as powerful as you.");
1135 if (mon->attacktype & AT_ACID) 1066 if (mon->attacktype & AT_ACID)
1136 new_draw_info (NDI_UNIQUE, 0, op, "You seem to smell an acrid odor."); 1067 buf << "You seem to smell an acrid odor.\n";
1137 1068
1138 /* Anyone know why this used to use the clone value instead of the 1069 /* Anyone know why this used to use the clone value instead of the
1139 * maxhp field? This seems that it should give more accurate results. 1070 * maxhp field? This seems that it should give more accurate results.
1140 */ 1071 */
1141 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 1072 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1142 { /* From 1-4 */ 1073 { /* From 1-4 */
1143 case 1: 1074 case 1:
1144 new_draw_info (NDI_UNIQUE, 0, op, "It is in a bad shape."); 1075 buf << "It is in a bad shape.\n";
1145 break; 1076 break;
1146 case 2: 1077 case 2:
1147 new_draw_info (NDI_UNIQUE, 0, op, "It is hurt."); 1078 buf << "It is hurt.\n";
1148 break; 1079 break;
1149 case 3: 1080 case 3:
1150 new_draw_info (NDI_UNIQUE, 0, op, "It is somewhat hurt."); 1081 buf << "It is somewhat hurt.\n";
1151 break; 1082 break;
1152 case 4: 1083 case 4:
1153 new_draw_info (NDI_UNIQUE, 0, op, "It is in excellent shape."); 1084 buf << "It is in excellent shape.\n";
1154 break; 1085 break;
1155 } 1086 }
1087
1156 if (present_in_ob (POISONING, mon) != NULL) 1088 if (present_in_ob (POISONING, mon))
1157 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill."); 1089 buf << "It looks very ill.\n";
1158}
1159 1090
1091 return buf;
1092}
1160 1093
1161/* tmp is the object being described, pl is who is examing it. */ 1094/* tmp is the object being described, pl is who is examing it. */
1162char * 1095const char *
1163long_desc (object *tmp, object *pl) 1096long_desc (object *tmp, object *pl)
1164{ 1097{
1165 static char buf[VERY_BIG_BUF]; 1098 static std::string s;
1166 char *cp;
1167 1099
1168 if (tmp == NULL) 1100 return (s = tmp->long_desc (pl)).c_str ();
1169 return ""; 1101}
1170 1102
1171 buf[0] = '\0'; 1103std::string
1104object::long_desc (object *who)
1105{
1106 std::string buf (query_name (this));
1107
1172 switch (tmp->type) 1108 switch (type)
1173 { 1109 {
1174 case RING: 1110 case RING:
1175 case SKILL: 1111 case SKILL:
1176 case WEAPON: 1112 case WEAPON:
1177 case ARMOUR: 1113 case ARMOUR:
… …
1188 case FOOD: 1124 case FOOD:
1189 case DRINK: 1125 case DRINK:
1190 case FLESH: 1126 case FLESH:
1191 case SKILL_TOOL: 1127 case SKILL_TOOL:
1192 case POWER_CRYSTAL: 1128 case POWER_CRYSTAL:
1193 if (*(cp = describe_item (tmp, pl)) != '\0') 1129 {
1130 const char *cp = ::describe_item (this, who);
1131
1132 if (*cp)
1133 {
1134 buf.append (" ");
1135 buf.append (cp);
1136 }
1137 }
1138 }
1139
1140 return buf;
1141}
1142
1143/* op is the player
1144 * tmp is the monster being examined.
1145 */
1146void
1147examine_monster (object *op, object *tmp)
1148{
1149 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1150}
1151
1152std::string
1153object::describe (object *who)
1154{
1155 dynbuf_text buf (1024, 1024);
1156
1157 buf.printf ("That is: %s.\n", long_desc (who).c_str ());
1158
1159 if (custom_name)
1160 buf,printf ("You call it %s\n", &custom_name);
1161
1162 switch (type)
1163 {
1164 case SPELLBOOK:
1165 if (flag [FLAG_IDENTIFIED] && inv)
1166 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1167 break;
1168
1169 case BOOK:
1170 if (msg)
1171 buf << "Something is written in it.\n";
1172 break;
1173
1174 case CONTAINER:
1175 if (race != NULL)
1194 { 1176 {
1177 if (weight_limit && stats.Str < 100)
1178 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1179 &race, weight_limit / (10.0 * (100 - stats.Str)));
1195 int len; 1180 else
1196 1181 buf.printf ("It can hold only %s.\n", &race);
1197 assign (buf, query_name (tmp));
1198 len = strlen (buf);
1199 if (len < VERY_BIG_BUF - 5)
1200 {
1201 /* Since we know the length, we save a few cpu cycles by using
1202 * it instead of calling strcat */
1203 strcpy (buf + len, " ");
1204 len++;
1205 assign (buf + len, cp, VERY_BIG_BUF - len - 1);
1206 }
1207 } 1182 }
1208 } 1183 else if (weight_limit && stats.Str < 100)
1209 1184 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1210 if (buf[0] == '\0')
1211 assign (buf, query_name (tmp));
1212
1213 return buf;
1214}
1215
1216void
1217examine (object *op, object *tmp)
1218{
1219 char buf[VERY_BIG_BUF];
1220 int i;
1221
1222 if (tmp == NULL || tmp->type == CLOSE_CON)
1223 return;
1224
1225 strcpy (buf, "That is ");
1226 strncat (buf, long_desc (tmp, op), VERY_BIG_BUF - strlen (buf) - 1);
1227 buf[VERY_BIG_BUF - 1] = 0;
1228
1229 new_draw_info (NDI_UNIQUE, 0, op, buf);
1230 buf[0] = '\0';
1231
1232 if (tmp->custom_name)
1233 {
1234 strcpy (buf, "You call it ");
1235 strncat (buf, tmp->custom_name, VERY_BIG_BUF - strlen (buf) - 1);
1236 buf[VERY_BIG_BUF - 1] = 0;
1237 new_draw_info (NDI_UNIQUE, 0, op, buf);
1238 buf[0] = '\0';
1239 }
1240
1241 switch (tmp->type)
1242 {
1243 case SPELLBOOK:
1244 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) && tmp->inv)
1245 {
1246 sprintf (buf, "%s is a %s level %s spell", &tmp->inv->name, get_levelnumber (tmp->inv->level), &tmp->inv->skill);
1247 }
1248 break; 1185 break;
1249 1186
1250 case BOOK: 1187 case WAND:
1251 if (tmp->msg != NULL) 1188 if (flag [FLAG_IDENTIFIED])
1252 strcpy (buf, "Something is written in it."); 1189 buf.printf ("It has %d charges left.\n", stats.food);
1253 break; 1190 break;
1254
1255 case CONTAINER:
1256 if (tmp->race != NULL)
1257 {
1258 if (tmp->weight_limit && tmp->stats.Str < 100)
1259 sprintf (buf, "It can hold only %s and its weight limit is %.1f kg.",
1260 &tmp->race, tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1261 else
1262 sprintf (buf, "It can hold only %s.", &tmp->race);
1263 }
1264 else if (tmp->weight_limit && tmp->stats.Str < 100)
1265 sprintf (buf, "Its weight limit is %.1f kg.", tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1266 break;
1267
1268 case WAND:
1269 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1270 sprintf (buf, "It has %d charges left.", tmp->stats.food);
1271 break;
1272 }
1273
1274 if (buf[0] != '\0')
1275 new_draw_info (NDI_UNIQUE, 0, op, buf);
1276
1277 if (tmp->materialname != NULL && !tmp->msg)
1278 { 1191 }
1192
1193 if (materialname && !msg)
1279 sprintf (buf, "It is made of: %s.", &tmp->materialname); 1194 buf.printf ("It is made of: %s.\n", &materialname);
1280 new_draw_info (NDI_UNIQUE, 0, op, buf); 1195
1281 } 1196 if (who)
1282 /* Where to wear this item */ 1197 /* Where to wear this item */
1283 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1198 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1284 { 1199 if (slot[i].info)
1285 if (tmp->body_info[i] < -1) 1200 {
1201 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1202
1203 if (slot[i].info < -1 && who->slot[i].info)
1204 buf.printf ("(%d)", -slot[i].info);
1205
1206 buf << ".\n";
1286 { 1207 }
1287 if (op->body_info[i]) 1208
1288 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]); 1209 if (weight)
1210 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1211
1212 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1213 {
1214 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1215
1216 if (is_in_shop (who))
1217 {
1218 if (flag [FLAG_UNPAID])
1219 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1289 else 1220 else
1290 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1291 }
1292 else if (tmp->body_info[i])
1293 {
1294 if (op->body_info[i])
1295 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].use_name);
1296 else
1297 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1298 }
1299 }
1300
1301 if (tmp->weight)
1302 {
1303 sprintf (buf, tmp->nrof > 1 ? "They weigh %3.3f kg." : "It weighs %3.3f kg.", tmp->weight * (tmp->nrof ? tmp->nrof : 1) / 1000.0);
1304 new_draw_info (NDI_UNIQUE, 0, op, buf);
1305 }
1306
1307 if (tmp->value && !QUERY_FLAG (tmp, FLAG_STARTEQUIP) && !QUERY_FLAG (tmp, FLAG_NO_PICK))
1308 {
1309 sprintf (buf, "You reckon %s worth %s.", tmp->nrof > 1 ? "they are" : "it is", query_cost_string (tmp, op, F_TRUE | F_APPROX));
1310 new_draw_info (NDI_UNIQUE, 0, op, buf);
1311 if (is_in_shop (op))
1312 {
1313 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1314 sprintf (buf, "%s would cost you %s.", tmp->nrof > 1 ? "They" : "It", query_cost_string (tmp, op, F_BUY | F_SHOP));
1315 else
1316 sprintf (buf, "You are offered %s for %s.", query_cost_string (tmp, op, F_SELL + F_SHOP), tmp->nrof > 1 ? "them" : "it"); 1221 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1317 new_draw_info (NDI_UNIQUE, 0, op, buf);
1318 } 1222 }
1319 } 1223 }
1320 1224
1321 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1225 if (flag [FLAG_MONSTER])
1322 examine_monster (op, tmp); 1226 buf << describe_monster (who);
1323 1227
1324 /* Is this item buildable? */ 1228 /* Is this item buildable? */
1325 if (QUERY_FLAG (tmp, FLAG_IS_BUILDABLE)) 1229 if (flag [FLAG_IS_BUILDABLE])
1326 new_draw_info (NDI_UNIQUE, 0, op, "This is a buildable item."); 1230 buf << "This is a buildable item.\n";
1327 1231
1328 /* Does the object have a message? Don't show message for all object 1232 /* Does the object have a message? Don't show message for all object
1329 * types - especially if the first entry is a match 1233 * types - especially if the first entry is a match
1330 */ 1234 */
1331 if (tmp->msg && tmp->type != EXIT && tmp->type != BOOK && tmp->type != CORPSE && !tmp->move_on && strncasecmp (tmp->msg, "@match", 7)) 1235 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && strncasecmp (msg, "@match", 7))
1332 { 1236 {
1333
1334 /* This is just a hack so when identifying the items, we print 1237 /* This is just a hack so when identifying the items, we print
1335 * out the extra message 1238 * out the extra message
1336 */ 1239 */
1337 if (need_identify (tmp) && QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1240 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1338 new_draw_info (NDI_UNIQUE, 0, op, "The object has a story:"); 1241 buf << "The object has a story:\n";
1339 1242
1243 buf << msg << '\n';
1244 }
1245
1246 buf << '\n';
1247
1248 return std::string (buf.linearise (), buf.size ());
1249}
1250
1251void
1252examine (object *op, object *tmp)
1253{
1254 std::string s = tmp->describe (op);
1255
1340 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1256 new_draw_info (NDI_UNIQUE, 0, op, s.c_str ());
1341 }
1342 new_draw_info (NDI_UNIQUE, 0, op, " "); /* Blank line */
1343} 1257}
1344 1258
1345/* 1259/*
1346 * inventory prints object's inventory. If inv==NULL then print player's 1260 * inventory prints object's inventory. If inv==NULL then print player's
1347 * inventory. 1261 * inventory.
… …
1349 */ 1263 */
1350void 1264void
1351inventory (object *op, object *inv) 1265inventory (object *op, object *inv)
1352{ 1266{
1353 object *tmp; 1267 object *tmp;
1354 char *in; 1268 const char *in;
1355 int items = 0, length; 1269 int items = 0, length;
1356 1270
1357 if (inv == NULL && op == NULL) 1271 if (inv == NULL && op == NULL)
1358 { 1272 {
1359 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?"); 1273 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1360 return; 1274 return;
1361 } 1275 }
1276
1362 tmp = inv ? inv->inv : op->inv; 1277 tmp = inv ? inv->inv : op->inv;
1363 1278
1364 while (tmp) 1279 while (tmp)
1365 { 1280 {
1366 if ((!tmp->invisible && 1281 if ((!tmp->invisible &&
1367 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ))) 1282 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1368 items++; 1283 items++;
1369 tmp = tmp->below; 1284 tmp = tmp->below;
1370 } 1285 }
1286
1371 if (inv == NULL) 1287 if (inv == NULL)
1372 { /* player's inventory */ 1288 { /* player's inventory */
1373 if (items == 0) 1289 if (items == 0)
1374 { 1290 {
1375 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing."); 1291 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
… …
1392 { 1308 {
1393 length = 28; 1309 length = 28;
1394 in = " "; 1310 in = " ";
1395 } 1311 }
1396 } 1312 }
1313
1397 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below) 1314 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1398 { 1315 {
1399 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED)))) 1316 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1400 continue; 1317 continue;
1401 if ((!op || QUERY_FLAG (op, FLAG_WIZ))) 1318 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1402 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length, 1319 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1403 query_name (tmp), tmp->count, query_weight (tmp)); 1320 query_name (tmp), tmp->count, query_weight (tmp));
1404 else 1321 else
1405 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp)); 1322 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1406 } 1323 }
1324
1407 if (!inv && op) 1325 if (!inv && op)
1408 {
1409 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op)); 1326 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1410 }
1411} 1327}
1412 1328
1413static void 1329static void
1414display_new_pickup (object *op) 1330display_new_pickup (object *op)
1415{ 1331{
… …
1576 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1492 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");
1577 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all"); 1493 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1578 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'."); 1494 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1579 return 1; 1495 return 1;
1580 } 1496 }
1497
1581 op->contr->search_str[0] = '\0'; 1498 op->contr->search_str[0] = '\0';
1582 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1499 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1583 fix_player (op); 1500 op->update_stats ();
1584 return 1; 1501 return 1;
1585 } 1502 }
1503
1586 if ((int) strlen (params) >= MAX_BUF) 1504 if ((int) strlen (params) >= MAX_BUF)
1587 { 1505 {
1588 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1506 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1589 return 1; 1507 return 1;
1590 } 1508 }
1509
1591 strcpy (op->contr->search_str, params); 1510 strcpy (op->contr->search_str, params);
1592 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1511 sprintf (buf, "Searching for '%s'.", op->contr->search_str);
1593 new_draw_info (NDI_UNIQUE, 0, op, buf); 1512 new_draw_info (NDI_UNIQUE, 0, op, buf);
1594 fix_player (op); 1513 op->update_stats ();
1595 return 1; 1514 return 1;
1596} 1515}
1597 1516

Diff Legend

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