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.98 by sf-marcmagus, Thu Oct 15 16:00:38 2009 UTC vs.
Revision 1.134 by root, Sat Nov 17 23:40:03 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 10 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25/* 26/*
26 * Object (handling) commands 27 * Object (handling) commands
27 */ 28 */
28 29
29#include <global.h> 30#include <global.h>
30#include <loader.h>
31#include <skills.h> 31#include <skills.h>
32#include <sproto.h> 32#include <sproto.h>
33#include <living.h> 33#include <living.h>
34#include <math.h>
35 34
36/* 35/*
37 * Object id parsing functions 36 * Object id parsing functions
38 */ 37 */
39 38
69 68
70 int tmpmatch = item_matched_string (pl, tmp, params); 69 int tmpmatch = item_matched_string (pl, tmp, params);
71 70
72 if (tmpmatch > match_val) 71 if (tmpmatch > match_val)
73 { 72 {
74 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED))) 73 if ((aflag == AP_APPLY) && (tmp->flag [FLAG_APPLIED]))
75 continue; 74 continue;
76 75
77 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) 76 if ((aflag == AP_UNAPPLY) && (!tmp->flag [FLAG_APPLIED]))
78 continue; 77 continue;
79 78
80 match_val = tmpmatch; 79 match_val = tmpmatch;
81 best = tmp; 80 best = tmp;
82 } 81 }
138 137
139 skill = find_skill_by_name_fuzzy (pl, params); 138 skill = find_skill_by_name_fuzzy (pl, params);
140 139
141 if (!skill) 140 if (!skill)
142 { 141 {
143 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 %s skill.", params);
144 return 0; 143 return 0;
145 } 144 }
146 145
147 pl->change_skill (0); 146 pl->apply (skill);
148 apply_special (pl, skill, AP_APPLY);
149 return 1; 147 return 1;
150} 148}
151 149
152/* A little special because we do want to pass the full params along 150/* A little special because we do want to pass the full params along
153 * as it includes the object to throw. 151 * as it includes the object to throw.
154 */ 152 */
155int 153int
156command_throw (object *op, char *params) 154command_throw (object *op, char *params)
157{ 155{
158 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING])) 156 if (object *skop = find_skill_by_name (op, shstr_throwing))
159 return do_skill (op, op, skop, op->facing, params); 157 return do_skill (op, op, skop, op->facing, params);
160 else 158 else
161 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing."); 159 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the throwing skill.");
162 160
163 return 0; 161 return 0;
164} 162}
165 163
166int 164int
192 190
193 while (*params == ' ') 191 while (*params == ' ')
194 params++; 192 params++;
195 193
196 if (object *inv = find_best_apply_object_match (op, params, aflag)) 194 if (object *inv = find_best_apply_object_match (op, params, aflag))
197 player_apply (op, inv, aflag, 0); 195 op->apply (inv, aflag);
198 else 196 else
199 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params); 197 op->failmsgf ("Could not find any match to the %s.", params);
200 } 198 }
201 199
202 return 0; 200 return 0;
203} 201}
204 202
212 * not need to use split_ob and stuff. 210 * not need to use split_ob and stuff.
213 */ 211 */
214int 212int
215sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 213sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
216{ 214{
217 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 215 if (!sack->flag [FLAG_APPLIED])
218 { 216 {
219 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); 217 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
220 return 0; 218 return 0;
221 } 219 }
222 220
226 return 0; 224 return 0;
227 } 225 }
228 226
229 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) 227 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
230 { 228 {
231 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); 229 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can only put objects of type '%s' into the %s.", &sack->race, query_name (sack));
232 return 0; 230 return 0;
233 } 231 }
234 232
235 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 233 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
236 { 234 {
237 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); 235 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
238 return 0; 236 return 0;
239 } 237 }
240 238
241 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 239 if (sack->weight_limit
240 && weight_t (sack->carrying
241 + sack->number_of ()
242 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 242 * (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
243 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 243 * (100 - sack->stats.Str) / 100)
244 > sack->weight_limit)
244 { 245 {
245 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 246 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
246 return 0; 247 return 0;
247 } 248 }
248 249
251} 252}
252 253
253/* Pick up commands follow */ 254/* Pick up commands follow */
254 255
255/* pl = player (not always - monsters can use this now) 256/* pl = player (not always - monsters can use this now)
256 * op is the object to put tmp into, 257 * op is the object to put tmp into,
257 * tmp is the object to pick up, nrof is the number to 258 * tmp is the object to pick up, nrof is the number to
258 * pick up (0 means all of them) 259 * pick up (0 means all of them)
259 */ 260 */
260static void 261static void
261pick_up_object (object *pl, object *op, object *tmp, int nrof) 262pick_up_object (object *pl, object *op, object *tmp, int nrof)
262{ 263{
263 object *env = tmp->env;
264 uint32 weight, effective_weight_limit; 264 weight_t weight, effective_weight_limit;
265 int tmp_nrof = tmp->number_of (); 265 int tmp_nrof = tmp->number_of ();
266 266
267 /* IF the player is flying & trying to take the item out of a container 267 /* IF the player is flying & trying to take the item out of a container
268 * that is in his inventory, let him. tmp->env points to the container 268 * that is in his inventory, let him. tmp->env points to the container
269 * (sack, luggage, etc), tmp->env->env then points to the player (nested 269 * (sack, luggage, etc), tmp->env->env then points to the player (nested
270 * containers not allowed as of now) 270 * containers not allowed as of now)
271 */ 271 */
272 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 272 if ((pl->move_type & MOVE_FLYING) && !pl->flag [FLAG_WIZ] && tmp->in_player () != pl)
273 { 273 {
274 pl->failmsg ("You are levitating, you can't reach the ground! " 274 pl->failmsg ("You are levitating, you can't reach the ground! "
275 "H<You have to stop levitating first, if you can, either by using your levitation skill, " 275 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
276 "or waiting till the levitation effect wears off.>"); 276 "or waiting till the levitation effect wears off.>");
277 return; 277 return;
278 } 278 }
279 279
280 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 280 if (tmp->flag [FLAG_NO_DROP])
281 return; 281 return;
282 282
283 if (nrof > tmp_nrof || nrof <= 0) 283 if (nrof > tmp_nrof || nrof <= 0)
284 nrof = tmp_nrof; 284 nrof = tmp_nrof;
285 285
297 } 297 }
298 298
299 if (!can_split (pl, tmp, nrof)) 299 if (!can_split (pl, tmp, nrof))
300 return; 300 return;
301 301
302 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 302 if (tmp->flag [FLAG_UNPAID])
303 { 303 {
304 tmp->flag.reset (FLAG_UNPAID); 304 tmp->flag.reset (FLAG_UNPAID);
305 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)); 305 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));
306 tmp->flag.set (FLAG_UNPAID); 306 tmp->flag.set (FLAG_UNPAID);
307 } 307 }
362 count = tmp->nrof; 362 count = tmp->nrof;
363 363
364 /* container is open, so use it */ 364 /* container is open, so use it */
365 if (tmp->flag [FLAG_STARTEQUIP]) 365 if (tmp->flag [FLAG_STARTEQUIP])
366 alt = op; 366 alt = op;
367 else if (op->container) 367 else if ((alt = op->container_ ()))
368 { 368 {
369 alt = op->container;
370 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 369 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
371 goto leave; 370 goto leave;
372 } 371 }
373 else 372 else
374 { /* non container pickup */ 373 { /* non container pickup */
375 for (alt = op->inv; alt; alt = alt->below) 374 for (alt = op->inv; alt; alt = alt->below)
376 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && 375 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] &&
377 alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count)) 376 alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count))
378 break; /* perfect match */ 377 break; /* perfect match */
379 378
380 if (!alt) 379 if (!alt)
381 for (alt = op->inv; alt; alt = alt->below) 380 for (alt = op->inv; alt; alt = alt->below)
382 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count)) 381 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] && sack_can_hold (NULL, alt, tmp, count))
383 break; /* General container comes next */ 382 break; /* General container comes next */
384 383
385 if (!alt) 384 if (!alt)
386 alt = op; /* No free containers */ 385 alt = op; /* No free containers */
387 } 386 }
397#ifdef PICKUP_DEBUG 396#ifdef PICKUP_DEBUG
398 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); 397 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
399#endif 398#endif
400 399
401 /* startequip items are not allowed to be put into containers: */ 400 /* startequip items are not allowed to be put into containers: */
402 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 401 if (op->type == PLAYER && alt->type == CONTAINER && tmp->flag [FLAG_STARTEQUIP])
403 { 402 {
404 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!"); 403 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!");
405 goto leave; 404 goto leave;
406 } 405 }
407 406
428int 427int
429command_take (object *op, char *params) 428command_take (object *op, char *params)
430{ 429{
431 object *tmp, *next; 430 object *tmp, *next;
432 431
433 if (op->container) 432 if (op->container_ ())
434 tmp = op->container->inv; 433 tmp = op->container_ ()->inv;
435 else 434 else
436 { 435 {
437 tmp = op->above; 436 tmp = op->above;
438 if (tmp) 437 if (tmp)
439 while (tmp->above) 438 while (tmp->above)
451 450
452 /* Makes processing easier */ 451 /* Makes processing easier */
453 if (params && *params == '\0') 452 if (params && *params == '\0')
454 params = 0; 453 params = 0;
455 454
456 int cnt = MAX_ITEM_PER_DROP; 455 int cnt = MAX_ITEM_PER_ACTION;
457 456
458 while (tmp) 457 while (tmp)
459 { 458 {
460 next = tmp->below; 459 next = tmp->below;
461 460
505 504
506 return 0; 505 return 0;
507} 506}
508 507
509/* 508/*
510 * This function was part of drop, now is own function. 509 * This function was part of drop, now is own function.
511 * Player 'op' tries to put object 'tmp' into sack 'sack', 510 * Player 'op' tries to put object 'tmp' into sack 'sack',
512 * if nrof is non zero, then nrof objects is tried to put into sack. 511 * if nrof is non zero, then nrof objects is tried to put into sack.
513 * 512 *
514 * Note that the 'sack' in question can now be a transport, 513 * Note that the 'sack' in question can now be a transport,
515 * so this function isn't named very good anymore. 514 * so this function isn't named very good anymore.
516 */ 515 */
517void 516void
518put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 517put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
519{ 518{
520 object *tmp2, *sack2; 519 object *tmp2;
521 char buf[MAX_BUF]; 520 char buf[MAX_BUF];
522 521
523 if (sack == tmp) 522 if (sack == tmp)
524 return; /* Can't put an object in itself */ 523 return; /* Can't put an object in itself */
525 524
526 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 525 if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
527 { 526 {
528 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack)); 527 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
529 return; 528 return;
530 } 529 }
531 530
533 { 532 {
534 /* Eneq(@csd.uu.se): If the object to be dropped is a container 533 /* Eneq(@csd.uu.se): If the object to be dropped is a container
535 * we instead move the contents of that container into the active 534 * we instead move the contents of that container into the active
536 * container, this is only done if the object has something in it. 535 * container, this is only done if the object has something in it.
537 */ 536 */
538 sack2 = tmp;
539 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack)); 537 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack));
540 538
541 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 539 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
542 { 540 {
543 tmp = tmp2->below; 541 tmp = tmp2->below;
544 542
545 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 543 if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
546 put_object_in_sack (op, sack, tmp2, 0); 544 put_object_in_sack (op, sack, tmp2, 0);
547 else 545 else
548 { 546 {
549 sprintf (buf, "Your %s fills up.", query_name (sack)); 547 sprintf (buf, "Your %s fills up.", query_name (sack));
550 new_draw_info (NDI_UNIQUE, 0, op, buf); 548 new_draw_info (NDI_UNIQUE, 0, op, buf);
559 * already checked this. 557 * already checked this.
560 */ 558 */
561 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof))) 559 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
562 return; 560 return;
563 561
564 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 562 if (tmp->flag [FLAG_APPLIED])
565 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 563 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
566 return; 564 return;
567 565
568 /* we want to put some portion of the item into the container */ 566 /* we want to put some portion of the item into the container */
569 if (!can_split (op, tmp, nrof)) 567 if (!can_split (op, tmp, nrof))
570 return; 568 return;
571 569
572 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 570 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
573 sack->insert (tmp); 571 sack->insert (tmp);
574}
575
576/*
577 * This function was part of drop, now is own function.
578 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
579 * nrof objects is tried to dropped.
580 * This is used when dropping objects onto the floor.
581 */
582void
583drop_object (object *op, object *tmp, uint32 nrof)
584{
585 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
586 return;
587
588 if (QUERY_FLAG (tmp, FLAG_APPLIED))
589 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
590 return; /* can't unapply it */
591
592 /* We are only dropping some of the items. We split the current object
593 * off
594 */
595 if (!can_split (op, tmp, nrof))
596 return;
597
598 drop_object (op, tmp);
599
600 if (!tmp->destroyed () && !tmp->is_inserted ())
601 {
602 // if nothing happened with the object we give it back
603 op->insert (tmp);
604 }
605} 572}
606 573
607/* In contrast to drop_object (op, tmp, nrof) above this function takes the 574/* In contrast to drop_object (op, tmp, nrof) above this function takes the
608 * already split off object, and feeds it to the event handlers and does 575 * already split off object, and feeds it to the event handlers and does
609 * other magic with it. 576 * other magic with it.
621 return; 588 return;
622 589
623 if (obj->destroyed () || obj->is_inserted ()) 590 if (obj->destroyed () || obj->is_inserted ())
624 return; 591 return;
625 592
626 if (QUERY_FLAG (obj, FLAG_STARTEQUIP)) 593 if (obj->flag [FLAG_STARTEQUIP])
627 { 594 {
628 dropper->statusmsg (format ("You drop the %s.", query_name (obj))); 595 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
629 dropper->statusmsg ("The god who lent it to you retrieves it."); 596 dropper->statusmsg ("The god who lent it to you retrieves it.");
630 597
631 obj->destroy (); 598 obj->destroy ();
640 return; 607 return;
641 608
642 if (obj->destroyed () || obj->is_inserted ()) 609 if (obj->destroyed () || obj->is_inserted ())
643 return; 610 return;
644 611
645 if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY) 612 if (dropper->is_in_shop () && !obj->flag [FLAG_UNPAID] && obj->type != MONEY)
646 if (!sell_item (obj, dropper)) 613 if (!sell_item (obj, dropper))
647 return; 614 return;
615
616 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
617 return;
648 618
649 /* If nothing special happened with this object, the default action is to 619 /* If nothing special happened with this object, the default action is to
650 * insert it below the dropper: 620 * insert it below the dropper:
651 */ 621 */
652 622
653 obj->x = dropper->x; 623 obj->x = dropper->x;
654 obj->y = dropper->y; 624 obj->y = dropper->y;
655 625
656 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR); 626 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
627}
628
629/*
630 * This function was part of drop, now is own function.
631 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
632 * nrof objects are tried to drop.
633 * This is used when dropping objects onto the floor.
634 */
635void
636drop_object (object *op, object *tmp, uint32 nrof)
637{
638 if (tmp->flag [FLAG_NO_DROP])
639 return;
640
641 if (tmp->flag [FLAG_APPLIED])
642 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
643 return; /* can't unapply it */
644
645 /* We are only dropping some of the items. We split the current object
646 * off
647 */
648 if (!can_split (op, tmp, nrof))
649 return;
650
651 drop_object (op, tmp);
652
653 if (!tmp->destroyed () && !tmp->is_inserted ())
654 {
655 // if nothing happened with the object we give it back
656 op->insert (tmp);
657 }
657} 658}
658 659
659void 660void
660drop (object *op, object *tmp) 661drop (object *op, object *tmp)
661{ 662{
674 */ 675 */
675 tmp->destroy (); 676 tmp->destroy ();
676 return; 677 return;
677 } 678 }
678 else 679 else
679 {
680 while (tmp && tmp->invisible) 680 while (tmp && tmp->invisible)
681 tmp = tmp->below; 681 tmp = tmp->below;
682 }
683 } 682 }
684 683
685 if (tmp == NULL) 684 if (!tmp)
686 { 685 {
687 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 686 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
688 return; 687 return;
689 } 688 }
690 689
691 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 690 if (tmp->flag [FLAG_INV_LOCKED])
692 { 691 {
693 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 692 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
694 return; 693 return;
695 } 694 }
696 695
697 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 696 if (tmp->flag [FLAG_NO_DROP])
698 { 697 {
699#if 0 698#if 0
700 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 699 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
701 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 700 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
702#endif 701#endif
706 if (op->type == PLAYER && op->contr->last_used == tmp) 705 if (op->type == PLAYER && op->contr->last_used == tmp)
707 op->contr->last_used = tmp->below ? tmp->below 706 op->contr->last_used = tmp->below ? tmp->below
708 : tmp->above ? tmp->above 707 : tmp->above ? tmp->above
709 : (object *)0; 708 : (object *)0;
710 709
711 if (op->container) 710 if (op->container_ ())
712 { 711 {
713 if (op->type == PLAYER) 712 if (op->type == PLAYER)
714 put_object_in_sack (op, op->container, tmp, op->contr->count); 713 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
715 else 714 else
716 put_object_in_sack (op, op->container, tmp, 0); 715 put_object_in_sack (op, op->container_ (), tmp, 0);
717 } 716 }
718 else 717 else
719 { 718 {
720 if (op->type == PLAYER) 719 if (op->type == PLAYER)
721 drop_object (op, tmp, op->contr->count); 720 drop_object (op, tmp, op->contr->count);
739 } 738 }
740 739
741 object *curinv = op->inv; 740 object *curinv = op->inv;
742 object *nextinv; 741 object *nextinv;
743 742
744 /* 743 /*
745 This is the default. Drops everything not locked or considered 744 This is the default. Drops everything not locked or considered
746 not something that should be dropped. 745 not something that should be dropped.
747 */ 746 */
748 /* 747 /*
749 Care must be taken that the next item pointer is not to money as 748 Care must be taken that the next item pointer is not to money as
750 the drop() routine will do unknown things to it when dropping 749 the drop() routine will do unknown things to it when dropping
751 in a shop. --Tero.Pelander@utu.fi 750 in a shop. --Tero.Pelander@utu.fi
752 */ 751 */
753
754 int cnt = MAX_ITEM_PER_DROP; 752 int cnt = MAX_ITEM_PER_ACTION;
755 753
756 if (!params) 754 if (!params)
757 { 755 {
758 while (curinv) 756 while (curinv)
759 { 757 {
760 nextinv = curinv->below; 758 nextinv = curinv->below;
761 759
762 while (nextinv && nextinv->type == MONEY) 760 while (nextinv && nextinv->type == MONEY)
763 nextinv = nextinv->below; 761 nextinv = nextinv->below;
764 762
765 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 763 if (!curinv->flag [FLAG_INV_LOCKED]
766 curinv->type != FOOD && curinv->type != KEY && 764 && !curinv->invisible
767 curinv->type != SPECIAL_KEY && curinv->type != GEM && 765 && curinv->type != MONEY
768 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 766 && curinv->type != FOOD
767 && curinv->type != KEY
768 && curinv->type != SPECIAL_KEY
769 && curinv->type != GEM
770 && curinv->type != CONTAINER)
769 { 771 {
770 drop (op, curinv); 772 drop (op, curinv);
771 if (--cnt <= 0) break; 773 if (--cnt <= 0) break;
772 } 774 }
773 775
781 nextinv = curinv->below; 783 nextinv = curinv->below;
782 784
783 while (nextinv && nextinv->type == MONEY) 785 while (nextinv && nextinv->type == MONEY)
784 nextinv = nextinv->below; 786 nextinv = nextinv->below;
785 787
786 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 788 if (!curinv->flag [FLAG_INV_LOCKED] && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
787 { 789 {
788 drop (op, curinv); 790 drop (op, curinv);
789 if (--cnt <= 0) break; 791 if (--cnt <= 0) break;
790 } 792 }
791 793
799 nextinv = curinv->below; 801 nextinv = curinv->below;
800 802
801 while (nextinv && nextinv->type == MONEY) 803 while (nextinv && nextinv->type == MONEY)
802 nextinv = nextinv->below; 804 nextinv = nextinv->below;
803 805
804 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 806 if (!curinv->flag [FLAG_INV_LOCKED] && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
805 { 807 {
806 drop (op, curinv); 808 drop (op, curinv);
807 if (--cnt <= 0) break; 809 if (--cnt <= 0) break;
808 } 810 }
809 811
817 nextinv = curinv->below; 819 nextinv = curinv->below;
818 820
819 while (nextinv && nextinv->type == MONEY) 821 while (nextinv && nextinv->type == MONEY)
820 nextinv = nextinv->below; 822 nextinv = nextinv->below;
821 823
822 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 824 if (!curinv->flag [FLAG_INV_LOCKED] && !curinv->flag [FLAG_APPLIED])
823 { 825 {
824 switch (curinv->type) 826 switch (curinv->type)
825 { 827 {
826 case HORN: 828 case HORN:
827 case BOOK: 829 case BOOK:
867 * <cnt> can be a 0 pointer or a pointer to the maximum number of 869 * <cnt> can be a 0 pointer or a pointer to the maximum number of
868 * drop operations to perform. 870 * drop operations to perform.
869 * 871 *
870 * Returns true if at least one item was dropped. 872 * Returns true if at least one item was dropped.
871 */ 873 */
872bool 874static bool
873drop_vector (object *dropper, vector<object *> &objs, int *cnt) 875drop_vector (object *dropper, vector<object *> &objs, int *cnt)
874{ 876{
875 vector<object *>::iterator i; 877 vector<object *>::iterator i;
876 878
877 bool did_one = false; 879 bool did_one = false;
891 */ 893 */
892int 894int
893command_drop (object *op, char *params) 895command_drop (object *op, char *params)
894{ 896{
895 object *tmp, *next; 897 object *tmp, *next;
896 int did_one = 0;
897 898
898 if (!params) 899 if (!params)
899 { 900 {
900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 901 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
901 return 0; 902 return 0;
905 vector<object *> matched_objs; 906 vector<object *> matched_objs;
906 907
907 for (tmp = op->inv; tmp; tmp = next) 908 for (tmp = op->inv; tmp; tmp = next)
908 { 909 {
909 next = tmp->below; 910 next = tmp->below;
910 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 911 if (tmp->flag [FLAG_NO_DROP] || tmp->invisible)
911 continue; 912 continue;
912 913
913 if (item_matched_string (op, tmp, params)) 914 if (item_matched_string (op, tmp, params))
914 matched_objs.push_back (tmp); 915 matched_objs.push_back (tmp);
915 } 916 }
916 917
917 int cnt = MAX_ITEM_PER_DROP; 918 int cnt = MAX_ITEM_PER_ACTION;
918 919
919 if (!drop_vector (op, matched_objs, &cnt)) 920 if (!drop_vector (op, matched_objs, &cnt))
920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 921 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
921 922
922 if (cnt <= 0) 923 if (cnt <= 0)
950 } 951 }
951 952
952 return 0; 953 return 0;
953} 954}
954 955
955/* op should be a player.
956 * we return the object the player has marked with the 'mark' command
957 * below. If no match is found (or object has changed), we return
958 * NULL. We leave it up to the calling function to print messages if
959 * nothing is found.
960 */
961object *
962find_marked_object (object *op)
963{
964 object *tmp;
965
966 if (!op || !op->contr)
967 return NULL;
968
969 if (!op->contr->mark)
970 {
971/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
972 return 0;
973 }
974
975 /* This may seem like overkill, but we need to make sure that they
976 * player hasn't dropped the item. We use count on the off chance that
977 * an item got reincarnated at some point.
978 */
979 for (tmp = op->inv; tmp; tmp = tmp->below)
980 {
981 if (tmp->invisible)
982 continue;
983
984 if (tmp == op->contr->mark)
985 {
986 if (!tmp->destroyed ())
987 return tmp;
988 else
989 {
990 op->contr->mark = 0;
991/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
992 return 0;
993 }
994 }
995 }
996
997 return 0;
998}
999
1000std::string 956std::string
1001object::describe_monster (object *who) 957object::describe_monster (object *who)
1002{ 958{
1003 dynbuf_text buf (512, 512); 959 dynbuf_text buf (512, 512);
1004 960
1005 object *mon = head ? head : this; 961 object *mon = head ? head : this;
1006 962
1007 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 963 if (mon->flag [FLAG_UNDEAD])
1008 buf << "It is an undead force.\r"; 964 buf << "It is an undead force.\r";
1009 965
1010 if (mon->level > who->level) 966 if (mon->level > who->level)
1011 buf << "It is likely more powerful than you.\r"; 967 buf << "It is likely more powerful than you.\r";
1012 else if (mon->level < who->level) 968 else if (mon->level < who->level)
1069 case SHIELD: 1025 case SHIELD:
1070 case BOOTS: 1026 case BOOTS:
1071 case GLOVES: 1027 case GLOVES:
1072 case AMULET: 1028 case AMULET:
1073 case GIRDLE: 1029 case GIRDLE:
1030 case RANGED:
1074 case BOW: 1031 case BOW:
1075 case ARROW: 1032 case ARROW:
1076 case CLOAK: 1033 case CLOAK:
1077 case FOOD: 1034 case FOOD:
1078 case DRINK: 1035 case DRINK:
1099 */ 1056 */
1100void 1057void
1101examine_monster (object *op, object *tmp) 1058examine_monster (object *op, object *tmp)
1102{ 1059{
1103 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ()); 1060 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1104}
1105
1106static void
1107describe_dump_object (dynbuf &buf, object *ob)
1108{
1109 char *txt = dump_object (ob);
1110 for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r';
1111 buf << "\n" << txt << "\n";
1112
1113 if (!ob->is_arch ())
1114 describe_dump_object (buf, ob->arch);
1115}
1116
1117std::string
1118object::describe (object *who)
1119{
1120 dynbuf_text buf (1024, 1024);
1121
1122 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1123
1124 if (custom_name)
1125 buf.printf ("You call it %s.\r", &custom_name);
1126
1127 switch (type)
1128 {
1129 case SPELLBOOK:
1130 if (flag [FLAG_IDENTIFIED] && inv)
1131 buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1132 break;
1133
1134 case BOOK:
1135 if (msg)
1136 buf << "Something is written in it.\r";
1137 break;
1138
1139 case CONTAINER:
1140 if (race)
1141 {
1142 if (weight_limit && stats.Str < 100)
1143 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1144 &race, weight_limit / (10.0 * (100 - stats.Str)));
1145 else
1146 buf.printf ("It can hold only %s.\r", &race);
1147 }
1148 else if (weight_limit && stats.Str < 100)
1149 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1150 break;
1151
1152 case WAND:
1153 if (flag [FLAG_IDENTIFIED])
1154 buf.printf ("It has %d charges left.\r", stats.food);
1155 break;
1156 }
1157
1158 if (materialname && !msg)
1159 buf << (nrof > 1 ? "They are made of " : "It is made of ")
1160 << materialname
1161 << '\r';
1162
1163 if (who)
1164 /* Where to wear this item */
1165 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1166 if (slot[i].info)
1167 {
1168 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1169
1170 if (slot[i].info < -1 && who->slot[i].info)
1171 buf.printf ("(%d)", -slot[i].info);
1172
1173 buf << ".\r";
1174 }
1175
1176 if (weight)
1177 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1178
1179 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1180 {
1181 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1182
1183 if (is_in_shop (who))
1184 {
1185 if (flag [FLAG_UNPAID])
1186 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1187 else
1188 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1189 }
1190 }
1191
1192 if (flag [FLAG_MONSTER])
1193 buf << describe_monster (who);
1194
1195 /* Is this item buildable? */
1196 if (flag [FLAG_IS_BUILDABLE])
1197 buf << "This is a buildable item.\r";
1198
1199 /* Does the object have a message? Don't show message for all object
1200 * types - especially if the first entry is a match
1201 */
1202 if (msg)
1203 {
1204 if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1205 {
1206 buf << '\r';
1207
1208 /* This is just a hack so when identifying the items, we print
1209 * out the extra message
1210 */
1211 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1212 buf << "The object has a story:\r";
1213
1214 buf << msg << '\n';
1215 }
1216 }
1217 else if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1218 && (type == SPELLBOOK || type == ROD || type == WAND
1219 || type == ROD || type == POTION || type == SCROLL))
1220 // for spellbooks and other stuff that contains spells, print the spell message,
1221 // unless the object has a custom message handled above.
1222 buf << '\r' << inv->msg << '\n';
1223
1224 // try to display the duration for some potions and scrolls
1225 // this includes change ability potions and group spells,
1226 // but does not handle protection potions
1227 if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1228 && (type == POTION || type == SCROLL))
1229 {
1230 object *spell = inv;
1231
1232 if (spell->subtype == SP_PARTY_SPELL)
1233 spell = spell->other_arch;
1234
1235 if (spell->subtype == SP_CHANGE_ABILITY)
1236 buf.printf ("\nH<The effect will last about %.10g seconds.>",
1237 TICK2TIME (change_ability_duration (spell, this)));
1238 }
1239
1240 // Display a hint about inscribable items [empty books]
1241 // This includes the amount of text they can hold.
1242 if (type == INSCRIBABLE)
1243 {
1244 if (other_arch && other_arch->type == SCROLL)
1245 buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
1246 else
1247 buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
1248 weight_limit);
1249 }
1250
1251 buf << '\n';
1252
1253 // the dungeon master additionally gets a complete dump
1254 if (who && who->flag [FLAG_WIZLOOK])
1255 {
1256 buf << "\nT<Object>\n";
1257 describe_dump_object (buf, this);
1258
1259 if (inv)
1260 {
1261 buf << "\nT<Top Inventory>\n";
1262 describe_dump_object (buf, inv);
1263 }
1264 }
1265
1266 return std::string (buf.linearise (), buf.size ());
1267} 1061}
1268 1062
1269static void 1063static void
1270display_new_pickup (object *op) 1064display_new_pickup (object *op)
1271{ 1065{
1377} 1171}
1378 1172
1379int 1173int
1380command_search_items (object *op, char *params) 1174command_search_items (object *op, char *params)
1381{ 1175{
1382 char buf[MAX_BUF];
1383
1384 if (params == NULL) 1176 if (params == NULL)
1385 { 1177 {
1386 if (op->contr->search_str[0] == '\0') 1178 if (op->contr->search_str[0] == '\0')
1387 { 1179 {
1388 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1"); 1180 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1391 return 1; 1183 return 1;
1392 } 1184 }
1393 1185
1394 op->contr->search_str[0] = '\0'; 1186 op->contr->search_str[0] = '\0';
1395 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1187 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1396 op->update_stats (); 1188 op->contr->queue_stats_update ();
1397 return 1; 1189 return 1;
1398 } 1190 }
1399 1191
1400 if (strlen (params) >= MAX_BUF) 1192 if (strlen (params) >= sizeof (op->contr->search_str))
1401 { 1193 {
1402 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1194 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1403 return 1; 1195 return 1;
1404 } 1196 }
1405 1197
1406 strcpy (op->contr->search_str, params); 1198 strcpy (op->contr->search_str, params);
1407 sprintf (buf, "Now searching for '%s'.", op->contr->search_str); 1199 new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1408 new_draw_info (NDI_UNIQUE, 0, op, buf); 1200 op->contr->queue_stats_update ();
1409 op->update_stats ();
1410 1201
1411 return 1; 1202 return 1;
1412} 1203}
1413 1204
1205int
1206command_unlock (object *op, char *params)
1207{
1208 /* if the unlock command typed with nothing, unlock everything,
1209 * this might be bad
1210 */
1211 if (params == NULL)
1212 {
1213 for (object *item = op->inv; item; item = item->below)
1214 {
1215 item->clr_flag (FLAG_INV_LOCKED);
1216 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
1217 esrv_update_item (UPD_FLAGS, op, item);
1218 }
1219 return 0;
1220 }
1221
1222 /* if the unlock command is used with a param,
1223 * unlock what matches. i.e. unlock material, should unlock all the materials
1224 */
1225 for (object *item = op->inv; item; item = item->below)
1226 if (item->name.contains (params))
1227 {
1228 item->clr_flag (FLAG_INV_LOCKED);
1229 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
1230 esrv_update_item (UPD_FLAGS, op, item);
1231 }
1232
1233 return 0;
1234}
1235
1236int
1237command_lock (object *op, char *params)
1238{
1239 /* if the lock command is typed by itself, lock everything
1240 */
1241 if (params == NULL)
1242 {
1243 for (object *item = op->inv; item; item = item->below)
1244 {
1245 item->set_flag (FLAG_INV_LOCKED);
1246 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
1247 esrv_update_item (UPD_FLAGS, op, item);
1248 }
1249 return 0;
1250 }
1251
1252 /* if the lock command is used with a param, lock what matches.
1253 * i.e. lock material, should lock all the materials
1254 */
1255 for (object *item = op->inv; item; item = item->below)
1256 if (item->name.contains (params))
1257 {
1258 item->set_flag (FLAG_INV_LOCKED);
1259 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
1260 esrv_update_item (UPD_FLAGS, op, item);
1261 }
1262
1263 return 0;
1264}
1265
1266/* op should be a player, params is any params.
1267 * If no params given, we print out the currently marked object.
1268 * otherwise, try to find a matching object - try best match first.
1269 */
1270int
1271command_mark (object *op, char *params)
1272{
1273 if (!params)
1274 {
1275 if (object *mark = op->mark ())
1276 op->statusmsg (format ("%s is marked.", query_name (mark)));
1277 else
1278 op->failmsg ("You have no marked object.");
1279 }
1280 else
1281 {
1282 if (object *mark = find_best_object_match (op, params))
1283 {
1284 op->contr->mark = mark;
1285 op->statusmsg (format ("Marked item %s", query_name (mark)));
1286 }
1287 else
1288 op->failmsgf ("Could not find an object that matches %s", params);
1289 }
1290
1291 return 0; /*shouldnt get here */
1292}
1293

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines