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.93 by root, Wed Sep 16 22:50:50 2009 UTC vs.
Revision 1.133 by root, Sun Jan 29 02:47:05 2017 UTC

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

Diff Legend

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