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.63 by root, Mon Dec 17 08:35:49 2007 UTC vs.
Revision 1.76 by root, Sun Sep 7 21:31:23 2008 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra 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
91find_best_object_match (object *pl, const char *params) 91find_best_object_match (object *pl, const char *params)
92{ 92{
93 return find_best_apply_object_match (pl, params, AP_TOGGLE); 93 return find_best_apply_object_match (pl, params, AP_TOGGLE);
94} 94}
95 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 }
113}
114
96int 115int
97command_uskill (object *pl, char *params) 116command_uskill (object *pl, char *params)
98{ 117{
99 if (!params) 118 if (!params)
100 { 119 {
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 (nrof > tmp_nrof || nrof == 0) 298 if (nrof > tmp_nrof || nrof <= 0)
278 nrof = tmp_nrof; 299 nrof = tmp_nrof;
279 300
280 /* 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 */
281 weight = tmp->weight * nrof; 302 weight = tmp->weight * nrof;
282 if (tmp->inv) 303 if (tmp->inv)
283 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 304 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
284 305
285 if (pl->stats.Str <= MAX_STAT)
286 effective_weight_limit = weight_limit[pl->stats.Str]; 306 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
287 else
288 effective_weight_limit = weight_limit[MAX_STAT];
289 307
290 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 308 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
291 { 309 {
292 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.");
293 return; 311 return;
294 } 312 }
295 313
296 if (nrof != tmp_nrof) 314 if (!can_split (pl, tmp, nrof))
297 {
298 object *tmp2 = tmp;
299
300 tmp = get_split_ob (tmp, nrof);
301 if (!tmp)
302 {
303 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
304 return; 315 return;
305 }
306 316
307 /* Tell the client what happened to the rest of objects */ 317 if (QUERY_FLAG (tmp, FLAG_UNPAID))
308 if (pl->contr) 318 {
309 if (tmp2->destroyed ()) 319 tmp->flag.reset (FLAG_UNPAID);
310 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));
311 else 321 tmp->flag.set (FLAG_UNPAID);
312 esrv_update_item (UPD_NROF, pl, tmp2);
313 } 322 }
314 else 323 else
315 { 324 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
316 /* If the object is in a container, send a delete to the client.
317 * - we are moving all the items from the container to elsewhere,
318 * so it needs to be deleted.
319 */
320 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
321 {
322 if (tmp->env && pl->type == PLAYER)
323 esrv_del_item (pl->contr, tmp->count);
324 325
325 tmp->remove (); /* Unlink it */ 326 op->insert (tmp);
326 }
327 }
328
329 if (QUERY_FLAG (tmp, FLAG_UNPAID))
330 sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
331 else
332 sprintf (buf, "You pick up the %s.", query_name (tmp));
333
334 new_draw_info (NDI_UNIQUE, 0, pl, buf);
335
336 tmp = insert_ob_in_ob (tmp, op);
337
338 /* All the stuff below deals with client/server code, and is only
339 * usable by players
340 */
341 if (pl->contr)
342 {
343 esrv_send_item (pl, tmp);
344
345 /* These are needed to update the weight for the container we
346 * are putting the object in.
347 */
348 if (op != pl)
349 {
350 esrv_update_item (UPD_WEIGHT, pl, op);
351 esrv_send_item (pl, pl);
352 }
353
354 /* Update the container the object was in */
355 if (env && env != pl && env != op)
356 esrv_update_item (UPD_WEIGHT, pl, env);
357 }
358} 327}
359 328
360/* 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 */
361void 330void
362pick_up (object *op, object *alt) 331pick_up (object *op, object *alt)
372 if (!can_pick (op, alt)) 341 if (!can_pick (op, alt))
373 { 342 {
374 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);
375 goto leave; 344 goto leave;
376 } 345 }
346
377 tmp = alt; 347 tmp = alt;
378 } 348 }
379 else 349 else
380 { 350 {
381 if (op->below == NULL || !can_pick (op, op->below)) 351 if (op->below == NULL || !can_pick (op, op->below))
390 /* Try to catch it. */ 360 /* Try to catch it. */
391 tmp_map = tmp->map; 361 tmp_map = tmp->map;
392 tmp = stop_item (tmp); 362 tmp = stop_item (tmp);
393 if (tmp == NULL) 363 if (tmp == NULL)
394 goto leave; 364 goto leave;
365
395 need_fix_tmp = 1; 366 need_fix_tmp = 1;
396 if (!can_pick (op, tmp)) 367 if (!can_pick (op, tmp))
397 goto leave; 368 goto leave;
398 369
399 if (op->type == PLAYER) 370 if (op->type == PLAYER)
404 } 375 }
405 else 376 else
406 count = tmp->nrof; 377 count = tmp->nrof;
407 378
408 /* container is open, so use it */ 379 /* container is open, so use it */
380 if (tmp->flag [FLAG_STARTEQUIP])
381 alt = op;
409 if (op->container) 382 else if (op->container)
410 { 383 {
411 alt = op->container; 384 alt = op->container;
412 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 385 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
413 goto leave; 386 goto leave;
414 } 387 }
433 /* here it could be possible to check rent, 406 /* here it could be possible to check rent,
434 * if someone wants to implement it 407 * if someone wants to implement it
435 */ 408 */
436 alt = op; 409 alt = op;
437 } 410 }
411
438#ifdef PICKUP_DEBUG 412#ifdef PICKUP_DEBUG
439 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);
440#endif 414#endif
441 415
442 /* startequip items are not allowed to be put into containers: */ 416 /* startequip items are not allowed to be put into containers: */
510 * but that probably will make it more difficult to read, and 484 * but that probably will make it more difficult to read, and
511 * not make it any more efficient 485 * not make it any more efficient
512 */ 486 */
513 if (params && item_matched_string (op, tmp, params)) 487 if (params && item_matched_string (op, tmp, params))
514 { 488 {
489 if (--cnt < 0) break;
515 pick_up (op, tmp); 490 pick_up (op, tmp);
516 if (--cnt <= 0) break;
517 } 491 }
518 else if (can_pick (op, tmp) && !params) 492 else if (can_pick (op, tmp) && !params)
519 { 493 {
494 if (--cnt < 0) break;
520 pick_up (op, tmp); 495 pick_up (op, tmp);
521 break; 496 break;
522 } 497 }
523 498
524 tmp = next; 499 tmp = next;
525 } 500 }
526 501
527 if (cnt <= 0) 502 if (cnt < 0)
528 { 503 {
529 op->failmsg ("Couldn't pick up so many items at once."); 504 op->failmsg ("Couldn't pick up so many items at once.");
530 return 0; 505 return 0;
531 } 506 }
532 507
533 if (!params && !tmp) 508 if (!params && !tmp)
534 { 509 {
535 for (tmp = op->below; tmp; tmp = tmp->below) 510 for (tmp = op->below; tmp; tmp = tmp->below)
536 if (!tmp->invisible) 511 if (!tmp->invisible)
537 { 512 {
538 char buf[MAX_BUF];
539
540 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);
541 new_draw_info (NDI_UNIQUE, 0, op, buf);
542 break; 514 break;
543 } 515 }
544 516
545 if (!tmp) 517 if (!tmp)
546 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.");
547 } 519 }
548 520
549 return 0; 521 return 0;
550} 522}
551
552 523
553/* 524/*
554 * This function was part of drop, now is own function. 525 * This function was part of drop, now is own function.
555 * Player 'op' tries to put object 'tmp' into sack 'sack', 526 * Player 'op' tries to put object 'tmp' into sack 'sack',
556 * 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.
572 return; 543 return;
573 } 544 }
574 545
575 if (tmp->type == CONTAINER && tmp->inv) 546 if (tmp->type == CONTAINER && tmp->inv)
576 { 547 {
577
578 /* 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
579 * we instead move the contents of that container into the active 549 * we instead move the contents of that container into the active
580 * 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.
581 */ 551 */
582 sack2 = tmp; 552 sack2 = tmp;
585 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 555 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
586 { 556 {
587 tmp = tmp2->below; 557 tmp = tmp2->below;
588 558
589 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)))
590 {
591 put_object_in_sack (op, sack, tmp2, 0); 560 put_object_in_sack (op, sack, tmp2, 0);
592 }
593 else 561 else
594 { 562 {
595 sprintf (buf, "Your %s fills up.", query_name (sack)); 563 sprintf (buf, "Your %s fills up.", query_name (sack));
596 new_draw_info (NDI_UNIQUE, 0, op, buf); 564 new_draw_info (NDI_UNIQUE, 0, op, buf);
597 break; 565 break;
598 } 566 }
599 } 567 }
600 568
601 esrv_update_item (UPD_WEIGHT, op, sack2);
602 return; 569 return;
603 } 570 }
604 571
605 /* Don't worry about this for containers - our caller should have 572 /* Don't worry about this for containers - our caller should have
606 * already checked this. 573 * already checked this.
611 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 578 if (QUERY_FLAG (tmp, FLAG_APPLIED))
612 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 579 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
613 return; 580 return;
614 581
615 /* 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 */
616 if (nrof && tmp->nrof != nrof) 583 if (!can_split (op, tmp, nrof))
617 {
618 object *tmp2 = tmp;
619
620 tmp = get_split_ob (tmp, nrof);
621
622 if (!tmp)
623 {
624 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
625 return; 584 return;
626 }
627 /* Tell a client what happened other objects */
628 if (tmp2->destroyed ())
629 esrv_del_item (op->contr, tmp2->count);
630 else /* this can proably be replaced with an update */
631 esrv_send_item (op, tmp2);
632 }
633 else
634 tmp->remove ();
635 585
636 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));
637 tmp2 = insert_ob_in_ob (tmp, sack); 587 sack->insert (tmp);
638
639 // elmex: 2007-11-26: removed update_stats and replaced
640 // it by update_after_inventory_change () in the caller
641 // of this function
642
643 /* If an object merged (and thus, different object), we need to
644 * delete the original.
645 */
646 if (tmp2 != tmp)
647 esrv_del_item (op->contr, tmp->count);
648
649 esrv_send_item (op, tmp2);
650
651 /* update the sacks weight */
652 esrv_update_item (UPD_WEIGHT, op, sack);
653} 588}
654 589
655/* 590/*
656 * This function was part of drop, now is own function. 591 * This function was part of drop, now is own function.
657 * 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
659 * This is used when dropping objects onto the floor. 594 * This is used when dropping objects onto the floor.
660 */ 595 */
661void 596void
662drop_object (object *op, object *tmp, uint32 nrof) 597drop_object (object *op, object *tmp, uint32 nrof)
663{ 598{
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;
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 612
702 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) 613 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
703 return; 614 return;
704 615
705 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 616 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
706 { 617 {
707 op->statusmsg (format ("You drop the %s.", query_name (tmp))); 618 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
708 op->statusmsg ("The gods who lent it to you retrieves it."); 619 op->statusmsg ("The gods who lent it to you retrieves it.");
709
710 if (op->type == PLAYER)
711 esrv_del_item (op->contr, tmp->count);
712 620
713 tmp->destroy (); 621 tmp->destroy ();
714 op->update_stats (); 622 op->update_stats ();
715 return; 623 return;
716 } 624 }
717
718 if (op->type == PLAYER)
719 esrv_del_item (op->contr, tmp->count);
720 625
721 /* Call this before we update the various windows/players. At least 626 /* Call this before we update the various windows/players. At least
722 * that we, we know the weight is correct. 627 * that we, we know the weight is correct.
723 */ 628 */
724 // 2007-11-26: moved op->update_stats away and calling it later after 629 // 2007-11-26: moved op->update_stats away and calling it later after
725 // all items of a drop command have been processed. 630 // all items of a drop command have been processed.
726 631
727 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above) 632 for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
728 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) 633 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
729 return; 634 return;
730 635
731 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) 636 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
637 {
732 sell_item (tmp, op); 638 if (!sell_item (tmp, op))
639 return; // if we can't sell it we don't drop it
640 }
733 641
734 tmp->x = op->x; 642 tmp->x = op->x;
735 tmp->y = op->y; 643 tmp->y = op->y;
736 644
737 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 645 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
738}
739
740void update_after_inventory_change (object *op)
741{
742 /* Call this before we update the various windows/players. At least
743 * that we, we know the weight is correct.
744 */
745 op->update_stats ();
746
747 // elmex: kept this for now, i have no idea what happens when i remove it:
748 if (op->type == PLAYER)
749 {
750 /* Need to update the weight for the player */
751 esrv_send_item (op, op);
752 op->contr->ns->floorbox_update ();
753 }
754} 646}
755 647
756void 648void
757drop (object *op, object *tmp) 649drop (object *op, object *tmp)
758{ 650{
773 tmp->destroy (); 665 tmp->destroy ();
774 return; 666 return;
775 } 667 }
776 else 668 else
777 { 669 {
778 while (tmp != NULL && tmp->invisible) 670 while (tmp && tmp->invisible)
779 tmp = tmp->below; 671 tmp = tmp->below;
780 } 672 }
781 } 673 }
782 674
783 if (tmp == NULL) 675 if (tmp == NULL)
784 { 676 {
785 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 677 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
786 return; 678 return;
787 } 679 }
680
788 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 681 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
789 { 682 {
790 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 683 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
791 return; 684 return;
792 } 685 }
686
793 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 687 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
794 { 688 {
795#if 0 689#if 0
796 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 690 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
797 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 691 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
821 715
822 if (op->type == PLAYER) 716 if (op->type == PLAYER)
823 op->contr->count = 0; 717 op->contr->count = 0;
824} 718}
825 719
826
827
828/* Command will drop all items that have not been locked */ 720/* Command will drop all items that have not been locked */
829int 721int
830command_dropall (object *op, char *params) 722command_dropall (object *op, char *params)
831{ 723{
832 724
833 object *curinv, *nextinv;
834
835 if (op->inv == NULL) 725 if (op->inv == NULL)
836 { 726 {
837 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 727 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
838 return 0; 728 return 0;
839 } 729 }
840 730
841 curinv = op->inv; 731 object *curinv = op->inv;
732 object *nextinv;
842 733
843 /* 734 /*
844 This is the default. Drops everything not locked or considered 735 This is the default. Drops everything not locked or considered
845 not something that should be dropped. 736 not something that should be dropped.
846 */ 737 */
850 in a shop. --Tero.Pelander@utu.fi 741 in a shop. --Tero.Pelander@utu.fi
851 */ 742 */
852 743
853 int cnt = MAX_ITEM_PER_DROP; 744 int cnt = MAX_ITEM_PER_DROP;
854 745
855 if (params == NULL) 746 if (!params)
856 { 747 {
857 while (curinv != NULL) 748 while (curinv)
858 { 749 {
859 nextinv = curinv->below; 750 nextinv = curinv->below;
751
860 while (nextinv && nextinv->type == MONEY) 752 while (nextinv && nextinv->type == MONEY)
861 nextinv = nextinv->below; 753 nextinv = nextinv->below;
754
862 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 755 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
863 curinv->type != FOOD && curinv->type != KEY && 756 curinv->type != FOOD && curinv->type != KEY &&
864 curinv->type != SPECIAL_KEY && curinv->type != GEM && 757 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
865 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 758 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
866 { 759 {
867 drop (op, curinv); 760 drop (op, curinv);
868 if (--cnt <= 0) break; 761 if (--cnt <= 0) break;
869 } 762 }
763
870 curinv = nextinv; 764 curinv = nextinv;
871 } 765 }
872 } 766 }
873
874 else if (strcmp (params, "weapons") == 0) 767 else if (strcmp (params, "weapons") == 0)
875 { 768 {
876 while (curinv != NULL) 769 while (curinv)
877 { 770 {
878 nextinv = curinv->below; 771 nextinv = curinv->below;
772
879 while (nextinv && nextinv->type == MONEY) 773 while (nextinv && nextinv->type == MONEY)
880 nextinv = nextinv->below; 774 nextinv = nextinv->below;
775
881 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 776 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
882 { 777 {
883 drop (op, curinv); 778 drop (op, curinv);
884 if (--cnt <= 0) break; 779 if (--cnt <= 0) break;
885 } 780 }
781
886 curinv = nextinv; 782 curinv = nextinv;
887 } 783 }
888 } 784 }
889
890 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 785 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
891 { 786 {
892 while (curinv != NULL) 787 while (curinv)
893 { 788 {
894 nextinv = curinv->below; 789 nextinv = curinv->below;
790
895 while (nextinv && nextinv->type == MONEY) 791 while (nextinv && nextinv->type == MONEY)
896 nextinv = nextinv->below; 792 nextinv = nextinv->below;
793
897 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 794 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
898 { 795 {
899 drop (op, curinv); 796 drop (op, curinv);
900 if (--cnt <= 0) break; 797 if (--cnt <= 0) break;
901 } 798 }
799
902 curinv = nextinv; 800 curinv = nextinv;
903 } 801 }
904 } 802 }
905
906 else if (strcmp (params, "misc") == 0) 803 else if (strcmp (params, "misc") == 0)
907 { 804 {
908 while (curinv != NULL) 805 while (curinv)
909 { 806 {
910 nextinv = curinv->below; 807 nextinv = curinv->below;
808
911 while (nextinv && nextinv->type == MONEY) 809 while (nextinv && nextinv->type == MONEY)
912 nextinv = nextinv->below; 810 nextinv = nextinv->below;
811
913 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 812 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
914 { 813 {
915 switch (curinv->type) 814 switch (curinv->type)
916 { 815 {
917 case HORN: 816 case HORN:
935 break; 834 break;
936 default: 835 default:
937 curinv = nextinv; 836 curinv = nextinv;
938 break; 837 break;
939 } 838 }
839
940 if (--cnt <= 0) break; 840 if (--cnt <= 0) break;
941 } 841 }
842
942 curinv = nextinv; 843 curinv = nextinv;
943 } 844 }
944 } 845 }
945 846
946 if (cnt <= 0) 847 if (cnt <= 0)
947 op->failmsg ("Only dropped some items, can't drop that many items at once."); 848 op->failmsg ("Only dropped some items, can't drop that many items at once.");
948
949 update_after_inventory_change (op);
950 849
951/* draw_look(op);*/ 850/* draw_look(op);*/
952 return 0; 851 return 0;
953} 852}
954 853
955/* Object op wants to drop object(s) params. params can be a 854/* Object op wants to drop object(s) params. params can be a
956 * comma seperated list. 855 * comma seperated list.
957 */ 856 */
958
959int 857int
960command_drop (object *op, char *params) 858command_drop (object *op, char *params)
961{ 859{
962 object *tmp, *next; 860 object *tmp, *next;
963 int did_one = 0; 861 int did_one = 0;
988 if (!did_one) 886 if (!did_one)
989 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 887 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
990 888
991 if (cnt <= 0) 889 if (cnt <= 0)
992 op->failmsg ("Only dropped some items, can't drop that many items at once."); 890 op->failmsg ("Only dropped some items, can't drop that many items at once.");
993
994 update_after_inventory_change (op);
995 } 891 }
996 892
997 return 0; 893 return 0;
998} 894}
999 895
1004 { 900 {
1005 object *tmp = op->below; 901 object *tmp = op->below;
1006 902
1007 while (tmp && !tmp->client_visible ()) 903 while (tmp && !tmp->client_visible ())
1008 tmp = tmp->below; 904 tmp = tmp->below;
905
1009 if (tmp) 906 if (tmp)
1010 examine (op, tmp); 907 examine (op, tmp);
1011 } 908 }
1012 else 909 else
1013 { 910 {
1014 object *tmp = find_best_object_match (op, params); 911 object *tmp = find_best_object_match (op, params);
1015 912
1016 if (tmp) 913 if (tmp)
1017 examine (op, tmp); 914 examine (op, tmp);
1018 else 915 else
1019 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params); 916 op->contr->infobox (MSG_CHANNEL ("examine"), format ("Could not find an object that matches %s", params));
1020 } 917 }
918
1021 return 0; 919 return 0;
1022} 920}
1023 921
1024/* op should be a player. 922/* op should be a player.
1025 * we return the object the player has marked with the 'mark' command 923 * we return the object the player has marked with the 'mark' command
1072 dynbuf_text buf (512, 512); 970 dynbuf_text buf (512, 512);
1073 971
1074 object *mon = head ? head : this; 972 object *mon = head ? head : this;
1075 973
1076 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 974 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1077 buf << "It is an undead force.\n"; 975 buf << " - It is an undead force.\n";
1078 976
1079 if (mon->level > who->level) 977 if (mon->level > who->level)
1080 buf << "It is likely more powerful than you.\n"; 978 buf << " - It is likely more powerful than you.\n";
1081 else if (mon->level < who->level) 979 else if (mon->level < who->level)
1082 buf << "It is likely less powerful than you.\n"; 980 buf << " - It is likely less powerful than you.\n";
1083 else 981 else
1084 buf << "It is probably as powerful as you.\n"; 982 buf << " - It is probably as powerful as you.\n";
1085 983
1086 if (mon->attacktype & AT_ACID) 984 if (mon->attacktype & AT_ACID)
1087 buf << "You seem to smell an acrid odor.\n"; 985 buf << " - You seem to smell an acrid odor.\n";
1088 986
1089 /* Anyone know why this used to use the clone value instead of the 987 /* Anyone know why this used to use the clone value instead of the
1090 * maxhp field? This seems that it should give more accurate results. 988 * maxhp field? This seems that it should give more accurate results.
1091 */ 989 */
1092 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 990 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1093 { /* From 1-4 */ 991 { /* From 1-4 */
1094 case 1: 992 case 1:
1095 buf << "It is in a bad shape.\n"; 993 buf << " - It is in a bad shape.\n";
1096 break; 994 break;
1097 case 2: 995 case 2:
1098 buf << "It is hurt.\n"; 996 buf << " - It is hurt.\n";
1099 break; 997 break;
1100 case 3: 998 case 3:
1101 buf << "It is somewhat hurt.\n"; 999 buf << " - It is somewhat hurt.\n";
1102 break; 1000 break;
1103 case 4: 1001 case 4:
1104 buf << "It is in excellent shape.\n"; 1002 buf << " - It is in excellent shape.\n";
1105 break; 1003 break;
1106 } 1004 }
1107 1005
1108 if (present_in_ob (POISONING, mon)) 1006 if (present_in_ob (POISONING, mon))
1109 buf << "It looks very ill.\n"; 1007 buf << " - It looks very ill.\n";
1110 1008
1111 return buf; 1009 return buf;
1112} 1010}
1113 1011
1114/* tmp is the object being described, pl is who is examing it. */ 1012/* tmp is the object being described, pl is who is examing it. */
1172std::string 1070std::string
1173object::describe (object *who) 1071object::describe (object *who)
1174{ 1072{
1175 dynbuf_text buf (1024, 1024); 1073 dynbuf_text buf (1024, 1024);
1176 1074
1177 buf.printf ("That is: %s.\n", long_desc (who).c_str ()); 1075 buf.printf ("That is: %s.\n\n", long_desc (who).c_str ());
1178 1076
1179 if (custom_name) 1077 if (custom_name)
1180 buf.printf ("You call it %s\n", &custom_name); 1078 buf.printf ("You call it %s.\n\n", &custom_name);
1181 1079
1182 switch (type) 1080 switch (type)
1183 { 1081 {
1184 case SPELLBOOK: 1082 case SPELLBOOK:
1185 if (flag [FLAG_IDENTIFIED] && inv) 1083 if (flag [FLAG_IDENTIFIED] && inv)
1186 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill); 1084 buf.printf ("%s is a %s %s spell.\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1187 break; 1085 break;
1188 1086
1189 case BOOK: 1087 case BOOK:
1190 if (msg) 1088 if (msg)
1191 buf << "Something is written in it.\n"; 1089 buf << "Something is written in it.\n";
1250 buf << "This is a buildable item.\n"; 1148 buf << "This is a buildable item.\n";
1251 1149
1252 /* Does the object have a message? Don't show message for all object 1150 /* Does the object have a message? Don't show message for all object
1253 * types - especially if the first entry is a match 1151 * types - especially if the first entry is a match
1254 */ 1152 */
1255 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && *msg != '@') 1153 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1256 { 1154 {
1257 /* This is just a hack so when identifying the items, we print 1155 /* This is just a hack so when identifying the items, we print
1258 * out the extra message 1156 * out the extra message
1259 */ 1157 */
1260 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1158 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1261 buf << "The object has a story:\n"; 1159 buf << "The object has a story:\n\n";
1262 1160
1263 buf << msg << '\n'; 1161 buf << msg << '\n';
1264 } 1162 }
1265 1163
1266 buf << '\n'; 1164 buf << '\n';

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines