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.31 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.46 by root, Tue Apr 24 16:30: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
… …
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/*
… …
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 {
… …
710 711
711 tmp->destroy (); 712 tmp->destroy ();
712 op->update_stats (); 713 op->update_stats ();
713 return; 714 return;
714 } 715 }
715
716/* If SAVE_INTERVAL is commented out, we never want to save
717 * the player here.
718 */
719#ifdef SAVE_INTERVAL
720 /* I'm not sure why there is a value check - since the save
721 * is done every SAVE_INTERVAL seconds, why care the value
722 * of what he is dropping?
723 */
724 if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) &&
725 (tmp->nrof ? tmp->value * tmp->nrof : tmp->value > 2000) && (op->contr->last_save_time + SAVE_INTERVAL) <= time (NULL))
726 {
727 op->contr->save ();
728 op->contr->last_save_time = time (NULL);
729 }
730#endif /* SAVE_INTERVAL */
731 716
732 if (op->type == PLAYER) 717 if (op->type == PLAYER)
733 esrv_del_item (op->contr, tmp->count); 718 esrv_del_item (op->contr, tmp->count);
734 719
735 /* Call this before we update the various windows/players. At least 720 /* Call this before we update the various windows/players. At least
… …
994{ 979{
995 if (!params) 980 if (!params)
996 { 981 {
997 object *tmp = op->below; 982 object *tmp = op->below;
998 983
999 while (tmp && !LOOK_OBJ (tmp)) 984 while (tmp && !tmp->client_visible ())
1000 tmp = tmp->below; 985 tmp = tmp->below;
1001 if (tmp) 986 if (tmp)
1002 examine (op, tmp); 987 examine (op, tmp);
1003 } 988 }
1004 else 989 else
… …
1056 } 1041 }
1057 1042
1058 return 0; 1043 return 0;
1059} 1044}
1060 1045
1061 1046std::string
1062/* op should be a player, params is any params. 1047object::describe_monster (object *who)
1063 * If no params given, we print out the currently marked object.
1064 * otherwise, try to find a matching object - try best match first.
1065 */
1066int
1067command_mark (object *op, char *params)
1068{ 1048{
1069 if (!op->contr) 1049 dynbuf_text buf (512, 512);
1070 return 1;
1071 1050
1072 if (!params) 1051 object *mon = head ? head : this;
1073 {
1074 object *mark = find_marked_object (op);
1075 1052
1076 if (!mark) 1053 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1077 new_draw_info (NDI_UNIQUE, 0, op, "You have no marked object."); 1054 buf << "It is an undead force.\n";
1078 else 1055
1079 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is marked.", query_name (mark)); 1056 if (mon->level > who->level)
1080 } 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";
1081 else 1060 else
1082 { 1061 buf << "It is probably as powerful as you.\n";
1083 object *mark1 = find_best_object_match (op, params);
1084 1062
1085 if (!mark1)
1086 {
1087 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params);
1088 return 1;
1089 }
1090 else
1091 {
1092 op->contr->mark = mark1;
1093 new_draw_info_format (NDI_UNIQUE, 0, op, "Marked item %s", query_name (mark1));
1094 return 0;
1095 }
1096 }
1097
1098 return 0; /*shouldnt get here */
1099}
1100
1101
1102/* op is the player
1103 * tmp is the monster being examined.
1104 */
1105void
1106examine_monster (object *op, object *tmp)
1107{
1108 object *mon = tmp->head ? tmp->head : tmp;
1109
1110 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1111 new_draw_info (NDI_UNIQUE, 0, op, "It is an undead force.");
1112 if (mon->level > op->level)
1113 new_draw_info (NDI_UNIQUE, 0, op, "It is likely more powerful than you.");
1114 else if (mon->level < op->level)
1115 new_draw_info (NDI_UNIQUE, 0, op, "It is likely less powerful than you.");
1116 else
1117 new_draw_info (NDI_UNIQUE, 0, op, "It is probably as powerful as you.");
1118 if (mon->attacktype & AT_ACID) 1063 if (mon->attacktype & AT_ACID)
1119 new_draw_info (NDI_UNIQUE, 0, op, "You seem to smell an acrid odor."); 1064 buf << "You seem to smell an acrid odor.\n";
1120 1065
1121 /* 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
1122 * maxhp field? This seems that it should give more accurate results. 1067 * maxhp field? This seems that it should give more accurate results.
1123 */ 1068 */
1124 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 1069 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1125 { /* From 1-4 */ 1070 { /* From 1-4 */
1126 case 1: 1071 case 1:
1127 new_draw_info (NDI_UNIQUE, 0, op, "It is in a bad shape."); 1072 buf << "It is in a bad shape.\n";
1128 break; 1073 break;
1129 case 2: 1074 case 2:
1130 new_draw_info (NDI_UNIQUE, 0, op, "It is hurt."); 1075 buf << "It is hurt.\n";
1131 break; 1076 break;
1132 case 3: 1077 case 3:
1133 new_draw_info (NDI_UNIQUE, 0, op, "It is somewhat hurt."); 1078 buf << "It is somewhat hurt.\n";
1134 break; 1079 break;
1135 case 4: 1080 case 4:
1136 new_draw_info (NDI_UNIQUE, 0, op, "It is in excellent shape."); 1081 buf << "It is in excellent shape.\n";
1137 break; 1082 break;
1138 } 1083 }
1084
1139 if (present_in_ob (POISONING, mon) != NULL) 1085 if (present_in_ob (POISONING, mon))
1140 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill."); 1086 buf << "It looks very ill.\n";
1141}
1142 1087
1088 return buf;
1089}
1143 1090
1144/* 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. */
1145char * 1092const char *
1146long_desc (object *tmp, object *pl) 1093long_desc (object *tmp, object *pl)
1147{ 1094{
1148 static char buf[VERY_BIG_BUF]; 1095 static std::string s;
1149 char *cp;
1150 1096
1151 if (tmp == NULL) 1097 return (s = tmp->long_desc (pl)).c_str ();
1152 return ""; 1098}
1153 1099
1154 buf[0] = '\0'; 1100std::string
1101object::long_desc (object *who)
1102{
1103 std::string buf (query_name (this));
1104
1155 switch (tmp->type) 1105 switch (type)
1156 { 1106 {
1157 case RING: 1107 case RING:
1158 case SKILL: 1108 case SKILL:
1159 case WEAPON: 1109 case WEAPON:
1160 case ARMOUR: 1110 case ARMOUR:
… …
1171 case FOOD: 1121 case FOOD:
1172 case DRINK: 1122 case DRINK:
1173 case FLESH: 1123 case FLESH:
1174 case SKILL_TOOL: 1124 case SKILL_TOOL:
1175 case POWER_CRYSTAL: 1125 case POWER_CRYSTAL:
1176 if (*(cp = describe_item (tmp, pl)) != '\0') 1126 {
1127 const char *cp = ::describe_item (this, who);
1128
1129 if (*cp)
1130 {
1131 buf.append (" ");
1132 buf.append (cp);
1133 }
1134 }
1135 }
1136
1137 return buf;
1138}
1139
1140/* op is the player
1141 * tmp is the monster being examined.
1142 */
1143void
1144examine_monster (object *op, object *tmp)
1145{
1146 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1147}
1148
1149std::string
1150object::describe (object *who)
1151{
1152 dynbuf_text buf (1024, 1024);
1153
1154 buf.printf ("That is: %s.\n", long_desc (who).c_str ());
1155
1156 if (custom_name)
1157 buf,printf ("You call it %s\n", &custom_name);
1158
1159 switch (type)
1160 {
1161 case SPELLBOOK:
1162 if (flag [FLAG_IDENTIFIED] && inv)
1163 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1164 break;
1165
1166 case BOOK:
1167 if (msg)
1168 buf << "Something is written in it.\n";
1169 break;
1170
1171 case CONTAINER:
1172 if (race != NULL)
1177 { 1173 {
1174 if (weight_limit && stats.Str < 100)
1175 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1176 &race, weight_limit / (10.0 * (100 - stats.Str)));
1178 int len; 1177 else
1179 1178 buf.printf ("It can hold only %s.\n", &race);
1180 assign (buf, query_name (tmp));
1181 len = strlen (buf);
1182 if (len < VERY_BIG_BUF - 5)
1183 {
1184 /* Since we know the length, we save a few cpu cycles by using
1185 * it instead of calling strcat */
1186 strcpy (buf + len, " ");
1187 len++;
1188 assign (buf + len, cp, VERY_BIG_BUF - len - 1);
1189 }
1190 } 1179 }
1191 } 1180 else if (weight_limit && stats.Str < 100)
1192 1181 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1193 if (buf[0] == '\0')
1194 assign (buf, query_name (tmp));
1195
1196 return buf;
1197}
1198
1199void
1200examine (object *op, object *tmp)
1201{
1202 char buf[VERY_BIG_BUF];
1203 int i;
1204
1205 if (tmp == NULL || tmp->type == CLOSE_CON)
1206 return;
1207
1208 strcpy (buf, "That is ");
1209 strncat (buf, long_desc (tmp, op), VERY_BIG_BUF - strlen (buf) - 1);
1210 buf[VERY_BIG_BUF - 1] = 0;
1211
1212 new_draw_info (NDI_UNIQUE, 0, op, buf);
1213 buf[0] = '\0';
1214
1215 if (tmp->custom_name)
1216 {
1217 strcpy (buf, "You call it ");
1218 strncat (buf, tmp->custom_name, VERY_BIG_BUF - strlen (buf) - 1);
1219 buf[VERY_BIG_BUF - 1] = 0;
1220 new_draw_info (NDI_UNIQUE, 0, op, buf);
1221 buf[0] = '\0';
1222 }
1223
1224 switch (tmp->type)
1225 {
1226 case SPELLBOOK:
1227 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) && tmp->inv)
1228 {
1229 sprintf (buf, "%s is a %s level %s spell", &tmp->inv->name, get_levelnumber (tmp->inv->level), &tmp->inv->skill);
1230 }
1231 break; 1182 break;
1232 1183
1233 case BOOK: 1184 case WAND:
1234 if (tmp->msg != NULL) 1185 if (flag [FLAG_IDENTIFIED])
1235 strcpy (buf, "Something is written in it."); 1186 buf.printf ("It has %d charges left.\n", stats.food);
1236 break; 1187 break;
1237
1238 case CONTAINER:
1239 if (tmp->race != NULL)
1240 {
1241 if (tmp->weight_limit && tmp->stats.Str < 100)
1242 sprintf (buf, "It can hold only %s and its weight limit is %.1f kg.",
1243 &tmp->race, tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1244 else
1245 sprintf (buf, "It can hold only %s.", &tmp->race);
1246 }
1247 else if (tmp->weight_limit && tmp->stats.Str < 100)
1248 sprintf (buf, "Its weight limit is %.1f kg.", tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1249 break;
1250
1251 case WAND:
1252 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1253 sprintf (buf, "It has %d charges left.", tmp->stats.food);
1254 break;
1255 }
1256
1257 if (buf[0] != '\0')
1258 new_draw_info (NDI_UNIQUE, 0, op, buf);
1259
1260 if (tmp->materialname != NULL && !tmp->msg)
1261 { 1188 }
1189
1190 if (materialname && !msg)
1262 sprintf (buf, "It is made of: %s.", &tmp->materialname); 1191 buf.printf ("It is made of: %s.\n", &materialname);
1263 new_draw_info (NDI_UNIQUE, 0, op, buf); 1192
1264 } 1193 if (who)
1265 /* Where to wear this item */ 1194 /* Where to wear this item */
1266 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1195 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1267 {
1268 if (tmp->body_info[i] < -1) 1196 if (body_info [i])
1197 {
1198 buf << "It goes ";
1199 buf << (who->body_info[i] ? body_locations[i].use_name : body_locations[i].nonuse_name);
1200
1201 if (body_info[i] < -1 && who->body_info[i])
1202 buf.printf ("(%d)", -body_info[i]);
1203
1204 buf << ".\n";
1269 { 1205 }
1270 if (op->body_info[i]) 1206
1271 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]); 1207 if (weight)
1208 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1209
1210 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1211 {
1212 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1213
1214 if (is_in_shop (who))
1215 {
1216 if (flag [FLAG_UNPAID])
1217 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1272 else 1218 else
1273 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1274 }
1275 else if (tmp->body_info[i])
1276 {
1277 if (op->body_info[i])
1278 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].use_name);
1279 else
1280 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1281 }
1282 }
1283
1284 if (tmp->weight)
1285 {
1286 sprintf (buf, tmp->nrof > 1 ? "They weigh %3.3f kg." : "It weighs %3.3f kg.", tmp->weight * (tmp->nrof ? tmp->nrof : 1) / 1000.0);
1287 new_draw_info (NDI_UNIQUE, 0, op, buf);
1288 }
1289
1290 if (tmp->value && !QUERY_FLAG (tmp, FLAG_STARTEQUIP) && !QUERY_FLAG (tmp, FLAG_NO_PICK))
1291 {
1292 sprintf (buf, "You reckon %s worth %s.", tmp->nrof > 1 ? "they are" : "it is", query_cost_string (tmp, op, F_TRUE | F_APPROX));
1293 new_draw_info (NDI_UNIQUE, 0, op, buf);
1294 if (is_in_shop (op))
1295 {
1296 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1297 sprintf (buf, "%s would cost you %s.", tmp->nrof > 1 ? "They" : "It", query_cost_string (tmp, op, F_BUY | F_SHOP));
1298 else
1299 sprintf (buf, "You are offered %s for %s.", query_cost_string (tmp, op, F_SELL + F_SHOP), tmp->nrof > 1 ? "them" : "it"); 1219 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1300 new_draw_info (NDI_UNIQUE, 0, op, buf);
1301 } 1220 }
1302 } 1221 }
1303 1222
1304 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1223 if (flag [FLAG_MONSTER])
1305 examine_monster (op, tmp); 1224 buf << describe_monster (who);
1306 1225
1307 /* Is this item buildable? */ 1226 /* Is this item buildable? */
1308 if (QUERY_FLAG (tmp, FLAG_IS_BUILDABLE)) 1227 if (flag [FLAG_IS_BUILDABLE])
1309 new_draw_info (NDI_UNIQUE, 0, op, "This is a buildable item."); 1228 buf << "This is a buildable item.\n";
1310 1229
1311 /* Does the object have a message? Don't show message for all object 1230 /* Does the object have a message? Don't show message for all object
1312 * types - especially if the first entry is a match 1231 * types - especially if the first entry is a match
1313 */ 1232 */
1314 if (tmp->msg && tmp->type != EXIT && tmp->type != BOOK && tmp->type != CORPSE && !tmp->move_on && strncasecmp (tmp->msg, "@match", 7)) 1233 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && strncasecmp (msg, "@match", 7))
1315 { 1234 {
1316
1317 /* This is just a hack so when identifying the items, we print 1235 /* This is just a hack so when identifying the items, we print
1318 * out the extra message 1236 * out the extra message
1319 */ 1237 */
1320 if (need_identify (tmp) && QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1238 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1321 new_draw_info (NDI_UNIQUE, 0, op, "The object has a story:"); 1239 buf << "The object has a story:\n";
1322 1240
1241 buf << msg << '\n';
1242 }
1243
1244 buf << '\n';
1245
1246 return std::string (buf.linearise (), buf.size ());
1247}
1248
1249void
1250examine (object *op, object *tmp)
1251{
1252 std::string s = tmp->describe (op);
1253
1323 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1254 new_draw_info (NDI_UNIQUE, 0, op, s.c_str ());
1324 }
1325 new_draw_info (NDI_UNIQUE, 0, op, " "); /* Blank line */
1326} 1255}
1327 1256
1328/* 1257/*
1329 * inventory prints object's inventory. If inv==NULL then print player's 1258 * inventory prints object's inventory. If inv==NULL then print player's
1330 * inventory. 1259 * inventory.
… …
1332 */ 1261 */
1333void 1262void
1334inventory (object *op, object *inv) 1263inventory (object *op, object *inv)
1335{ 1264{
1336 object *tmp; 1265 object *tmp;
1337 char *in; 1266 const char *in;
1338 int items = 0, length; 1267 int items = 0, length;
1339 1268
1340 if (inv == NULL && op == NULL) 1269 if (inv == NULL && op == NULL)
1341 { 1270 {
1342 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?"); 1271 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1343 return; 1272 return;
1344 } 1273 }
1274
1345 tmp = inv ? inv->inv : op->inv; 1275 tmp = inv ? inv->inv : op->inv;
1346 1276
1347 while (tmp) 1277 while (tmp)
1348 { 1278 {
1349 if ((!tmp->invisible && 1279 if ((!tmp->invisible &&
1350 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ))) 1280 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1351 items++; 1281 items++;
1352 tmp = tmp->below; 1282 tmp = tmp->below;
1353 } 1283 }
1284
1354 if (inv == NULL) 1285 if (inv == NULL)
1355 { /* player's inventory */ 1286 { /* player's inventory */
1356 if (items == 0) 1287 if (items == 0)
1357 { 1288 {
1358 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing."); 1289 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
… …
1375 { 1306 {
1376 length = 28; 1307 length = 28;
1377 in = " "; 1308 in = " ";
1378 } 1309 }
1379 } 1310 }
1311
1380 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below) 1312 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1381 { 1313 {
1382 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED)))) 1314 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1383 continue; 1315 continue;
1384 if ((!op || QUERY_FLAG (op, FLAG_WIZ))) 1316 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1385 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length, 1317 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1386 query_name (tmp), tmp->count, query_weight (tmp)); 1318 query_name (tmp), tmp->count, query_weight (tmp));
1387 else 1319 else
1388 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp)); 1320 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1389 } 1321 }
1322
1390 if (!inv && op) 1323 if (!inv && op)
1391 {
1392 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op)); 1324 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1393 }
1394} 1325}
1395 1326
1396static void 1327static void
1397display_new_pickup (object *op) 1328display_new_pickup (object *op)
1398{ 1329{
… …
1559 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1490 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");
1560 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all"); 1491 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1561 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'."); 1492 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1562 return 1; 1493 return 1;
1563 } 1494 }
1495
1564 op->contr->search_str[0] = '\0'; 1496 op->contr->search_str[0] = '\0';
1565 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1497 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1566 op->update_stats (); 1498 op->update_stats ();
1567 return 1; 1499 return 1;
1568 } 1500 }
1501
1569 if ((int) strlen (params) >= MAX_BUF) 1502 if ((int) strlen (params) >= MAX_BUF)
1570 { 1503 {
1571 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1504 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1572 return 1; 1505 return 1;
1573 } 1506 }
1507
1574 strcpy (op->contr->search_str, params); 1508 strcpy (op->contr->search_str, params);
1575 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1509 sprintf (buf, "Searching for '%s'.", op->contr->search_str);
1576 new_draw_info (NDI_UNIQUE, 0, op, buf); 1510 new_draw_info (NDI_UNIQUE, 0, op, buf);
1577 op->update_stats (); 1511 op->update_stats ();
1578 return 1; 1512 return 1;

Diff Legend

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