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

Diff Legend

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