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.106 by root, Wed Nov 11 04:45:22 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 34
35/* 35/*
… …
68 68
69 int tmpmatch = item_matched_string (pl, tmp, params); 69 int tmpmatch = item_matched_string (pl, tmp, params);
70 70
71 if (tmpmatch > match_val) 71 if (tmpmatch > match_val)
72 { 72 {
73 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED))) 73 if ((aflag == AP_APPLY) && (tmp->flag [FLAG_APPLIED]))
74 continue; 74 continue;
75 75
76 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) 76 if ((aflag == AP_UNAPPLY) && (!tmp->flag [FLAG_APPLIED]))
77 continue; 77 continue;
78 78
79 match_val = tmpmatch; 79 match_val = tmpmatch;
80 best = tmp; 80 best = tmp;
81 } 81 }
… …
137 137
138 skill = find_skill_by_name_fuzzy (pl, params); 138 skill = find_skill_by_name_fuzzy (pl, params);
139 139
140 if (!skill) 140 if (!skill)
141 { 141 {
142 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);
143 return 0; 143 return 0;
144 } 144 }
145 145
146 pl->change_skill (0); 146 pl->apply (skill);
147 apply_special (pl, skill, AP_APPLY);
148 return 1; 147 return 1;
149} 148}
150 149
151/* 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
152 * as it includes the object to throw. 151 * as it includes the object to throw.
153 */ 152 */
154int 153int
155command_throw (object *op, char *params) 154command_throw (object *op, char *params)
156{ 155{
157 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING])) 156 if (object *skop = find_skill_by_name (op, shstr_throwing))
158 return do_skill (op, op, skop, op->facing, params); 157 return do_skill (op, op, skop, op->facing, params);
159 else 158 else
160 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.");
161 160
162 return 0; 161 return 0;
163} 162}
164 163
165int 164int
… …
191 190
192 while (*params == ' ') 191 while (*params == ' ')
193 params++; 192 params++;
194 193
195 if (object *inv = find_best_apply_object_match (op, params, aflag)) 194 if (object *inv = find_best_apply_object_match (op, params, aflag))
196 player_apply (op, inv, aflag, 0); 195 op->apply (inv, aflag);
197 else 196 else
198 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);
199 } 198 }
200 199
201 return 0; 200 return 0;
202} 201}
203 202
… …
211 * not need to use split_ob and stuff. 210 * not need to use split_ob and stuff.
212 */ 211 */
213int 212int
214sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 213sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
215{ 214{
216 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 215 if (!sack->flag [FLAG_APPLIED])
217 { 216 {
218 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));
219 return 0; 218 return 0;
220 } 219 }
221 220
… …
225 return 0; 224 return 0;
226 } 225 }
227 226
228 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)))
229 { 228 {
230 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));
231 return 0; 230 return 0;
232 } 231 }
233 232
234 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 233 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
235 { 234 {
236 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));
237 return 0; 236 return 0;
238 } 237 }
239 238
240 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 239 if (sack->weight_limit
240 && weight_t (sack->carrying
241 + sack->number_of ()
241 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 242 * (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
242 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 243 * (100 - sack->stats.Str) / 100)
244 > sack->weight_limit)
243 { 245 {
244 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));
245 return 0; 247 return 0;
246 } 248 }
247 249
… …
250} 252}
251 253
252/* Pick up commands follow */ 254/* Pick up commands follow */
253 255
254/* pl = player (not always - monsters can use this now) 256/* pl = player (not always - monsters can use this now)
255 * op is the object to put tmp into, 257 * op is the object to put tmp into,
256 * 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
257 * pick up (0 means all of them) 259 * pick up (0 means all of them)
258 */ 260 */
259static void 261static void
260pick_up_object (object *pl, object *op, object *tmp, int nrof) 262pick_up_object (object *pl, object *op, object *tmp, int nrof)
261{ 263{
262 object *env = tmp->env;
263 uint32 weight, effective_weight_limit; 264 weight_t weight, effective_weight_limit;
264 int tmp_nrof = tmp->number_of (); 265 int tmp_nrof = tmp->number_of ();
265 266
266 /* 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
267 * 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
268 * (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
269 * containers not allowed as of now) 270 * containers not allowed as of now)
270 */ 271 */
271 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)
272 { 273 {
273 pl->failmsg ("You are levitating, you can't reach the ground! " 274 pl->failmsg ("You are levitating, you can't reach the ground! "
274 "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, "
275 "or waiting till the levitation effect wears off.>"); 276 "or waiting till the levitation effect wears off.>");
276 return; 277 return;
277 } 278 }
278 279
279 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 280 if (tmp->flag [FLAG_NO_DROP])
280 return; 281 return;
281 282
282 if (nrof > tmp_nrof || nrof <= 0) 283 if (nrof > tmp_nrof || nrof <= 0)
283 nrof = tmp_nrof; 284 nrof = tmp_nrof;
284 285
… …
296 } 297 }
297 298
298 if (!can_split (pl, tmp, nrof)) 299 if (!can_split (pl, tmp, nrof))
299 return; 300 return;
300 301
301 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 302 if (tmp->flag [FLAG_UNPAID])
302 { 303 {
303 tmp->flag.reset (FLAG_UNPAID); 304 tmp->flag.reset (FLAG_UNPAID);
304 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));
305 tmp->flag.set (FLAG_UNPAID); 306 tmp->flag.set (FLAG_UNPAID);
306 } 307 }
… …
369 goto leave; 370 goto leave;
370 } 371 }
371 else 372 else
372 { /* non container pickup */ 373 { /* non container pickup */
373 for (alt = op->inv; alt; alt = alt->below) 374 for (alt = op->inv; alt; alt = alt->below)
374 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && 375 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] &&
375 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))
376 break; /* perfect match */ 377 break; /* perfect match */
377 378
378 if (!alt) 379 if (!alt)
379 for (alt = op->inv; alt; alt = alt->below) 380 for (alt = op->inv; alt; alt = alt->below)
380 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))
381 break; /* General container comes next */ 382 break; /* General container comes next */
382 383
383 if (!alt) 384 if (!alt)
384 alt = op; /* No free containers */ 385 alt = op; /* No free containers */
385 } 386 }
… …
395#ifdef PICKUP_DEBUG 396#ifdef PICKUP_DEBUG
396 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);
397#endif 398#endif
398 399
399 /* startequip items are not allowed to be put into containers: */ 400 /* startequip items are not allowed to be put into containers: */
400 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 401 if (op->type == PLAYER && alt->type == CONTAINER && tmp->flag [FLAG_STARTEQUIP])
401 { 402 {
402 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!");
403 goto leave; 404 goto leave;
404 } 405 }
405 406
… …
503 504
504 return 0; 505 return 0;
505} 506}
506 507
507/* 508/*
508 * This function was part of drop, now is own function. 509 * This function was part of drop, now is own function.
509 * Player 'op' tries to put object 'tmp' into sack 'sack', 510 * Player 'op' tries to put object 'tmp' into sack 'sack',
510 * 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.
511 * 512 *
512 * Note that the 'sack' in question can now be a transport, 513 * Note that the 'sack' in question can now be a transport,
513 * so this function isn't named very good anymore. 514 * so this function isn't named very good anymore.
514 */ 515 */
515void 516void
516put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 517put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
517{ 518{
518 object *tmp2, *sack2; 519 object *tmp2;
519 char buf[MAX_BUF]; 520 char buf[MAX_BUF];
520 521
521 if (sack == tmp) 522 if (sack == tmp)
522 return; /* Can't put an object in itself */ 523 return; /* Can't put an object in itself */
523 524
524 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP)) 525 if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
525 { 526 {
526 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));
527 return; 528 return;
528 } 529 }
529 530
… …
531 { 532 {
532 /* 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
533 * we instead move the contents of that container into the active 534 * we instead move the contents of that container into the active
534 * 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.
535 */ 536 */
536 sack2 = tmp;
537 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));
538 538
539 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 539 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
540 { 540 {
541 tmp = tmp2->below; 541 tmp = tmp2->below;
… …
557 * already checked this. 557 * already checked this.
558 */ 558 */
559 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)))
560 return; 560 return;
561 561
562 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 562 if (tmp->flag [FLAG_APPLIED])
563 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 563 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
564 return; 564 return;
565 565
566 /* 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 */
567 if (!can_split (op, tmp, nrof)) 567 if (!can_split (op, tmp, nrof))
568 return; 568 return;
… …
588 return; 588 return;
589 589
590 if (obj->destroyed () || obj->is_inserted ()) 590 if (obj->destroyed () || obj->is_inserted ())
591 return; 591 return;
592 592
593 if (QUERY_FLAG (obj, FLAG_STARTEQUIP)) 593 if (obj->flag [FLAG_STARTEQUIP])
594 { 594 {
595 dropper->statusmsg (format ("You drop the %s.", query_name (obj))); 595 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
596 dropper->statusmsg ("The god who lent it to you retrieves it."); 596 dropper->statusmsg ("The god who lent it to you retrieves it.");
597 597
598 obj->destroy (); 598 obj->destroy ();
… …
607 return; 607 return;
608 608
609 if (obj->destroyed () || obj->is_inserted ()) 609 if (obj->destroyed () || obj->is_inserted ())
610 return; 610 return;
611 611
612 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)
613 if (!sell_item (obj, dropper)) 613 if (!sell_item (obj, dropper))
614 return; 614 return;
615 615
616 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper)) 616 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
617 return; 617 return;
618 618
619 /* 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
… …
633 * This is used when dropping objects onto the floor. 633 * This is used when dropping objects onto the floor.
634 */ 634 */
635void 635void
636drop_object (object *op, object *tmp, uint32 nrof) 636drop_object (object *op, object *tmp, uint32 nrof)
637{ 637{
638 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 638 if (tmp->flag [FLAG_NO_DROP])
639 return; 639 return;
640 640
641 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 641 if (tmp->flag [FLAG_APPLIED])
642 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 642 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
643 return; /* can't unapply it */ 643 return; /* can't unapply it */
644 644
645 /* We are only dropping some of the items. We split the current object 645 /* We are only dropping some of the items. We split the current object
646 * off 646 * off
647 */ 647 */
… …
685 { 685 {
686 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.");
687 return; 687 return;
688 } 688 }
689 689
690 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 690 if (tmp->flag [FLAG_INV_LOCKED])
691 { 691 {
692 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 692 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
693 return; 693 return;
694 } 694 }
695 695
696 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 696 if (tmp->flag [FLAG_NO_DROP])
697 { 697 {
698#if 0 698#if 0
699 /* 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. */
700 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.");
701#endif 701#endif
… …
738 } 738 }
739 739
740 object *curinv = op->inv; 740 object *curinv = op->inv;
741 object *nextinv; 741 object *nextinv;
742 742
743 /* 743 /*
744 This is the default. Drops everything not locked or considered 744 This is the default. Drops everything not locked or considered
745 not something that should be dropped. 745 not something that should be dropped.
746 */ 746 */
747 /* 747 /*
748 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
… …
758 nextinv = curinv->below; 758 nextinv = curinv->below;
759 759
760 while (nextinv && nextinv->type == MONEY) 760 while (nextinv && nextinv->type == MONEY)
761 nextinv = nextinv->below; 761 nextinv = nextinv->below;
762 762
763 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) 763 if (!curinv->flag [FLAG_INV_LOCKED]
764 && !curinv->invisible
764 && curinv->type != MONEY 765 && curinv->type != MONEY
765 && curinv->type != FOOD 766 && curinv->type != FOOD
766 && curinv->type != KEY 767 && curinv->type != KEY
767 && curinv->type != SPECIAL_KEY 768 && curinv->type != SPECIAL_KEY
768 && curinv->type != GEM 769 && curinv->type != GEM
769 && !curinv->invisible 770 && curinv->type != CONTAINER)
770 && (curinv->type != CONTAINER || op->container_ () != curinv))
771 { 771 {
772 drop (op, curinv); 772 drop (op, curinv);
773 if (--cnt <= 0) break; 773 if (--cnt <= 0) break;
774 } 774 }
775 775
… …
783 nextinv = curinv->below; 783 nextinv = curinv->below;
784 784
785 while (nextinv && nextinv->type == MONEY) 785 while (nextinv && nextinv->type == MONEY)
786 nextinv = nextinv->below; 786 nextinv = nextinv->below;
787 787
788 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)))
789 { 789 {
790 drop (op, curinv); 790 drop (op, curinv);
791 if (--cnt <= 0) break; 791 if (--cnt <= 0) break;
792 } 792 }
793 793
… …
801 nextinv = curinv->below; 801 nextinv = curinv->below;
802 802
803 while (nextinv && nextinv->type == MONEY) 803 while (nextinv && nextinv->type == MONEY)
804 nextinv = nextinv->below; 804 nextinv = nextinv->below;
805 805
806 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))
807 { 807 {
808 drop (op, curinv); 808 drop (op, curinv);
809 if (--cnt <= 0) break; 809 if (--cnt <= 0) break;
810 } 810 }
811 811
… …
819 nextinv = curinv->below; 819 nextinv = curinv->below;
820 820
821 while (nextinv && nextinv->type == MONEY) 821 while (nextinv && nextinv->type == MONEY)
822 nextinv = nextinv->below; 822 nextinv = nextinv->below;
823 823
824 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 824 if (!curinv->flag [FLAG_INV_LOCKED] && !curinv->flag [FLAG_APPLIED])
825 { 825 {
826 switch (curinv->type) 826 switch (curinv->type)
827 { 827 {
828 case HORN: 828 case HORN:
829 case BOOK: 829 case BOOK:
… …
893 */ 893 */
894int 894int
895command_drop (object *op, char *params) 895command_drop (object *op, char *params)
896{ 896{
897 object *tmp, *next; 897 object *tmp, *next;
898 int did_one = 0;
899 898
900 if (!params) 899 if (!params)
901 { 900 {
902 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 901 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
903 return 0; 902 return 0;
… …
907 vector<object *> matched_objs; 906 vector<object *> matched_objs;
908 907
909 for (tmp = op->inv; tmp; tmp = next) 908 for (tmp = op->inv; tmp; tmp = next)
910 { 909 {
911 next = tmp->below; 910 next = tmp->below;
912 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 911 if (tmp->flag [FLAG_NO_DROP] || tmp->invisible)
913 continue; 912 continue;
914 913
915 if (item_matched_string (op, tmp, params)) 914 if (item_matched_string (op, tmp, params))
916 matched_objs.push_back (tmp); 915 matched_objs.push_back (tmp);
917 } 916 }
… …
952 } 951 }
953 952
954 return 0; 953 return 0;
955} 954}
956 955
957/* op should be a player.
958 * we return the object the player has marked with the 'mark' command
959 * below. If no match is found (or object has changed), we return
960 * NULL. We leave it up to the calling function to print messages if
961 * nothing is found.
962 */
963object *
964find_marked_object (object *op)
965{
966 object *tmp;
967
968 if (!op || !op->contr)
969 return NULL;
970
971 if (!op->contr->mark)
972 {
973/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
974 return 0;
975 }
976
977 /* This may seem like overkill, but we need to make sure that they
978 * player hasn't dropped the item. We use count on the off chance that
979 * an item got reincarnated at some point.
980 */
981 for (tmp = op->inv; tmp; tmp = tmp->below)
982 {
983 if (tmp->invisible)
984 continue;
985
986 if (tmp == op->contr->mark)
987 {
988 if (!tmp->destroyed ())
989 return tmp;
990 else
991 {
992 op->contr->mark = 0;
993/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
994 return 0;
995 }
996 }
997 }
998
999 return 0;
1000}
1001
1002std::string 956std::string
1003object::describe_monster (object *who) 957object::describe_monster (object *who)
1004{ 958{
1005 dynbuf_text buf (512, 512); 959 dynbuf_text buf (512, 512);
1006 960
1007 object *mon = head ? head : this; 961 object *mon = head ? head : this;
1008 962
1009 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 963 if (mon->flag [FLAG_UNDEAD])
1010 buf << "It is an undead force.\r"; 964 buf << "It is an undead force.\r";
1011 965
1012 if (mon->level > who->level) 966 if (mon->level > who->level)
1013 buf << "It is likely more powerful than you.\r"; 967 buf << "It is likely more powerful than you.\r";
1014 else if (mon->level < who->level) 968 else if (mon->level < who->level)
… …
1071 case SHIELD: 1025 case SHIELD:
1072 case BOOTS: 1026 case BOOTS:
1073 case GLOVES: 1027 case GLOVES:
1074 case AMULET: 1028 case AMULET:
1075 case GIRDLE: 1029 case GIRDLE:
1030 case RANGED:
1076 case BOW: 1031 case BOW:
1077 case ARROW: 1032 case ARROW:
1078 case CLOAK: 1033 case CLOAK:
1079 case FOOD: 1034 case FOOD:
1080 case DRINK: 1035 case DRINK:
… …
1101 */ 1056 */
1102void 1057void
1103examine_monster (object *op, object *tmp) 1058examine_monster (object *op, object *tmp)
1104{ 1059{
1105 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 ());
1106}
1107
1108static void
1109describe_dump_object (dynbuf &buf, object *ob)
1110{
1111 char *txt = dump_object (ob);
1112 for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r';
1113 buf << "\n" << txt << "\n";
1114
1115 if (!ob->is_arch ())
1116 describe_dump_object (buf, ob->arch);
1117}
1118
1119std::string
1120object::describe (object *who)
1121{
1122 dynbuf_text buf (1024, 1024);
1123
1124 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1125
1126 if (custom_name)
1127 buf.printf ("You call it %s.\r", &custom_name);
1128
1129 switch (type)
1130 {
1131 case SPELLBOOK:
1132 if (flag [FLAG_IDENTIFIED] && inv)
1133 buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1134 break;
1135
1136 case BOOK:
1137 if (msg)
1138 buf << "Something is written in it.\r";
1139 break;
1140
1141 case CONTAINER:
1142 if (race)
1143 {
1144 if (weight_limit && stats.Str < 100)
1145 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1146 &race, weight_limit / (10.0 * (100 - stats.Str)));
1147 else
1148 buf.printf ("It can hold only %s.\r", &race);
1149 }
1150 else if (weight_limit && stats.Str < 100)
1151 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1152 break;
1153
1154 case WAND:
1155 if (flag [FLAG_IDENTIFIED])
1156 buf.printf ("It has %d charges left.\r", stats.food);
1157 break;
1158 }
1159
1160 if (material != MATERIAL_NULL && !msg)
1161 buf << (nrof > 1 ? "They are made of " : "It is made of ")
1162 << material->description
1163 << ".\r";
1164
1165 if (who)
1166 /* Where to wear this item */
1167 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1168 if (slot[i].info)
1169 {
1170 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1171
1172 if (slot[i].info < -1 && who->slot[i].info)
1173 buf.printf ("(%d)", -slot[i].info);
1174
1175 buf << ".\r";
1176 }
1177
1178 if (weight)
1179 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1180
1181 if (flag [FLAG_STARTEQUIP])
1182 buf << (nrof > 1 ? "They were" : "It was")
1183 << " given by a god and will vanish when dropped.\r";
1184
1185 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1186 {
1187 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1188
1189 if (is_in_shop (who))
1190 {
1191 if (flag [FLAG_UNPAID])
1192 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1193 else
1194 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1195 }
1196 }
1197
1198 if (flag [FLAG_MONSTER])
1199 buf << describe_monster (who);
1200
1201 /* Is this item buildable? */
1202 if (flag [FLAG_IS_BUILDABLE])
1203 buf << "This is a buildable item.\r";
1204
1205 /* Does the object have a message? Don't show message for all object
1206 * types - especially if the first entry is a match
1207 */
1208 if (msg)
1209 {
1210 if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1211 {
1212 buf << '\r';
1213
1214 /* This is just a hack so when identifying the items, we print
1215 * out the extra message
1216 */
1217 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1218 buf << "The object has a story:\r";
1219
1220 buf << msg << '\n';
1221 }
1222 }
1223 else if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1224 && (type == SPELLBOOK || type == ROD || type == WAND
1225 || type == ROD || type == POTION || type == SCROLL))
1226 // for spellbooks and other stuff that contains spells, print the spell message,
1227 // unless the object has a custom message handled above.
1228 buf << '\r' << inv->msg << '\n';
1229
1230 // try to display the duration for some potions and scrolls
1231 // this includes change ability potions and group spells,
1232 // but does not handle protection potions
1233 if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1234 && (type == POTION || type == SCROLL))
1235 {
1236 object *spell = inv;
1237
1238 if (spell->subtype == SP_PARTY_SPELL)
1239 spell = spell->other_arch;
1240
1241 if (spell->subtype == SP_CHANGE_ABILITY)
1242 buf.printf ("\nH<The effect will last about %.10g seconds.>",
1243 TICK2TIME (change_ability_duration (spell, this)));
1244 }
1245
1246 // Display a hint about inscribable items [empty books]
1247 // This includes the amount of text they can hold.
1248 if (type == INSCRIBABLE)
1249 {
1250 if (other_arch && other_arch->type == SCROLL)
1251 buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
1252 else
1253 buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
1254 weight_limit);
1255 }
1256
1257 buf << '\n';
1258
1259 // the dungeon master additionally gets a complete dump
1260 if (who && who->flag [FLAG_WIZLOOK])
1261 {
1262 buf << "\nT<Object>\n";
1263 describe_dump_object (buf, this);
1264
1265 if (inv)
1266 {
1267 buf << "\nT<Top Inventory>\n";
1268 describe_dump_object (buf, inv);
1269 }
1270 }
1271
1272 return std::string (buf.linearise (), buf.size ());
1273} 1061}
1274 1062
1275static void 1063static void
1276display_new_pickup (object *op) 1064display_new_pickup (object *op)
1277{ 1065{
… …
1412 op->contr->queue_stats_update (); 1200 op->contr->queue_stats_update ();
1413 1201
1414 return 1; 1202 return 1;
1415} 1203}
1416 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