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.86 by root, Sun Dec 28 16:35:32 2008 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 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 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your 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 GNU General Public License 19 * 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/>. 20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
20 * 22 *
21 * 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>
22 */ 24 */
23 25
24/* 26/*
25 * Object (handling) commands 27 * Object (handling) commands
26 */ 28 */
27 29
28#include <global.h> 30#include <global.h>
29#include <loader.h>
30#include <skills.h> 31#include <skills.h>
31#include <sproto.h> 32#include <sproto.h>
32#include <living.h> 33#include <living.h>
33#include <math.h>
34 34
35/* 35/*
36 * Object id parsing functions 36 * Object id parsing functions
37 */ 37 */
38 38
… …
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 }
… …
133 { 133 {
134 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); 134 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
135 return 0; 135 return 0;
136 } 136 }
137 137
138 skill = find_skill_by_name (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 }
… …
361 count = tmp->nrof; 362 count = tmp->nrof;
362 363
363 /* container is open, so use it */ 364 /* container is open, so use it */
364 if (tmp->flag [FLAG_STARTEQUIP]) 365 if (tmp->flag [FLAG_STARTEQUIP])
365 alt = op; 366 alt = op;
366 else if (op->container) 367 else if ((alt = op->container_ ()))
367 { 368 {
368 alt = op->container;
369 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 369 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
370 goto leave; 370 goto leave;
371 } 371 }
372 else 372 else
373 { /* non container pickup */ 373 { /* non container pickup */
374 for (alt = op->inv; alt; alt = alt->below) 374 for (alt = op->inv; alt; alt = alt->below)
375 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && 375 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] &&
376 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))
377 break; /* perfect match */ 377 break; /* perfect match */
378 378
379 if (!alt) 379 if (!alt)
380 for (alt = op->inv; alt; alt = alt->below) 380 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)) 381 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] && sack_can_hold (NULL, alt, tmp, count))
382 break; /* General container comes next */ 382 break; /* General container comes next */
383 383
384 if (!alt) 384 if (!alt)
385 alt = op; /* No free containers */ 385 alt = op; /* No free containers */
386 } 386 }
… …
396#ifdef PICKUP_DEBUG 396#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); 397 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
398#endif 398#endif
399 399
400 /* startequip items are not allowed to be put into containers: */ 400 /* startequip items are not allowed to be put into containers: */
401 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 401 if (op->type == PLAYER && alt->type == CONTAINER && tmp->flag [FLAG_STARTEQUIP])
402 { 402 {
403 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!");
404 goto leave; 404 goto leave;
405 } 405 }
406 406
… …
427int 427int
428command_take (object *op, char *params) 428command_take (object *op, char *params)
429{ 429{
430 object *tmp, *next; 430 object *tmp, *next;
431 431
432 if (op->container) 432 if (op->container_ ())
433 tmp = op->container->inv; 433 tmp = op->container_ ()->inv;
434 else 434 else
435 { 435 {
436 tmp = op->above; 436 tmp = op->above;
437 if (tmp) 437 if (tmp)
438 while (tmp->above) 438 while (tmp->above)
… …
450 450
451 /* Makes processing easier */ 451 /* Makes processing easier */
452 if (params && *params == '\0') 452 if (params && *params == '\0')
453 params = 0; 453 params = 0;
454 454
455 int cnt = MAX_ITEM_PER_DROP; 455 int cnt = MAX_ITEM_PER_ACTION;
456 456
457 while (tmp) 457 while (tmp)
458 { 458 {
459 next = tmp->below; 459 next = tmp->below;
460 460
… …
504 504
505 return 0; 505 return 0;
506} 506}
507 507
508/* 508/*
509 * This function was part of drop, now is own function. 509 * This function was part of drop, now is own function.
510 * Player 'op' tries to put object 'tmp' into sack 'sack', 510 * 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. 511 * if nrof is non zero, then nrof objects is tried to put into sack.
512 * 512 *
513 * Note that the 'sack' in question can now be a transport, 513 * Note that the 'sack' in question can now be a transport,
514 * so this function isn't named very good anymore. 514 * so this function isn't named very good anymore.
515 */ 515 */
516void 516void
517put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 517put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
518{ 518{
519 object *tmp2, *sack2; 519 object *tmp2;
520 char buf[MAX_BUF]; 520 char buf[MAX_BUF];
521 521
522 if (sack == tmp) 522 if (sack == tmp)
523 return; /* Can't put an object in itself */ 523 return; /* Can't put an object in itself */
524 524
525 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 525 if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
526 { 526 {
527 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));
528 return; 528 return;
529 } 529 }
530 530
… …
532 { 532 {
533 /* 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
534 * we instead move the contents of that container into the active 534 * we instead move the contents of that container into the active
535 * 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.
536 */ 536 */
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)); 537 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack));
539 538
540 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 539 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
541 { 540 {
542 tmp = tmp2->below; 541 tmp = tmp2->below;
543 542
544 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)))
545 put_object_in_sack (op, sack, tmp2, 0); 544 put_object_in_sack (op, sack, tmp2, 0);
546 else 545 else
547 { 546 {
548 sprintf (buf, "Your %s fills up.", query_name (sack)); 547 sprintf (buf, "Your %s fills up.", query_name (sack));
549 new_draw_info (NDI_UNIQUE, 0, op, buf); 548 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
558 * already checked this. 557 * already checked this.
559 */ 558 */
560 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)))
561 return; 560 return;
562 561
563 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 562 if (tmp->flag [FLAG_APPLIED])
564 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 563 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
565 return; 564 return;
566 565
567 /* 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 */
568 if (!can_split (op, tmp, nrof)) 567 if (!can_split (op, tmp, nrof))
569 return; 568 return;
570 569
571 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));
572 sack->insert (tmp); 571 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 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
592
593 /* We are only dropping some of the items. We split the current object
594 * off
595 */
596 if (!can_split (op, tmp, nrof))
597 return;
598
599 drop_object (op, tmp);
600
601 if (!tmp->destroyed () && !tmp->is_inserted ())
602 {
603 // if nothing happened with the object we give it back
604 op->insert (tmp);
605 }
606} 572}
607 573
608/* 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
609 * 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
610 * other magic with it. 576 * other magic with it.
… …
613 * object that was dropped. 579 * object that was dropped.
614 * 580 *
615 * Make sure to check what happened with <obj> after this function returns! 581 * Make sure to check what happened with <obj> after this function returns!
616 * Otherwise you may leak this object. 582 * Otherwise you may leak this object.
617 */ 583 */
618
619void 584void
620drop_object (object *dropper, object *obj) 585drop_object (object *dropper, object *obj)
621{ 586{
622 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper))) 587 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
623 return; 588 return;
624 589
625 if (obj->destroyed () || obj->is_inserted ()) 590 if (obj->destroyed () || obj->is_inserted ())
626 return; 591 return;
627 592
628 if (QUERY_FLAG (obj, FLAG_STARTEQUIP)) 593 if (obj->flag [FLAG_STARTEQUIP])
629 { 594 {
630 dropper->statusmsg (format ("You drop the %s.", query_name (obj))); 595 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
631 dropper->statusmsg ("The god who lent it to you retrieves it."); 596 dropper->statusmsg ("The god who lent it to you retrieves it.");
632 597
633 obj->destroy (); 598 obj->destroy ();
… …
642 return; 607 return;
643 608
644 if (obj->destroyed () || obj->is_inserted ()) 609 if (obj->destroyed () || obj->is_inserted ())
645 return; 610 return;
646 611
647 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)
648 if (!sell_item (obj, dropper)) 613 if (!sell_item (obj, dropper))
649 return; 614 return;
615
616 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
617 return;
650 618
651 /* 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
652 * insert it below the dropper: 620 * insert it below the dropper:
653 */ 621 */
654 622
655 obj->x = dropper->x; 623 obj->x = dropper->x;
656 obj->y = dropper->y; 624 obj->y = dropper->y;
657 625
658 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 }
659} 658}
660 659
661void 660void
662drop (object *op, object *tmp) 661drop (object *op, object *tmp)
663{ 662{
… …
676 */ 675 */
677 tmp->destroy (); 676 tmp->destroy ();
678 return; 677 return;
679 } 678 }
680 else 679 else
681 {
682 while (tmp && tmp->invisible) 680 while (tmp && tmp->invisible)
683 tmp = tmp->below; 681 tmp = tmp->below;
684 }
685 } 682 }
686 683
687 if (tmp == NULL) 684 if (!tmp)
688 { 685 {
689 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.");
690 return; 687 return;
691 } 688 }
692 689
693 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 690 if (tmp->flag [FLAG_INV_LOCKED])
694 { 691 {
695 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 692 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
696 return; 693 return;
697 } 694 }
698 695
699 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 696 if (tmp->flag [FLAG_NO_DROP])
700 { 697 {
701#if 0 698#if 0
702 /* 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. */
703 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.");
704#endif 701#endif
… …
706 } 703 }
707 704
708 if (op->type == PLAYER && op->contr->last_used == tmp) 705 if (op->type == PLAYER && op->contr->last_used == tmp)
709 op->contr->last_used = tmp->below ? tmp->below 706 op->contr->last_used = tmp->below ? tmp->below
710 : tmp->above ? tmp->above 707 : tmp->above ? tmp->above
711 : 0; 708 : (object *)0;
712 709
713 if (op->container) 710 if (op->container_ ())
714 { 711 {
715 if (op->type == PLAYER) 712 if (op->type == PLAYER)
716 put_object_in_sack (op, op->container, tmp, op->contr->count); 713 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
717 else 714 else
718 put_object_in_sack (op, op->container, tmp, 0); 715 put_object_in_sack (op, op->container_ (), tmp, 0);
719 } 716 }
720 else 717 else
721 { 718 {
722 if (op->type == PLAYER) 719 if (op->type == PLAYER)
723 drop_object (op, tmp, op->contr->count); 720 drop_object (op, tmp, op->contr->count);
… …
741 } 738 }
742 739
743 object *curinv = op->inv; 740 object *curinv = op->inv;
744 object *nextinv; 741 object *nextinv;
745 742
746 /* 743 /*
747 This is the default. Drops everything not locked or considered 744 This is the default. Drops everything not locked or considered
748 not something that should be dropped. 745 not something that should be dropped.
749 */ 746 */
750 /* 747 /*
751 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
752 the drop() routine will do unknown things to it when dropping 749 the drop() routine will do unknown things to it when dropping
753 in a shop. --Tero.Pelander@utu.fi 750 in a shop. --Tero.Pelander@utu.fi
754 */ 751 */
755
756 int cnt = MAX_ITEM_PER_DROP; 752 int cnt = MAX_ITEM_PER_ACTION;
757 753
758 if (!params) 754 if (!params)
759 { 755 {
760 while (curinv) 756 while (curinv)
761 { 757 {
762 nextinv = curinv->below; 758 nextinv = curinv->below;
763 759
764 while (nextinv && nextinv->type == MONEY) 760 while (nextinv && nextinv->type == MONEY)
765 nextinv = nextinv->below; 761 nextinv = nextinv->below;
766 762
767 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 763 if (!curinv->flag [FLAG_INV_LOCKED]
768 curinv->type != FOOD && curinv->type != KEY && 764 && !curinv->invisible
769 curinv->type != SPECIAL_KEY && curinv->type != GEM && 765 && curinv->type != MONEY
770 !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)
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:
… …
869 * <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
870 * drop operations to perform. 870 * drop operations to perform.
871 * 871 *
872 * Returns true if at least one item was dropped. 872 * Returns true if at least one item was dropped.
873 */ 873 */
874bool 874static bool
875drop_vector (object *dropper, vector<object *> &objs, int *cnt) 875drop_vector (object *dropper, vector<object *> &objs, int *cnt)
876{ 876{
877 vector<object *>::iterator i; 877 vector<object *>::iterator i;
878 878
879 bool did_one = false; 879 bool did_one = false;
… …
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 }
918 917
919 int cnt = MAX_ITEM_PER_DROP; 918 int cnt = MAX_ITEM_PER_ACTION;
920 919
921 if (!drop_vector (op, matched_objs, &cnt)) 920 if (!drop_vector (op, matched_objs, &cnt))
922 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 921 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
923 922
924 if (cnt <= 0) 923 if (cnt <= 0)
… …
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)
… …
1056} 1010}
1057 1011
1058std::string 1012std::string
1059object::long_desc (object *who) 1013object::long_desc (object *who)
1060{ 1014{
1061 std::string buf (query_name (this)); 1015 std::string buf (query_name ());
1062 1016
1063 switch (type) 1017 switch (type)
1064 { 1018 {
1065 case RING: 1019 case RING:
1066 case SKILL: 1020 case SKILL:
… …
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:
1081 case FLESH: 1036 case FLESH:
1082 case SKILL_TOOL: 1037 case SKILL_TOOL:
1038 case LAMP:
1083 case POWER_CRYSTAL: 1039 case POWER_CRYSTAL:
1084 { 1040 {
1085 const char *cp = ::describe_item (this, who); 1041 const char *cp = ::describe_item (this, who);
1086 1042
1087 if (*cp) 1043 if (*cp)
… …
1100 */ 1056 */
1101void 1057void
1102examine_monster (object *op, object *tmp) 1058examine_monster (object *op, object *tmp)
1103{ 1059{
1104 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 ());
1105}
1106
1107std::string
1108object::describe (object *who)
1109{
1110 dynbuf_text buf (1024, 1024);
1111
1112 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1113
1114 if (custom_name)
1115 buf.printf ("You call it %s.\r", &custom_name);
1116
1117 switch (type)
1118 {
1119 case SPELLBOOK:
1120 if (flag [FLAG_IDENTIFIED] && inv)
1121 buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1122 break;
1123
1124 case BOOK:
1125 if (msg)
1126 buf << "Something is written in it.\r";
1127 break;
1128
1129 case CONTAINER:
1130 if (race)
1131 {
1132 if (weight_limit && stats.Str < 100)
1133 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1134 &race, weight_limit / (10.0 * (100 - stats.Str)));
1135 else
1136 buf.printf ("It can hold only %s.\r", &race);
1137 }
1138 else if (weight_limit && stats.Str < 100)
1139 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1140 break;
1141
1142 case WAND:
1143 if (flag [FLAG_IDENTIFIED])
1144 buf.printf ("It has %d charges left.\r", stats.food);
1145 break;
1146 }
1147
1148 if (materialname && !msg)
1149 buf.printf ("It is made of: %s.\r", &materialname);
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 && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1191 {
1192 /* This is just a hack so when identifying the items, we print
1193 * out the extra message
1194 */
1195 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1196 buf << "The object has a story:\r";
1197
1198 buf << msg << '\n';
1199 }
1200
1201 buf << '\n';
1202
1203 return std::string (buf.linearise (), buf.size ());
1204} 1061}
1205 1062
1206static void 1063static void
1207display_new_pickup (object *op) 1064display_new_pickup (object *op)
1208{ 1065{
… …
1314} 1171}
1315 1172
1316int 1173int
1317command_search_items (object *op, char *params) 1174command_search_items (object *op, char *params)
1318{ 1175{
1319 char buf[MAX_BUF];
1320
1321 if (params == NULL) 1176 if (params == NULL)
1322 { 1177 {
1323 if (op->contr->search_str[0] == '\0') 1178 if (op->contr->search_str[0] == '\0')
1324 { 1179 {
1325 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");
… …
1328 return 1; 1183 return 1;
1329 } 1184 }
1330 1185
1331 op->contr->search_str[0] = '\0'; 1186 op->contr->search_str[0] = '\0';
1332 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1187 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1333 op->update_stats (); 1188 op->contr->queue_stats_update ();
1334 return 1; 1189 return 1;
1335 } 1190 }
1336 1191
1337 if (strlen (params) >= MAX_BUF) 1192 if (strlen (params) >= sizeof (op->contr->search_str))
1338 { 1193 {
1339 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1194 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1340 return 1; 1195 return 1;
1341 } 1196 }
1342 1197
1343 strcpy (op->contr->search_str, params); 1198 strcpy (op->contr->search_str, params);
1344 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));
1345 new_draw_info (NDI_UNIQUE, 0, op, buf); 1200 op->contr->queue_stats_update ();
1346 op->update_stats ();
1347 1201
1348 return 1; 1202 return 1;
1349} 1203}
1350 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