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.52 by root, Sat May 12 20:21:54 2007 UTC vs.
Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 *
24 */ 22 */
25 23
26/* 24/*
27 * Object (handling) commands 25 * Object (handling) commands
28 */ 26 */
… …
90 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL); 88 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL);
91 **/ 89 **/
92object * 90object *
93find_best_object_match (object *pl, const char *params) 91find_best_object_match (object *pl, const char *params)
94{ 92{
95 return find_best_apply_object_match (pl, params, AP_NULL); 93 return find_best_apply_object_match (pl, params, AP_TOGGLE);
94}
95
96static bool
97can_split (object *pl, object *&op, sint32 nrof)
98{
99 if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
100 {
101 op = tmp;
102 return true;
103 }
104 else
105 {
106 if (op->nrof > 1)
107 new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %s.", op->nrof, &op->name_pl);
108 else
109 new_draw_info_format (NDI_UNIQUE, 0, pl, "There is only one %s.", &op->name);
110
111 return false;
112 }
96} 113}
97 114
98int 115int
99command_uskill (object *pl, char *params) 116command_uskill (object *pl, char *params)
100{ 117{
… …
124 { 141 {
125 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 142 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);
126 return 0; 143 return 0;
127 } 144 }
128 145
129 return change_skill (pl, skill, 0); 146 pl->change_skill (0);
147 apply_special (pl, skill, AP_APPLY);
148 return 1;
130} 149}
131 150
132/* These functions (command_search, command_disarm) are really just wrappers for 151/* These functions (command_search, command_disarm) are really just wrappers for
133 * things like 'use_skill ...'). In fact, they should really be obsoleted 152 * things like 'use_skill ...'). In fact, they should really be obsoleted
134 * and replaced with those. 153 * and replaced with those.
… …
208 * not need to use split_ob and stuff. 227 * not need to use split_ob and stuff.
209 */ 228 */
210int 229int
211sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 230sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
212{ 231{
213
214 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 232 if (!QUERY_FLAG (sack, FLAG_APPLIED))
215 { 233 {
216 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); 234 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
217 return 0; 235 return 0;
218 } 236 }
237
219 if (sack == op) 238 if (sack == op)
220 { 239 {
221 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack)); 240 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack));
222 return 0; 241 return 0;
223 } 242 }
243
224 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) 244 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
225 { 245 {
226 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); 246 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));
227 return 0; 247 return 0;
228 } 248 }
249
229 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 250 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
230 { 251 {
231 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); 252 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
232 return 0; 253 return 0;
233 } 254 }
255
234 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 256 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
235 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 257 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
236 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 258 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
237 { 259 {
238 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 260 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
239 return 0; 261 return 0;
240 } 262 }
263
241 /* All other checks pass, must be OK */ 264 /* All other checks pass, must be OK */
242 return 1; 265 return 1;
243} 266}
244 267
245/* Pick up commands follow */ 268/* Pick up commands follow */
… …
250 * pick up (0 means all of them) 273 * pick up (0 means all of them)
251 */ 274 */
252static void 275static void
253pick_up_object (object *pl, object *op, object *tmp, int nrof) 276pick_up_object (object *pl, object *op, object *tmp, int nrof)
254{ 277{
255 /* buf needs to be big (more than 256 chars) because you can get
256 * very long item names.
257 */
258 char buf[HUGE_BUF];
259 object *env = tmp->env; 278 object *env = tmp->env;
260 uint32 weight, effective_weight_limit; 279 uint32 weight, effective_weight_limit;
261 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 280 int tmp_nrof = tmp->number_of ();
262 281
263 /* IF the player is flying & trying to take the item out of a container 282 /* IF the player is flying & trying to take the item out of a container
264 * that is in his inventory, let him. tmp->env points to the container 283 * that is in his inventory, let him. tmp->env points to the container
265 * (sack, luggage, etc), tmp->env->env then points to the player (nested 284 * (sack, luggage, etc), tmp->env->env then points to the player (nested
266 * containers not allowed as of now) 285 * containers not allowed as of now)
267 */ 286 */
268 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 287 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
269 { 288 {
270 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); 289 pl->failmsg ("You are levitating, you can't reach the ground! "
290 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
291 "or waiting till the levitation effect wears off.>");
271 return; 292 return;
272 } 293 }
273 294
274 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 295 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
275 return; 296 return;
276 297
277 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
278 {
279 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!");
280 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
281
282 if (pl->contr)
283 esrv_del_item (pl->contr, tmp->count);
284
285 tmp->destroy ();
286 return;
287 }
288
289 if (nrof > tmp_nrof || nrof == 0) 298 if (nrof > tmp_nrof || nrof <= 0)
290 nrof = tmp_nrof; 299 nrof = tmp_nrof;
291 300
292 /* Figure out how much weight this object will add to the player */ 301 /* Figure out how much weight this object will add to the player */
293 weight = tmp->weight * nrof; 302 weight = tmp->weight * nrof;
294 if (tmp->inv) 303 if (tmp->inv)
295 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 304 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
296 305
297 if (pl->stats.Str <= MAX_STAT)
298 effective_weight_limit = weight_limit[pl->stats.Str]; 306 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
299 else
300 effective_weight_limit = weight_limit[MAX_STAT];
301 307
302 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 308 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
303 { 309 {
304 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 310 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
305 return; 311 return;
306 } 312 }
307 313
308 if (nrof != tmp_nrof) 314 if (!can_split (pl, tmp, nrof))
309 {
310 object *tmp2 = tmp;
311
312 tmp = get_split_ob (tmp, nrof);
313 if (!tmp)
314 {
315 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
316 return; 315 return;
317 }
318 316
319 /* Tell the client what happened to the rest of objects */ 317 if (QUERY_FLAG (tmp, FLAG_UNPAID))
320 if (pl->contr) 318 {
321 if (tmp2->destroyed ()) 319 tmp->flag.reset (FLAG_UNPAID);
322 esrv_del_item (pl->contr, tmp2->count); 320 new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
323 else 321 tmp->flag.set (FLAG_UNPAID);
324 esrv_update_item (UPD_NROF, pl, tmp2);
325 } 322 }
326 else 323 else
327 { 324 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
328 /* If the object is in a container, send a delete to the client.
329 * - we are moving all the items from the container to elsewhere,
330 * so it needs to be deleted.
331 */
332 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
333 {
334 if (tmp->env && pl->type == PLAYER)
335 esrv_del_item (pl->contr, tmp->count);
336 325
337 tmp->remove (); /* Unlink it */ 326 op->insert (tmp);
338 }
339 }
340
341 if (QUERY_FLAG (tmp, FLAG_UNPAID))
342 sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
343 else
344 sprintf (buf, "You pick up the %s.", query_name (tmp));
345
346 new_draw_info (NDI_UNIQUE, 0, pl, buf);
347
348 tmp = insert_ob_in_ob (tmp, op);
349
350 /* All the stuff below deals with client/server code, and is only
351 * usable by players
352 */
353 if (pl->contr)
354 {
355 esrv_send_item (pl, tmp);
356
357 /* These are needed to update the weight for the container we
358 * are putting the object in.
359 */
360 if (op != pl)
361 {
362 esrv_update_item (UPD_WEIGHT, pl, op);
363 esrv_send_item (pl, pl);
364 }
365
366 /* Update the container the object was in */
367 if (env && env != pl && env != op)
368 esrv_update_item (UPD_WEIGHT, pl, env);
369 }
370} 327}
371 328
372/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 329/* modified slightly to allow monsters use this -b.t. 5-31-95 */
373void 330void
374pick_up (object *op, object *alt) 331pick_up (object *op, object *alt)
… …
384 if (!can_pick (op, alt)) 341 if (!can_pick (op, alt))
385 { 342 {
386 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name); 343 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
387 goto leave; 344 goto leave;
388 } 345 }
346
389 tmp = alt; 347 tmp = alt;
390 } 348 }
391 else 349 else
392 { 350 {
393 if (op->below == NULL || !can_pick (op, op->below)) 351 if (op->below == NULL || !can_pick (op, op->below))
… …
402 /* Try to catch it. */ 360 /* Try to catch it. */
403 tmp_map = tmp->map; 361 tmp_map = tmp->map;
404 tmp = stop_item (tmp); 362 tmp = stop_item (tmp);
405 if (tmp == NULL) 363 if (tmp == NULL)
406 goto leave; 364 goto leave;
365
407 need_fix_tmp = 1; 366 need_fix_tmp = 1;
408 if (!can_pick (op, tmp)) 367 if (!can_pick (op, tmp))
409 goto leave; 368 goto leave;
410 369
411 if (op->type == PLAYER) 370 if (op->type == PLAYER)
… …
416 } 375 }
417 else 376 else
418 count = tmp->nrof; 377 count = tmp->nrof;
419 378
420 /* container is open, so use it */ 379 /* container is open, so use it */
380 if (tmp->flag [FLAG_STARTEQUIP])
381 alt = op;
421 if (op->container) 382 else if (op->container)
422 { 383 {
423 alt = op->container; 384 alt = op->container;
424 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 385 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
425 goto leave; 386 goto leave;
426 } 387 }
… …
445 /* here it could be possible to check rent, 406 /* here it could be possible to check rent,
446 * if someone wants to implement it 407 * if someone wants to implement it
447 */ 408 */
448 alt = op; 409 alt = op;
449 } 410 }
411
450#ifdef PICKUP_DEBUG 412#ifdef PICKUP_DEBUG
451 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); 413 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
452#endif 414#endif
453 415
454 /* startequip items are not allowed to be put into containers: */ 416 /* startequip items are not allowed to be put into containers: */
… …
504 466
505 /* Makes processing easier */ 467 /* Makes processing easier */
506 if (params && *params == '\0') 468 if (params && *params == '\0')
507 params = 0; 469 params = 0;
508 470
471 int cnt = MAX_ITEM_PER_DROP;
472
509 while (tmp) 473 while (tmp)
510 { 474 {
511 next = tmp->below; 475 next = tmp->below;
512 476
513 if (tmp->invisible) 477 if (tmp->invisible)
… …
519 /* This following two if and else if could be merged into line 483 /* This following two if and else if could be merged into line
520 * but that probably will make it more difficult to read, and 484 * but that probably will make it more difficult to read, and
521 * not make it any more efficient 485 * not make it any more efficient
522 */ 486 */
523 if (params && item_matched_string (op, tmp, params)) 487 if (params && item_matched_string (op, tmp, params))
488 {
489 if (--cnt < 0) break;
524 pick_up (op, tmp); 490 pick_up (op, tmp);
491 }
525 else if (can_pick (op, tmp) && !params) 492 else if (can_pick (op, tmp) && !params)
526 { 493 {
494 if (--cnt < 0) break;
527 pick_up (op, tmp); 495 pick_up (op, tmp);
528 break; 496 break;
529 } 497 }
530 498
531 tmp = next; 499 tmp = next;
500 }
501
502 if (cnt < 0)
503 {
504 op->failmsg ("Couldn't pick up so many items at once.");
505 return 0;
532 } 506 }
533 507
534 if (!params && !tmp) 508 if (!params && !tmp)
535 { 509 {
536 for (tmp = op->below; tmp; tmp = tmp->below) 510 for (tmp = op->below; tmp; tmp = tmp->below)
537 if (!tmp->invisible) 511 if (!tmp->invisible)
538 { 512 {
539 char buf[MAX_BUF];
540
541 sprintf (buf, "You can't pick up a %s.", &tmp->name); 513 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up a %s.", &tmp->name);
542 new_draw_info (NDI_UNIQUE, 0, op, buf);
543 break; 514 break;
544 } 515 }
545 516
546 if (!tmp) 517 if (!tmp)
547 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 518 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
548 } 519 }
549 520
550 return 0; 521 return 0;
551} 522}
552
553 523
554/* 524/*
555 * This function was part of drop, now is own function. 525 * This function was part of drop, now is own function.
556 * Player 'op' tries to put object 'tmp' into sack 'sack', 526 * Player 'op' tries to put object 'tmp' into sack 'sack',
557 * if nrof is non zero, then nrof objects is tried to put into sack. 527 * if nrof is non zero, then nrof objects is tried to put into sack.
… …
573 return; 543 return;
574 } 544 }
575 545
576 if (tmp->type == CONTAINER && tmp->inv) 546 if (tmp->type == CONTAINER && tmp->inv)
577 { 547 {
578
579 /* Eneq(@csd.uu.se): If the object to be dropped is a container 548 /* Eneq(@csd.uu.se): If the object to be dropped is a container
580 * we instead move the contents of that container into the active 549 * we instead move the contents of that container into the active
581 * container, this is only done if the object has something in it. 550 * container, this is only done if the object has something in it.
582 */ 551 */
583 sack2 = tmp; 552 sack2 = tmp;
… …
586 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 555 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
587 { 556 {
588 tmp = tmp2->below; 557 tmp = tmp2->below;
589 558
590 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 559 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))
591 {
592 put_object_in_sack (op, sack, tmp2, 0); 560 put_object_in_sack (op, sack, tmp2, 0);
593 }
594 else 561 else
595 { 562 {
596 sprintf (buf, "Your %s fills up.", query_name (sack)); 563 sprintf (buf, "Your %s fills up.", query_name (sack));
597 new_draw_info (NDI_UNIQUE, 0, op, buf); 564 new_draw_info (NDI_UNIQUE, 0, op, buf);
598 break; 565 break;
599 } 566 }
600 } 567 }
601 568
602 esrv_update_item (UPD_WEIGHT, op, sack2);
603 return; 569 return;
604 } 570 }
605 571
606 /* Don't worry about this for containers - our caller should have 572 /* Don't worry about this for containers - our caller should have
607 * already checked this. 573 * already checked this.
… …
612 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 578 if (QUERY_FLAG (tmp, FLAG_APPLIED))
613 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 579 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
614 return; 580 return;
615 581
616 /* we want to put some portion of the item into the container */ 582 /* we want to put some portion of the item into the container */
617 if (nrof && tmp->nrof != nrof) 583 if (!can_split (op, tmp, nrof))
618 {
619 object *tmp2 = tmp;
620
621 tmp = get_split_ob (tmp, nrof);
622
623 if (!tmp)
624 {
625 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
626 return; 584 return;
627 }
628 /* Tell a client what happened other objects */
629 if (tmp2->destroyed ())
630 esrv_del_item (op->contr, tmp2->count);
631 else /* this can proably be replaced with an update */
632 esrv_send_item (op, tmp2);
633 }
634 else
635 tmp->remove ();
636 585
637 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 586 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
638 tmp2 = insert_ob_in_ob (tmp, sack); 587 sack->insert (tmp);
639 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
640 /* in object.c */
641
642 /* If an object merged (and thus, different object), we need to
643 * delete the original.
644 */
645 if (tmp2 != tmp)
646 esrv_del_item (op->contr, tmp->count);
647
648 esrv_send_item (op, tmp2);
649
650 /* update the sacks weight */
651 esrv_update_item (UPD_WEIGHT, op, sack);
652} 588}
653 589
654/* 590/*
655 * This function was part of drop, now is own function. 591 * This function was part of drop, now is own function.
656 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 592 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
… …
658 * This is used when dropping objects onto the floor. 594 * This is used when dropping objects onto the floor.
659 */ 595 */
660void 596void
661drop_object (object *op, object *tmp, uint32 nrof) 597drop_object (object *op, object *tmp, uint32 nrof)
662{ 598{
663 char buf[MAX_BUF];
664 object *floor;
665
666 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 599 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
667 return; 600 return;
668 601
669 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 602 if (QUERY_FLAG (tmp, FLAG_APPLIED))
670 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 603 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
… …
673 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D 606 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
674 607
675 /* We are only dropping some of the items. We split the current object 608 /* We are only dropping some of the items. We split the current object
676 * off 609 * off
677 */ 610 */
678 if (nrof && tmp->nrof != nrof) 611 if (!can_split (op, tmp, nrof))
679 {
680 object *tmp2 = tmp;
681
682 tmp = get_split_ob (tmp, nrof);
683 if (!tmp)
684 {
685 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
686 return; 612 return;
687 }
688 /* Tell a client what happened rest of objects. tmp2 is now the
689 * original object
690 */
691 if (op->type == PLAYER)
692 {
693 if (tmp2->destroyed ())
694 esrv_del_item (op->contr, tmp2->count);
695 else
696 esrv_send_item (op, tmp2);
697 }
698 }
699 else
700 tmp->remove ();
701 613
702 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) 614 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
703 return; 615 return;
704 616
705 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 617 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
706 { 618 {
707 sprintf (buf, "You drop the %s.", query_name (tmp)); 619 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
708 new_draw_info (NDI_UNIQUE, 0, op, buf); 620 op->statusmsg ("The god who lent it to you retrieves it.");
709 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
710
711 if (op->type == PLAYER)
712 esrv_del_item (op->contr, tmp->count);
713 621
714 tmp->destroy (); 622 tmp->destroy ();
715 op->update_stats (); 623 op->update_stats ();
716 return; 624 return;
717 } 625 }
718 626
719 if (op->type == PLAYER)
720 esrv_del_item (op->contr, tmp->count);
721
722 /* Call this before we update the various windows/players. At least 627 /* Call this before we update the various windows/players. At least
723 * that we, we know the weight is correct. 628 * that we, we know the weight is correct.
724 */ 629 */
725 op->update_stats (); /* This is overkill, fix_player() is called somewhere */ 630 // 2007-11-26: moved op->update_stats away and calling it later after
726 /* in object.c */ 631 // all items of a drop command have been processed.
727 632
728 if (op->type == PLAYER)
729 {
730 /* Need to update the weight for the player */
731 esrv_send_item (op, op);
732 op->contr->ns->floorbox_update ();
733 }
734
735 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above) 633 for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
736 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) 634 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
737 return; 635 return;
738 636
739 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) 637 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
638 {
740 sell_item (tmp, op); 639 if (!sell_item (tmp, op))
640 {
641 // if we can't sell it we don't drop it, so give it back to the seller
642 op->insert (tmp);
643 return;
644 }
645 }
741 646
742 tmp->x = op->x; 647 tmp->x = op->x;
743 tmp->y = op->y; 648 tmp->y = op->y;
744 649
745 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 650 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
… …
759 if (tmp->env && tmp->env->type != PLAYER) 664 if (tmp->env && tmp->env->type != PLAYER)
760 { 665 {
761 /* Just toss the object - probably shouldn't be hanging 666 /* Just toss the object - probably shouldn't be hanging
762 * around anyways 667 * around anyways
763 */ 668 */
764 tmp->remove ();
765 tmp->destroy (); 669 tmp->destroy ();
766 return; 670 return;
767 } 671 }
768 else 672 else
769 { 673 {
770 while (tmp != NULL && tmp->invisible) 674 while (tmp && tmp->invisible)
771 tmp = tmp->below; 675 tmp = tmp->below;
772 } 676 }
773 } 677 }
774 678
775 if (tmp == NULL) 679 if (tmp == NULL)
776 { 680 {
777 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 681 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
778 return; 682 return;
779 } 683 }
684
780 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 685 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
781 { 686 {
782 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 687 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
783 return; 688 return;
784 } 689 }
690
785 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 691 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
786 { 692 {
787#if 0 693#if 0
788 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 694 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
789 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 695 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
… …
813 719
814 if (op->type == PLAYER) 720 if (op->type == PLAYER)
815 op->contr->count = 0; 721 op->contr->count = 0;
816} 722}
817 723
818
819
820/* Command will drop all items that have not been locked */ 724/* Command will drop all items that have not been locked */
821int 725int
822command_dropall (object *op, char *params) 726command_dropall (object *op, char *params)
823{ 727{
824 728
825 object *curinv, *nextinv;
826
827 if (op->inv == NULL) 729 if (op->inv == NULL)
828 { 730 {
829 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 731 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
830 return 0; 732 return 0;
831 } 733 }
832 734
833 curinv = op->inv; 735 object *curinv = op->inv;
736 object *nextinv;
834 737
835 /* 738 /*
836 This is the default. Drops everything not locked or considered 739 This is the default. Drops everything not locked or considered
837 not something that should be dropped. 740 not something that should be dropped.
838 */ 741 */
… …
840 Care must be taken that the next item pointer is not to money as 743 Care must be taken that the next item pointer is not to money as
841 the drop() routine will do unknown things to it when dropping 744 the drop() routine will do unknown things to it when dropping
842 in a shop. --Tero.Pelander@utu.fi 745 in a shop. --Tero.Pelander@utu.fi
843 */ 746 */
844 747
845 if (params == NULL) 748 int cnt = MAX_ITEM_PER_DROP;
749
750 if (!params)
846 { 751 {
847 while (curinv != NULL) 752 while (curinv)
848 { 753 {
849 nextinv = curinv->below; 754 nextinv = curinv->below;
755
850 while (nextinv && nextinv->type == MONEY) 756 while (nextinv && nextinv->type == MONEY)
851 nextinv = nextinv->below; 757 nextinv = nextinv->below;
758
852 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 759 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
853 curinv->type != FOOD && curinv->type != KEY && 760 curinv->type != FOOD && curinv->type != KEY &&
854 curinv->type != SPECIAL_KEY && curinv->type != GEM && 761 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
855 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 762 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
856 { 763 {
857 drop (op, curinv); 764 drop (op, curinv);
765 if (--cnt <= 0) break;
858 } 766 }
767
859 curinv = nextinv; 768 curinv = nextinv;
860 } 769 }
861 } 770 }
862
863 else if (strcmp (params, "weapons") == 0) 771 else if (strcmp (params, "weapons") == 0)
864 { 772 {
865 while (curinv != NULL) 773 while (curinv)
866 { 774 {
867 nextinv = curinv->below; 775 nextinv = curinv->below;
776
868 while (nextinv && nextinv->type == MONEY) 777 while (nextinv && nextinv->type == MONEY)
869 nextinv = nextinv->below; 778 nextinv = nextinv->below;
779
870 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 780 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
871 { 781 {
872 drop (op, curinv); 782 drop (op, curinv);
783 if (--cnt <= 0) break;
873 } 784 }
785
874 curinv = nextinv; 786 curinv = nextinv;
875 } 787 }
876 } 788 }
877
878 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 789 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
879 { 790 {
880 while (curinv != NULL) 791 while (curinv)
881 { 792 {
882 nextinv = curinv->below; 793 nextinv = curinv->below;
794
883 while (nextinv && nextinv->type == MONEY) 795 while (nextinv && nextinv->type == MONEY)
884 nextinv = nextinv->below; 796 nextinv = nextinv->below;
797
885 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 798 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
886 { 799 {
887 drop (op, curinv); 800 drop (op, curinv);
801 if (--cnt <= 0) break;
888 } 802 }
803
889 curinv = nextinv; 804 curinv = nextinv;
890 } 805 }
891 } 806 }
892
893 else if (strcmp (params, "misc") == 0) 807 else if (strcmp (params, "misc") == 0)
894 { 808 {
895 while (curinv != NULL) 809 while (curinv)
896 { 810 {
897 nextinv = curinv->below; 811 nextinv = curinv->below;
812
898 while (nextinv && nextinv->type == MONEY) 813 while (nextinv && nextinv->type == MONEY)
899 nextinv = nextinv->below; 814 nextinv = nextinv->below;
815
900 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 816 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
901 { 817 {
902 switch (curinv->type) 818 switch (curinv->type)
903 { 819 {
904 case HORN: 820 case HORN:
… …
922 break; 838 break;
923 default: 839 default:
924 curinv = nextinv; 840 curinv = nextinv;
925 break; 841 break;
926 } 842 }
843
844 if (--cnt <= 0) break;
927 } 845 }
846
928 curinv = nextinv; 847 curinv = nextinv;
929 } 848 }
930 } 849 }
931 850
932 op->contr->ns->floorbox_update (); 851 if (cnt <= 0)
852 op->failmsg ("Only dropped some items, can't drop that many items at once.");
933 853
934/* draw_look(op);*/ 854/* draw_look(op);*/
935 return 0; 855 return 0;
936} 856}
937 857
938/* Object op wants to drop object(s) params. params can be a 858/* Object op wants to drop object(s) params. params can be a
939 * comma seperated list. 859 * comma seperated list.
940 */ 860 */
941
942int 861int
943command_drop (object *op, char *params) 862command_drop (object *op, char *params)
944{ 863{
945 object *tmp, *next; 864 object *tmp, *next;
946 int did_one = 0; 865 int did_one = 0;
… …
950 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 869 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
951 return 0; 870 return 0;
952 } 871 }
953 else 872 else
954 { 873 {
874 int cnt = MAX_ITEM_PER_DROP;
875
955 for (tmp = op->inv; tmp; tmp = next) 876 for (tmp = op->inv; tmp; tmp = next)
956 { 877 {
957 next = tmp->below; 878 next = tmp->below;
958 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 879 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
959 continue; 880 continue;
881
960 if (item_matched_string (op, tmp, params)) 882 if (item_matched_string (op, tmp, params))
961 { 883 {
962 drop (op, tmp); 884 drop (op, tmp);
885 if (--cnt <= 0) break;
963 did_one = 1; 886 did_one = 1;
964 } 887 }
965 } 888 }
889
966 if (!did_one) 890 if (!did_one)
967 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 891 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
968 } 892
969 if (op->type == PLAYER) 893 if (cnt <= 0)
970 { 894 op->failmsg ("Only dropped some items, can't drop that many items at once.");
971 op->contr->count = 0;
972 op->contr->ns->floorbox_update ();
973 }; 895 }
974 896
975/* draw_look(op);*/
976 return 0; 897 return 0;
977} 898}
978 899
979int 900int
980command_examine (object *op, char *params) 901command_examine (object *op, char *params)
… …
983 { 904 {
984 object *tmp = op->below; 905 object *tmp = op->below;
985 906
986 while (tmp && !tmp->client_visible ()) 907 while (tmp && !tmp->client_visible ())
987 tmp = tmp->below; 908 tmp = tmp->below;
909
988 if (tmp) 910 if (tmp)
989 examine (op, tmp); 911 examine (op, tmp);
990 } 912 }
991 else 913 else
992 { 914 {
993 object *tmp = find_best_object_match (op, params); 915 object *tmp = find_best_object_match (op, params);
994 916
995 if (tmp) 917 if (tmp)
996 examine (op, tmp); 918 examine (op, tmp);
997 else 919 else
998 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params); 920 op->contr->infobox (MSG_CHANNEL ("examine"), format ("Could not find an object that matches %s", params));
999 } 921 }
922
1000 return 0; 923 return 0;
1001} 924}
1002 925
1003/* op should be a player. 926/* op should be a player.
1004 * we return the object the player has marked with the 'mark' command 927 * we return the object the player has marked with the 'mark' command
… …
1051 dynbuf_text buf (512, 512); 974 dynbuf_text buf (512, 512);
1052 975
1053 object *mon = head ? head : this; 976 object *mon = head ? head : this;
1054 977
1055 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 978 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1056 buf << "It is an undead force.\n"; 979 buf << "It is an undead force.\r";
1057 980
1058 if (mon->level > who->level) 981 if (mon->level > who->level)
1059 buf << "It is likely more powerful than you.\n"; 982 buf << "It is likely more powerful than you.\r";
1060 else if (mon->level < who->level) 983 else if (mon->level < who->level)
1061 buf << "It is likely less powerful than you.\n"; 984 buf << "It is likely less powerful than you.\r";
1062 else 985 else
1063 buf << "It is probably as powerful as you.\n"; 986 buf << "It is probably as powerful as you.\r";
1064 987
1065 if (mon->attacktype & AT_ACID) 988 if (mon->attacktype & AT_ACID)
1066 buf << "You seem to smell an acrid odor.\n"; 989 buf << "You seem to smell an acrid odor.\r";
1067 990
1068 /* Anyone know why this used to use the clone value instead of the 991 /* Anyone know why this used to use the clone value instead of the
1069 * maxhp field? This seems that it should give more accurate results. 992 * maxhp field? This seems that it should give more accurate results.
1070 */ 993 */
1071 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 994 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1072 { /* From 1-4 */ 995 { /* From 1-4 */
1073 case 1: 996 case 1:
1074 buf << "It is in a bad shape.\n"; 997 buf << "It is in a bad shape.\r";
1075 break; 998 break;
1076 case 2: 999 case 2:
1077 buf << "It is hurt.\n"; 1000 buf << "It is hurt.\r";
1078 break; 1001 break;
1079 case 3: 1002 case 3:
1080 buf << "It is somewhat hurt.\n"; 1003 buf << "It is somewhat hurt.\r";
1081 break; 1004 break;
1082 case 4: 1005 case 4:
1083 buf << "It is in excellent shape.\n"; 1006 buf << "It is in excellent shape.\r";
1084 break; 1007 break;
1085 } 1008 }
1086 1009
1087 if (present_in_ob (POISONING, mon)) 1010 if (present_in_ob (POISONING, mon))
1088 buf << "It looks very ill.\n"; 1011 buf << "It looks very ill.\r";
1012
1013 buf << '\n';
1089 1014
1090 return buf; 1015 return buf;
1091} 1016}
1092 1017
1093/* tmp is the object being described, pl is who is examing it. */ 1018/* tmp is the object being described, pl is who is examing it. */
… …
1151std::string 1076std::string
1152object::describe (object *who) 1077object::describe (object *who)
1153{ 1078{
1154 dynbuf_text buf (1024, 1024); 1079 dynbuf_text buf (1024, 1024);
1155 1080
1156 buf.printf ("That is: %s.\n", long_desc (who).c_str ()); 1081 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1157 1082
1158 if (custom_name) 1083 if (custom_name)
1159 buf,printf ("You call it %s\n", &custom_name); 1084 buf.printf ("You call it %s.\r", &custom_name);
1160 1085
1161 switch (type) 1086 switch (type)
1162 { 1087 {
1163 case SPELLBOOK: 1088 case SPELLBOOK:
1164 if (flag [FLAG_IDENTIFIED] && inv) 1089 if (flag [FLAG_IDENTIFIED] && inv)
1165 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill); 1090 buf.printf ("%s is a %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1166 break; 1091 break;
1167 1092
1168 case BOOK: 1093 case BOOK:
1169 if (msg) 1094 if (msg)
1170 buf << "Something is written in it.\n"; 1095 buf << "Something is written in it.\r";
1171 break; 1096 break;
1172 1097
1173 case CONTAINER: 1098 case CONTAINER:
1174 if (race != NULL) 1099 if (race)
1175 { 1100 {
1176 if (weight_limit && stats.Str < 100) 1101 if (weight_limit && stats.Str < 100)
1177 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n", 1102 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1178 &race, weight_limit / (10.0 * (100 - stats.Str))); 1103 &race, weight_limit / (10.0 * (100 - stats.Str)));
1179 else 1104 else
1180 buf.printf ("It can hold only %s.\n", &race); 1105 buf.printf ("It can hold only %s.\r", &race);
1181 } 1106 }
1182 else if (weight_limit && stats.Str < 100) 1107 else if (weight_limit && stats.Str < 100)
1183 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str))); 1108 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1184 break; 1109 break;
1185 1110
1186 case WAND: 1111 case WAND:
1187 if (flag [FLAG_IDENTIFIED]) 1112 if (flag [FLAG_IDENTIFIED])
1188 buf.printf ("It has %d charges left.\n", stats.food); 1113 buf.printf ("It has %d charges left.\r", stats.food);
1189 break; 1114 break;
1190 } 1115 }
1191 1116
1192 if (materialname && !msg) 1117 if (materialname && !msg)
1193 buf.printf ("It is made of: %s.\n", &materialname); 1118 buf.printf ("It is made of: %s.\r", &materialname);
1194 1119
1195 if (who) 1120 if (who)
1196 /* Where to wear this item */ 1121 /* Where to wear this item */
1197 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1122 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1198 if (slot[i].info) 1123 if (slot[i].info)
… …
1200 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name); 1125 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1201 1126
1202 if (slot[i].info < -1 && who->slot[i].info) 1127 if (slot[i].info < -1 && who->slot[i].info)
1203 buf.printf ("(%d)", -slot[i].info); 1128 buf.printf ("(%d)", -slot[i].info);
1204 1129
1205 buf << ".\n"; 1130 buf << ".\r";
1206 } 1131 }
1207 1132
1208 if (weight) 1133 if (weight)
1209 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0); 1134 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1210 1135
1211 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) 1136 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1212 { 1137 {
1213 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX)); 1138 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1214 1139
1215 if (is_in_shop (who)) 1140 if (is_in_shop (who))
1216 { 1141 {
1217 if (flag [FLAG_UNPAID]) 1142 if (flag [FLAG_UNPAID])
1218 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP)); 1143 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1219 else 1144 else
1220 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it"); 1145 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1221 } 1146 }
1222 } 1147 }
1223 1148
1224 if (flag [FLAG_MONSTER]) 1149 if (flag [FLAG_MONSTER])
1225 buf << describe_monster (who); 1150 buf << describe_monster (who);
1226 1151
1227 /* Is this item buildable? */ 1152 /* Is this item buildable? */
1228 if (flag [FLAG_IS_BUILDABLE]) 1153 if (flag [FLAG_IS_BUILDABLE])
1229 buf << "This is a buildable item.\n"; 1154 buf << "This is a buildable item.\r";
1230 1155
1231 /* Does the object have a message? Don't show message for all object 1156 /* Does the object have a message? Don't show message for all object
1232 * types - especially if the first entry is a match 1157 * types - especially if the first entry is a match
1233 */ 1158 */
1234 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && strncasecmp (msg, "@match", 7)) 1159 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1235 { 1160 {
1236 /* This is just a hack so when identifying the items, we print 1161 /* This is just a hack so when identifying the items, we print
1237 * out the extra message 1162 * out the extra message
1238 */ 1163 */
1239 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1164 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1240 buf << "The object has a story:\n"; 1165 buf << "The object has a story:\r";
1241 1166
1242 buf << msg << '\n'; 1167 buf << msg << '\n';
1243 } 1168 }
1244 1169
1245 buf << '\n'; 1170 buf << '\n';
1246 1171
1247 return std::string (buf.linearise (), buf.size ()); 1172 return std::string (buf.linearise (), buf.size ());
1248}
1249
1250void
1251examine (object *op, object *tmp)
1252{
1253 std::string s = tmp->describe (op);
1254
1255 new_draw_info (NDI_UNIQUE, 0, op, s.c_str ());
1256}
1257
1258/*
1259 * inventory prints object's inventory. If inv==NULL then print player's
1260 * inventory.
1261 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1262 */
1263void
1264inventory (object *op, object *inv)
1265{
1266 object *tmp;
1267 const char *in;
1268 int items = 0, length;
1269
1270 if (inv == NULL && op == NULL)
1271 {
1272 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1273 return;
1274 }
1275
1276 tmp = inv ? inv->inv : op->inv;
1277
1278 while (tmp)
1279 {
1280 if ((!tmp->invisible &&
1281 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1282 items++;
1283 tmp = tmp->below;
1284 }
1285
1286 if (inv == NULL)
1287 { /* player's inventory */
1288 if (items == 0)
1289 {
1290 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
1291 return;
1292 }
1293 else
1294 {
1295 length = 28;
1296 in = "";
1297 if (op)
1298 clear_win_info (op);
1299 new_draw_info (NDI_UNIQUE, 0, op, "Inventory:");
1300 }
1301 }
1302 else
1303 {
1304 if (items == 0)
1305 return;
1306 else
1307 {
1308 length = 28;
1309 in = " ";
1310 }
1311 }
1312
1313 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1314 {
1315 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1316 continue;
1317 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1318 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1319 query_name (tmp), tmp->count, query_weight (tmp));
1320 else
1321 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1322 }
1323
1324 if (!inv && op)
1325 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1326} 1173}
1327 1174
1328static void 1175static void
1329display_new_pickup (object *op) 1176display_new_pickup (object *op)
1330{ 1177{

Diff Legend

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