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.59 by root, Sun Sep 30 20:22:21 2007 UTC vs.
Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* 24/*
25 * Object (handling) commands 25 * Object (handling) commands
26 */ 26 */
… …
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: */
… …
492 466
493 /* Makes processing easier */ 467 /* Makes processing easier */
494 if (params && *params == '\0') 468 if (params && *params == '\0')
495 params = 0; 469 params = 0;
496 470
471 int cnt = MAX_ITEM_PER_DROP;
472
497 while (tmp) 473 while (tmp)
498 { 474 {
499 next = tmp->below; 475 next = tmp->below;
500 476
501 if (tmp->invisible) 477 if (tmp->invisible)
… …
507 /* 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
508 * but that probably will make it more difficult to read, and 484 * but that probably will make it more difficult to read, and
509 * not make it any more efficient 485 * not make it any more efficient
510 */ 486 */
511 if (params && item_matched_string (op, tmp, params)) 487 if (params && item_matched_string (op, tmp, params))
488 {
489 if (--cnt < 0) break;
512 pick_up (op, tmp); 490 pick_up (op, tmp);
491 }
513 else if (can_pick (op, tmp) && !params) 492 else if (can_pick (op, tmp) && !params)
514 { 493 {
494 if (--cnt < 0) break;
515 pick_up (op, tmp); 495 pick_up (op, tmp);
516 break; 496 break;
517 } 497 }
518 498
519 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;
520 } 506 }
521 507
522 if (!params && !tmp) 508 if (!params && !tmp)
523 { 509 {
524 for (tmp = op->below; tmp; tmp = tmp->below) 510 for (tmp = op->below; tmp; tmp = tmp->below)
525 if (!tmp->invisible) 511 if (!tmp->invisible)
526 { 512 {
527 char buf[MAX_BUF];
528
529 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);
530 new_draw_info (NDI_UNIQUE, 0, op, buf);
531 break; 514 break;
532 } 515 }
533 516
534 if (!tmp) 517 if (!tmp)
535 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.");
536 } 519 }
537 520
538 return 0; 521 return 0;
539} 522}
540
541 523
542/* 524/*
543 * This function was part of drop, now is own function. 525 * This function was part of drop, now is own function.
544 * Player 'op' tries to put object 'tmp' into sack 'sack', 526 * Player 'op' tries to put object 'tmp' into sack 'sack',
545 * 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.
… …
561 return; 543 return;
562 } 544 }
563 545
564 if (tmp->type == CONTAINER && tmp->inv) 546 if (tmp->type == CONTAINER && tmp->inv)
565 { 547 {
566
567 /* 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
568 * we instead move the contents of that container into the active 549 * we instead move the contents of that container into the active
569 * 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.
570 */ 551 */
571 sack2 = tmp; 552 sack2 = tmp;
… …
574 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 555 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
575 { 556 {
576 tmp = tmp2->below; 557 tmp = tmp2->below;
577 558
578 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)))
579 {
580 put_object_in_sack (op, sack, tmp2, 0); 560 put_object_in_sack (op, sack, tmp2, 0);
581 }
582 else 561 else
583 { 562 {
584 sprintf (buf, "Your %s fills up.", query_name (sack)); 563 sprintf (buf, "Your %s fills up.", query_name (sack));
585 new_draw_info (NDI_UNIQUE, 0, op, buf); 564 new_draw_info (NDI_UNIQUE, 0, op, buf);
586 break; 565 break;
587 } 566 }
588 } 567 }
589 568
590 esrv_update_item (UPD_WEIGHT, op, sack2);
591 return; 569 return;
592 } 570 }
593 571
594 /* Don't worry about this for containers - our caller should have 572 /* Don't worry about this for containers - our caller should have
595 * already checked this. 573 * already checked this.
… …
600 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 578 if (QUERY_FLAG (tmp, FLAG_APPLIED))
601 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 579 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
602 return; 580 return;
603 581
604 /* 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 */
605 if (nrof && tmp->nrof != nrof) 583 if (!can_split (op, tmp, nrof))
606 {
607 object *tmp2 = tmp;
608
609 tmp = get_split_ob (tmp, nrof);
610
611 if (!tmp)
612 {
613 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
614 return; 584 return;
615 }
616 /* Tell a client what happened other objects */
617 if (tmp2->destroyed ())
618 esrv_del_item (op->contr, tmp2->count);
619 else /* this can proably be replaced with an update */
620 esrv_send_item (op, tmp2);
621 }
622 else
623 tmp->remove ();
624 585
625 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));
626 tmp2 = insert_ob_in_ob (tmp, sack); 587 sack->insert (tmp);
627 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
628 /* in object.c */
629
630 /* If an object merged (and thus, different object), we need to
631 * delete the original.
632 */
633 if (tmp2 != tmp)
634 esrv_del_item (op->contr, tmp->count);
635
636 esrv_send_item (op, tmp2);
637
638 /* update the sacks weight */
639 esrv_update_item (UPD_WEIGHT, op, sack);
640} 588}
641 589
642/* 590/*
643 * This function was part of drop, now is own function. 591 * This function was part of drop, now is own function.
644 * 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
… …
646 * This is used when dropping objects onto the floor. 594 * This is used when dropping objects onto the floor.
647 */ 595 */
648void 596void
649drop_object (object *op, object *tmp, uint32 nrof) 597drop_object (object *op, object *tmp, uint32 nrof)
650{ 598{
651 char buf[MAX_BUF];
652 object *floor;
653
654 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 599 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
655 return; 600 return;
656 601
657 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 602 if (QUERY_FLAG (tmp, FLAG_APPLIED))
658 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 603 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
… …
661 //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
662 607
663 /* 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
664 * off 609 * off
665 */ 610 */
666 if (nrof && tmp->nrof != nrof) 611 if (!can_split (op, tmp, nrof))
667 {
668 object *tmp2 = tmp;
669
670 tmp = get_split_ob (tmp, nrof);
671 if (!tmp)
672 {
673 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
674 return; 612 return;
675 }
676 /* Tell a client what happened rest of objects. tmp2 is now the
677 * original object
678 */
679 if (op->type == PLAYER)
680 {
681 if (tmp2->destroyed ())
682 esrv_del_item (op->contr, tmp2->count);
683 else
684 esrv_send_item (op, tmp2);
685 }
686 }
687 else
688 tmp->remove ();
689 613
690 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) 614 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
691 return; 615 return;
692 616
693 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 617 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
694 { 618 {
695 sprintf (buf, "You drop the %s.", query_name (tmp)); 619 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
696 new_draw_info (NDI_UNIQUE, 0, op, buf); 620 op->statusmsg ("The god who lent it to you retrieves it.");
697 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
698
699 if (op->type == PLAYER)
700 esrv_del_item (op->contr, tmp->count);
701 621
702 tmp->destroy (); 622 tmp->destroy ();
703 op->update_stats (); 623 op->update_stats ();
704 return; 624 return;
705 } 625 }
706 626
707 if (op->type == PLAYER)
708 esrv_del_item (op->contr, tmp->count);
709
710 /* Call this before we update the various windows/players. At least 627 /* Call this before we update the various windows/players. At least
711 * that we, we know the weight is correct. 628 * that we, we know the weight is correct.
712 */ 629 */
713 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
714 /* in object.c */ 631 // all items of a drop command have been processed.
715 632
716 if (op->type == PLAYER)
717 {
718 /* Need to update the weight for the player */
719 esrv_send_item (op, op);
720 op->contr->ns->floorbox_update ();
721 }
722
723 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)
724 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)))
725 return; 635 return;
726 636
727 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 {
728 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 }
729 646
730 tmp->x = op->x; 647 tmp->x = op->x;
731 tmp->y = op->y; 648 tmp->y = op->y;
732 649
733 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 650 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
… …
747 if (tmp->env && tmp->env->type != PLAYER) 664 if (tmp->env && tmp->env->type != PLAYER)
748 { 665 {
749 /* Just toss the object - probably shouldn't be hanging 666 /* Just toss the object - probably shouldn't be hanging
750 * around anyways 667 * around anyways
751 */ 668 */
752 tmp->remove ();
753 tmp->destroy (); 669 tmp->destroy ();
754 return; 670 return;
755 } 671 }
756 else 672 else
757 { 673 {
758 while (tmp != NULL && tmp->invisible) 674 while (tmp && tmp->invisible)
759 tmp = tmp->below; 675 tmp = tmp->below;
760 } 676 }
761 } 677 }
762 678
763 if (tmp == NULL) 679 if (tmp == NULL)
764 { 680 {
765 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.");
766 return; 682 return;
767 } 683 }
684
768 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 685 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
769 { 686 {
770 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 687 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
771 return; 688 return;
772 } 689 }
690
773 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 691 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
774 { 692 {
775#if 0 693#if 0
776 /* 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. */
777 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.");
… …
801 719
802 if (op->type == PLAYER) 720 if (op->type == PLAYER)
803 op->contr->count = 0; 721 op->contr->count = 0;
804} 722}
805 723
806
807
808/* Command will drop all items that have not been locked */ 724/* Command will drop all items that have not been locked */
809int 725int
810command_dropall (object *op, char *params) 726command_dropall (object *op, char *params)
811{ 727{
812 728
813 object *curinv, *nextinv;
814
815 if (op->inv == NULL) 729 if (op->inv == NULL)
816 { 730 {
817 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 731 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
818 return 0; 732 return 0;
819 } 733 }
820 734
821 curinv = op->inv; 735 object *curinv = op->inv;
736 object *nextinv;
822 737
823 /* 738 /*
824 This is the default. Drops everything not locked or considered 739 This is the default. Drops everything not locked or considered
825 not something that should be dropped. 740 not something that should be dropped.
826 */ 741 */
… …
828 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
829 the drop() routine will do unknown things to it when dropping 744 the drop() routine will do unknown things to it when dropping
830 in a shop. --Tero.Pelander@utu.fi 745 in a shop. --Tero.Pelander@utu.fi
831 */ 746 */
832 747
833 if (params == NULL) 748 int cnt = MAX_ITEM_PER_DROP;
749
750 if (!params)
834 { 751 {
835 while (curinv != NULL) 752 while (curinv)
836 { 753 {
837 nextinv = curinv->below; 754 nextinv = curinv->below;
755
838 while (nextinv && nextinv->type == MONEY) 756 while (nextinv && nextinv->type == MONEY)
839 nextinv = nextinv->below; 757 nextinv = nextinv->below;
758
840 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 759 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
841 curinv->type != FOOD && curinv->type != KEY && 760 curinv->type != FOOD && curinv->type != KEY &&
842 curinv->type != SPECIAL_KEY && curinv->type != GEM && 761 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
843 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 762 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
844 { 763 {
845 drop (op, curinv); 764 drop (op, curinv);
765 if (--cnt <= 0) break;
846 } 766 }
767
847 curinv = nextinv; 768 curinv = nextinv;
848 } 769 }
849 } 770 }
850
851 else if (strcmp (params, "weapons") == 0) 771 else if (strcmp (params, "weapons") == 0)
852 { 772 {
853 while (curinv != NULL) 773 while (curinv)
854 { 774 {
855 nextinv = curinv->below; 775 nextinv = curinv->below;
776
856 while (nextinv && nextinv->type == MONEY) 777 while (nextinv && nextinv->type == MONEY)
857 nextinv = nextinv->below; 778 nextinv = nextinv->below;
779
858 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)))
859 { 781 {
860 drop (op, curinv); 782 drop (op, curinv);
783 if (--cnt <= 0) break;
861 } 784 }
785
862 curinv = nextinv; 786 curinv = nextinv;
863 } 787 }
864 } 788 }
865
866 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 789 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
867 { 790 {
868 while (curinv != NULL) 791 while (curinv)
869 { 792 {
870 nextinv = curinv->below; 793 nextinv = curinv->below;
794
871 while (nextinv && nextinv->type == MONEY) 795 while (nextinv && nextinv->type == MONEY)
872 nextinv = nextinv->below; 796 nextinv = nextinv->below;
797
873 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))
874 { 799 {
875 drop (op, curinv); 800 drop (op, curinv);
801 if (--cnt <= 0) break;
876 } 802 }
803
877 curinv = nextinv; 804 curinv = nextinv;
878 } 805 }
879 } 806 }
880
881 else if (strcmp (params, "misc") == 0) 807 else if (strcmp (params, "misc") == 0)
882 { 808 {
883 while (curinv != NULL) 809 while (curinv)
884 { 810 {
885 nextinv = curinv->below; 811 nextinv = curinv->below;
812
886 while (nextinv && nextinv->type == MONEY) 813 while (nextinv && nextinv->type == MONEY)
887 nextinv = nextinv->below; 814 nextinv = nextinv->below;
815
888 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))
889 { 817 {
890 switch (curinv->type) 818 switch (curinv->type)
891 { 819 {
892 case HORN: 820 case HORN:
… …
910 break; 838 break;
911 default: 839 default:
912 curinv = nextinv; 840 curinv = nextinv;
913 break; 841 break;
914 } 842 }
843
844 if (--cnt <= 0) break;
915 } 845 }
846
916 curinv = nextinv; 847 curinv = nextinv;
917 } 848 }
918 } 849 }
919 850
920 op->contr->ns->floorbox_update (); 851 if (cnt <= 0)
852 op->failmsg ("Only dropped some items, can't drop that many items at once.");
921 853
922/* draw_look(op);*/ 854/* draw_look(op);*/
923 return 0; 855 return 0;
924} 856}
925 857
926/* 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
927 * comma seperated list. 859 * comma seperated list.
928 */ 860 */
929
930int 861int
931command_drop (object *op, char *params) 862command_drop (object *op, char *params)
932{ 863{
933 object *tmp, *next; 864 object *tmp, *next;
934 int did_one = 0; 865 int did_one = 0;
… …
938 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 869 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
939 return 0; 870 return 0;
940 } 871 }
941 else 872 else
942 { 873 {
874 int cnt = MAX_ITEM_PER_DROP;
875
943 for (tmp = op->inv; tmp; tmp = next) 876 for (tmp = op->inv; tmp; tmp = next)
944 { 877 {
945 next = tmp->below; 878 next = tmp->below;
946 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 879 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
947 continue; 880 continue;
881
948 if (item_matched_string (op, tmp, params)) 882 if (item_matched_string (op, tmp, params))
949 { 883 {
950 drop (op, tmp); 884 drop (op, tmp);
885 if (--cnt <= 0) break;
951 did_one = 1; 886 did_one = 1;
952 } 887 }
953 } 888 }
889
954 if (!did_one) 890 if (!did_one)
955 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 891 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
956 } 892
957 if (op->type == PLAYER) 893 if (cnt <= 0)
958 { 894 op->failmsg ("Only dropped some items, can't drop that many items at once.");
959 op->contr->count = 0;
960 op->contr->ns->floorbox_update ();
961 }; 895 }
962 896
963/* draw_look(op);*/
964 return 0; 897 return 0;
965} 898}
966 899
967int 900int
968command_examine (object *op, char *params) 901command_examine (object *op, char *params)
… …
971 { 904 {
972 object *tmp = op->below; 905 object *tmp = op->below;
973 906
974 while (tmp && !tmp->client_visible ()) 907 while (tmp && !tmp->client_visible ())
975 tmp = tmp->below; 908 tmp = tmp->below;
909
976 if (tmp) 910 if (tmp)
977 examine (op, tmp); 911 examine (op, tmp);
978 } 912 }
979 else 913 else
980 { 914 {
981 object *tmp = find_best_object_match (op, params); 915 object *tmp = find_best_object_match (op, params);
982 916
983 if (tmp) 917 if (tmp)
984 examine (op, tmp); 918 examine (op, tmp);
985 else 919 else
986 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));
987 } 921 }
922
988 return 0; 923 return 0;
989} 924}
990 925
991/* op should be a player. 926/* op should be a player.
992 * 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
… …
1039 dynbuf_text buf (512, 512); 974 dynbuf_text buf (512, 512);
1040 975
1041 object *mon = head ? head : this; 976 object *mon = head ? head : this;
1042 977
1043 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 978 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1044 buf << "It is an undead force.\n"; 979 buf << "It is an undead force.\r";
1045 980
1046 if (mon->level > who->level) 981 if (mon->level > who->level)
1047 buf << "It is likely more powerful than you.\n"; 982 buf << "It is likely more powerful than you.\r";
1048 else if (mon->level < who->level) 983 else if (mon->level < who->level)
1049 buf << "It is likely less powerful than you.\n"; 984 buf << "It is likely less powerful than you.\r";
1050 else 985 else
1051 buf << "It is probably as powerful as you.\n"; 986 buf << "It is probably as powerful as you.\r";
1052 987
1053 if (mon->attacktype & AT_ACID) 988 if (mon->attacktype & AT_ACID)
1054 buf << "You seem to smell an acrid odor.\n"; 989 buf << "You seem to smell an acrid odor.\r";
1055 990
1056 /* 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
1057 * maxhp field? This seems that it should give more accurate results. 992 * maxhp field? This seems that it should give more accurate results.
1058 */ 993 */
1059 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 994 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1060 { /* From 1-4 */ 995 { /* From 1-4 */
1061 case 1: 996 case 1:
1062 buf << "It is in a bad shape.\n"; 997 buf << "It is in a bad shape.\r";
1063 break; 998 break;
1064 case 2: 999 case 2:
1065 buf << "It is hurt.\n"; 1000 buf << "It is hurt.\r";
1066 break; 1001 break;
1067 case 3: 1002 case 3:
1068 buf << "It is somewhat hurt.\n"; 1003 buf << "It is somewhat hurt.\r";
1069 break; 1004 break;
1070 case 4: 1005 case 4:
1071 buf << "It is in excellent shape.\n"; 1006 buf << "It is in excellent shape.\r";
1072 break; 1007 break;
1073 } 1008 }
1074 1009
1075 if (present_in_ob (POISONING, mon)) 1010 if (present_in_ob (POISONING, mon))
1076 buf << "It looks very ill.\n"; 1011 buf << "It looks very ill.\r";
1012
1013 buf << '\n';
1077 1014
1078 return buf; 1015 return buf;
1079} 1016}
1080 1017
1081/* 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. */
… …
1139std::string 1076std::string
1140object::describe (object *who) 1077object::describe (object *who)
1141{ 1078{
1142 dynbuf_text buf (1024, 1024); 1079 dynbuf_text buf (1024, 1024);
1143 1080
1144 buf.printf ("That is: %s.\n", long_desc (who).c_str ()); 1081 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1145 1082
1146 if (custom_name) 1083 if (custom_name)
1147 buf.printf ("You call it %s\n", &custom_name); 1084 buf.printf ("You call it %s.\r", &custom_name);
1148 1085
1149 switch (type) 1086 switch (type)
1150 { 1087 {
1151 case SPELLBOOK: 1088 case SPELLBOOK:
1152 if (flag [FLAG_IDENTIFIED] && inv) 1089 if (flag [FLAG_IDENTIFIED] && inv)
1153 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);
1154 break; 1091 break;
1155 1092
1156 case BOOK: 1093 case BOOK:
1157 if (msg) 1094 if (msg)
1158 buf << "Something is written in it.\n"; 1095 buf << "Something is written in it.\r";
1159 break; 1096 break;
1160 1097
1161 case CONTAINER: 1098 case CONTAINER:
1162 if (race != NULL) 1099 if (race)
1163 { 1100 {
1164 if (weight_limit && stats.Str < 100) 1101 if (weight_limit && stats.Str < 100)
1165 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",
1166 &race, weight_limit / (10.0 * (100 - stats.Str))); 1103 &race, weight_limit / (10.0 * (100 - stats.Str)));
1167 else 1104 else
1168 buf.printf ("It can hold only %s.\n", &race); 1105 buf.printf ("It can hold only %s.\r", &race);
1169 } 1106 }
1170 else if (weight_limit && stats.Str < 100) 1107 else if (weight_limit && stats.Str < 100)
1171 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)));
1172 break; 1109 break;
1173 1110
1174 case WAND: 1111 case WAND:
1175 if (flag [FLAG_IDENTIFIED]) 1112 if (flag [FLAG_IDENTIFIED])
1176 buf.printf ("It has %d charges left.\n", stats.food); 1113 buf.printf ("It has %d charges left.\r", stats.food);
1177 break; 1114 break;
1178 } 1115 }
1179 1116
1180 if (materialname && !msg) 1117 if (materialname && !msg)
1181 buf.printf ("It is made of: %s.\n", &materialname); 1118 buf.printf ("It is made of: %s.\r", &materialname);
1182 1119
1183 if (who) 1120 if (who)
1184 /* Where to wear this item */ 1121 /* Where to wear this item */
1185 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1122 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1186 if (slot[i].info) 1123 if (slot[i].info)
… …
1188 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);
1189 1126
1190 if (slot[i].info < -1 && who->slot[i].info) 1127 if (slot[i].info < -1 && who->slot[i].info)
1191 buf.printf ("(%d)", -slot[i].info); 1128 buf.printf ("(%d)", -slot[i].info);
1192 1129
1193 buf << ".\n"; 1130 buf << ".\r";
1194 } 1131 }
1195 1132
1196 if (weight) 1133 if (weight)
1197 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);
1198 1135
1199 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) 1136 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1200 { 1137 {
1201 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));
1202 1139
1203 if (is_in_shop (who)) 1140 if (is_in_shop (who))
1204 { 1141 {
1205 if (flag [FLAG_UNPAID]) 1142 if (flag [FLAG_UNPAID])
1206 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));
1207 else 1144 else
1208 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");
1209 } 1146 }
1210 } 1147 }
1211 1148
1212 if (flag [FLAG_MONSTER]) 1149 if (flag [FLAG_MONSTER])
1213 buf << describe_monster (who); 1150 buf << describe_monster (who);
1214 1151
1215 /* Is this item buildable? */ 1152 /* Is this item buildable? */
1216 if (flag [FLAG_IS_BUILDABLE]) 1153 if (flag [FLAG_IS_BUILDABLE])
1217 buf << "This is a buildable item.\n"; 1154 buf << "This is a buildable item.\r";
1218 1155
1219 /* 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
1220 * types - especially if the first entry is a match 1157 * types - especially if the first entry is a match
1221 */ 1158 */
1222 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 ())
1223 { 1160 {
1224 /* 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
1225 * out the extra message 1162 * out the extra message
1226 */ 1163 */
1227 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1164 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1228 buf << "The object has a story:\n"; 1165 buf << "The object has a story:\r";
1229 1166
1230 buf << msg << '\n'; 1167 buf << msg << '\n';
1231 } 1168 }
1232 1169
1233 buf << '\n'; 1170 buf << '\n';

Diff Legend

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