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.76 by root, Sun Sep 7 21:31:23 2008 UTC vs.
Revision 1.131 by root, Mon Nov 12 03:48:34 2012 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 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 }
… …
133 { 132 {
134 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); 133 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
135 return 0; 134 return 0;
136 } 135 }
137 136
138 skill = find_skill_by_name (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}
150
151/* These functions (command_search, command_disarm) are really just wrappers for
152 * things like 'use_skill ...'). In fact, they should really be obsoleted
153 * and replaced with those.
154 */
155int
156command_search (object *op, char *params)
157{
158 return use_skill (op, skill_names[SK_FIND_TRAPS]);
159}
160
161int
162command_disarm (object *op, char *params)
163{
164 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
165} 147}
166 148
167/* 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
168 * as it includes the object to throw. 150 * as it includes the object to throw.
169 */ 151 */
170int 152int
171command_throw (object *op, char *params) 153command_throw (object *op, char *params)
172{ 154{
173 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING])) 155 if (object *skop = find_skill_by_name (op, shstr_throwing))
174 return do_skill (op, op, skop, op->facing, params); 156 return do_skill (op, op, skop, op->facing, params);
175 else 157 else
176 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.");
177 159
178 return 0; 160 return 0;
179} 161}
180 162
181int 163int
… …
207 189
208 while (*params == ' ') 190 while (*params == ' ')
209 params++; 191 params++;
210 192
211 if (object *inv = find_best_apply_object_match (op, params, aflag)) 193 if (object *inv = find_best_apply_object_match (op, params, aflag))
212 player_apply (op, inv, aflag, 0); 194 op->apply (inv, aflag);
213 else 195 else
214 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);
215 } 197 }
216 198
217 return 0; 199 return 0;
218} 200}
219 201
… …
227 * not need to use split_ob and stuff. 209 * not need to use split_ob and stuff.
228 */ 210 */
229int 211int
230sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 212sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
231{ 213{
232 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 214 if (!sack->flag [FLAG_APPLIED])
233 { 215 {
234 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));
235 return 0; 217 return 0;
236 } 218 }
237 219
… …
241 return 0; 223 return 0;
242 } 224 }
243 225
244 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)))
245 { 227 {
246 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));
247 return 0; 229 return 0;
248 } 230 }
249 231
250 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 232 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
251 { 233 {
252 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));
253 return 0; 235 return 0;
254 } 236 }
255 237
256 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 238 if (sack->weight_limit
239 && weight_t (sack->carrying
240 + sack->number_of ()
257 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 241 * (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
258 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 242 * (100 - sack->stats.Str) / 100)
243 > sack->weight_limit)
259 { 244 {
260 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));
261 return 0; 246 return 0;
262 } 247 }
263 248
… …
266} 251}
267 252
268/* Pick up commands follow */ 253/* Pick up commands follow */
269 254
270/* pl = player (not always - monsters can use this now) 255/* pl = player (not always - monsters can use this now)
271 * op is the object to put tmp into, 256 * op is the object to put tmp into,
272 * 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
273 * pick up (0 means all of them) 258 * pick up (0 means all of them)
274 */ 259 */
275static void 260static void
276pick_up_object (object *pl, object *op, object *tmp, int nrof) 261pick_up_object (object *pl, object *op, object *tmp, int nrof)
277{ 262{
278 object *env = tmp->env;
279 uint32 weight, effective_weight_limit; 263 weight_t weight, effective_weight_limit;
280 int tmp_nrof = tmp->number_of (); 264 int tmp_nrof = tmp->number_of ();
281 265
282 /* 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
283 * 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
284 * (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
285 * containers not allowed as of now) 269 * containers not allowed as of now)
286 */ 270 */
287 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)
288 { 272 {
289 pl->failmsg ("You are levitating, you can't reach the ground! " 273 pl->failmsg ("You are levitating, you can't reach the ground! "
290 "H<You have to stop levitating first, if you can, either by using your levitation skill, " 274 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
291 "or waiting till the levitation effect wears off.>"); 275 "or waiting till the levitation effect wears off.>");
292 return; 276 return;
293 } 277 }
294 278
295 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 279 if (tmp->flag [FLAG_NO_DROP])
296 return; 280 return;
297 281
298 if (nrof > tmp_nrof || nrof <= 0) 282 if (nrof > tmp_nrof || nrof <= 0)
299 nrof = tmp_nrof; 283 nrof = tmp_nrof;
300 284
… …
312 } 296 }
313 297
314 if (!can_split (pl, tmp, nrof)) 298 if (!can_split (pl, tmp, nrof))
315 return; 299 return;
316 300
317 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 301 if (tmp->flag [FLAG_UNPAID])
318 { 302 {
319 tmp->flag.reset (FLAG_UNPAID); 303 tmp->flag.reset (FLAG_UNPAID);
320 new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP)); 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));
321 tmp->flag.set (FLAG_UNPAID); 305 tmp->flag.set (FLAG_UNPAID);
322 } 306 }
… …
377 count = tmp->nrof; 361 count = tmp->nrof;
378 362
379 /* container is open, so use it */ 363 /* container is open, so use it */
380 if (tmp->flag [FLAG_STARTEQUIP]) 364 if (tmp->flag [FLAG_STARTEQUIP])
381 alt = op; 365 alt = op;
382 else if (op->container) 366 else if ((alt = op->container_ ()))
383 { 367 {
384 alt = op->container;
385 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 368 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
386 goto leave; 369 goto leave;
387 } 370 }
388 else 371 else
389 { /* non container pickup */ 372 { /* non container pickup */
390 for (alt = op->inv; alt; alt = alt->below) 373 for (alt = op->inv; alt; alt = alt->below)
391 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && 374 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] &&
392 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))
393 break; /* perfect match */ 376 break; /* perfect match */
394 377
395 if (!alt) 378 if (!alt)
396 for (alt = op->inv; alt; alt = alt->below) 379 for (alt = op->inv; alt; alt = alt->below)
397 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))
398 break; /* General container comes next */ 381 break; /* General container comes next */
399 382
400 if (!alt) 383 if (!alt)
401 alt = op; /* No free containers */ 384 alt = op; /* No free containers */
402 } 385 }
… …
412#ifdef PICKUP_DEBUG 395#ifdef PICKUP_DEBUG
413 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);
414#endif 397#endif
415 398
416 /* startequip items are not allowed to be put into containers: */ 399 /* startequip items are not allowed to be put into containers: */
417 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 400 if (op->type == PLAYER && alt->type == CONTAINER && tmp->flag [FLAG_STARTEQUIP])
418 { 401 {
419 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!");
420 goto leave; 403 goto leave;
421 } 404 }
422 405
… …
443int 426int
444command_take (object *op, char *params) 427command_take (object *op, char *params)
445{ 428{
446 object *tmp, *next; 429 object *tmp, *next;
447 430
448 if (op->container) 431 if (op->container_ ())
449 tmp = op->container->inv; 432 tmp = op->container_ ()->inv;
450 else 433 else
451 { 434 {
452 tmp = op->above; 435 tmp = op->above;
453 if (tmp) 436 if (tmp)
454 while (tmp->above) 437 while (tmp->above)
… …
466 449
467 /* Makes processing easier */ 450 /* Makes processing easier */
468 if (params && *params == '\0') 451 if (params && *params == '\0')
469 params = 0; 452 params = 0;
470 453
471 int cnt = MAX_ITEM_PER_DROP; 454 int cnt = MAX_ITEM_PER_ACTION;
472 455
473 while (tmp) 456 while (tmp)
474 { 457 {
475 next = tmp->below; 458 next = tmp->below;
476 459
… …
520 503
521 return 0; 504 return 0;
522} 505}
523 506
524/* 507/*
525 * This function was part of drop, now is own function. 508 * This function was part of drop, now is own function.
526 * Player 'op' tries to put object 'tmp' into sack 'sack', 509 * Player 'op' tries to put object 'tmp' into sack 'sack',
527 * 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.
511 *
528 * Note that the 'sack' in question can now be a transport, 512 * Note that the 'sack' in question can now be a transport,
529 * so this function isn't named very good anymore. 513 * so this function isn't named very good anymore.
530 */ 514 */
531void 515void
532put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 516put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
533{ 517{
534 object *tmp2, *sack2; 518 object *tmp2;
535 char buf[MAX_BUF]; 519 char buf[MAX_BUF];
536 520
537 if (sack == tmp) 521 if (sack == tmp)
538 return; /* Can't put an object in itself */ 522 return; /* Can't put an object in itself */
539 523
540 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 524 if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
541 { 525 {
542 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));
543 return; 527 return;
544 } 528 }
545 529
… …
547 { 531 {
548 /* 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
549 * we instead move the contents of that container into the active 533 * we instead move the contents of that container into the active
550 * 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.
551 */ 535 */
552 sack2 = tmp;
553 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));
554 537
555 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 538 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
556 { 539 {
557 tmp = tmp2->below; 540 tmp = tmp2->below;
558 541
559 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)))
560 put_object_in_sack (op, sack, tmp2, 0); 543 put_object_in_sack (op, sack, tmp2, 0);
561 else 544 else
562 { 545 {
563 sprintf (buf, "Your %s fills up.", query_name (sack)); 546 sprintf (buf, "Your %s fills up.", query_name (sack));
564 new_draw_info (NDI_UNIQUE, 0, op, buf); 547 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
573 * already checked this. 556 * already checked this.
574 */ 557 */
575 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)))
576 return; 559 return;
577 560
578 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 561 if (tmp->flag [FLAG_APPLIED])
579 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 562 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
580 return; 563 return;
581 564
582 /* 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 */
583 if (!can_split (op, tmp, nrof)) 566 if (!can_split (op, tmp, nrof))
584 return; 567 return;
585 568
586 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));
587 sack->insert (tmp); 570 sack->insert (tmp);
588} 571}
589 572
573/* In contrast to drop_object (op, tmp, nrof) above this function takes the
574 * already split off object, and feeds it to the event handlers and does
575 * other magic with it.
576 *
577 * <droppper> is the object that dropped this object and <obj> is the
578 * object that was dropped.
579 *
580 * Make sure to check what happened with <obj> after this function returns!
581 * Otherwise you may leak this object.
582 */
583void
584drop_object (object *dropper, object *obj)
585{
586 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
587 return;
588
589 if (obj->destroyed () || obj->is_inserted ())
590 return;
591
592 if (obj->flag [FLAG_STARTEQUIP])
593 {
594 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
595 dropper->statusmsg ("The god who lent it to you retrieves it.");
596
597 obj->destroy ();
598 dropper->update_stats ();
599 return;
600 }
601
602 for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
603 floor;
604 floor = floor->above)
605 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
606 return;
607
608 if (obj->destroyed () || obj->is_inserted ())
609 return;
610
611 if (dropper->is_in_shop () && !obj->flag [FLAG_UNPAID] && obj->type != MONEY)
612 if (!sell_item (obj, dropper))
613 return;
614
615 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
616 return;
617
618 /* If nothing special happened with this object, the default action is to
619 * insert it below the dropper:
620 */
621
622 obj->x = dropper->x;
623 obj->y = dropper->y;
624
625 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
626}
627
590/* 628/*
591 * This function was part of drop, now is own function. 629 * This function was part of drop, now is own function.
592 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 630 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
593 * nrof objects is tried to dropped. 631 * nrof objects are tried to drop.
594 * This is used when dropping objects onto the floor. 632 * This is used when dropping objects onto the floor.
595 */ 633 */
596void 634void
597drop_object (object *op, object *tmp, uint32 nrof) 635drop_object (object *op, object *tmp, uint32 nrof)
598{ 636{
599 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 637 if (tmp->flag [FLAG_NO_DROP])
600 return; 638 return;
601 639
602 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 640 if (tmp->flag [FLAG_APPLIED])
603 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 641 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
604 return; /* can't unapply it */ 642 return; /* can't unapply it */
605
606 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
607 643
608 /* We are only dropping some of the items. We split the current object 644 /* We are only dropping some of the items. We split the current object
609 * off 645 * off
610 */ 646 */
611 if (!can_split (op, tmp, nrof)) 647 if (!can_split (op, tmp, nrof))
612
613 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
614 return; 648 return;
615 649
616 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 650 drop_object (op, tmp);
617 {
618 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
619 op->statusmsg ("The gods who lent it to you retrieves it.");
620 651
621 tmp->destroy (); 652 if (!tmp->destroyed () && !tmp->is_inserted ())
622 op->update_stats ();
623 return;
624 } 653 {
625 654 // if nothing happened with the object we give it back
626 /* Call this before we update the various windows/players. At least 655 op->insert (tmp);
627 * that we, we know the weight is correct.
628 */
629 // 2007-11-26: moved op->update_stats away and calling it later after
630 // all items of a drop command have been processed.
631
632 for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
633 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
634 return;
635
636 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
637 { 656 }
638 if (!sell_item (tmp, op))
639 return; // if we can't sell it we don't drop it
640 }
641
642 tmp->x = op->x;
643 tmp->y = op->y;
644
645 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
646} 657}
647 658
648void 659void
649drop (object *op, object *tmp) 660drop (object *op, object *tmp)
650{ 661{
… …
659 if (tmp->env && tmp->env->type != PLAYER) 670 if (tmp->env && tmp->env->type != PLAYER)
660 { 671 {
661 /* Just toss the object - probably shouldn't be hanging 672 /* Just toss the object - probably shouldn't be hanging
662 * around anyways 673 * around anyways
663 */ 674 */
664 tmp->remove ();
665 tmp->destroy (); 675 tmp->destroy ();
666 return; 676 return;
667 } 677 }
668 else 678 else
669 {
670 while (tmp && tmp->invisible) 679 while (tmp && tmp->invisible)
671 tmp = tmp->below; 680 tmp = tmp->below;
672 }
673 } 681 }
674 682
675 if (tmp == NULL) 683 if (!tmp)
676 { 684 {
677 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.");
678 return; 686 return;
679 } 687 }
680 688
681 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 689 if (tmp->flag [FLAG_INV_LOCKED])
682 { 690 {
683 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 691 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
684 return; 692 return;
685 } 693 }
686 694
687 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 695 if (tmp->flag [FLAG_NO_DROP])
688 { 696 {
689#if 0 697#if 0
690 /* 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. */
691 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.");
692#endif 700#endif
… …
694 } 702 }
695 703
696 if (op->type == PLAYER && op->contr->last_used == tmp) 704 if (op->type == PLAYER && op->contr->last_used == tmp)
697 op->contr->last_used = tmp->below ? tmp->below 705 op->contr->last_used = tmp->below ? tmp->below
698 : tmp->above ? tmp->above 706 : tmp->above ? tmp->above
699 : 0; 707 : (object *)0;
700 708
701 if (op->container) 709 if (op->container_ ())
702 { 710 {
703 if (op->type == PLAYER) 711 if (op->type == PLAYER)
704 put_object_in_sack (op, op->container, tmp, op->contr->count); 712 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
705 else 713 else
706 put_object_in_sack (op, op->container, tmp, 0); 714 put_object_in_sack (op, op->container_ (), tmp, 0);
707 } 715 }
708 else 716 else
709 { 717 {
710 if (op->type == PLAYER) 718 if (op->type == PLAYER)
711 drop_object (op, tmp, op->contr->count); 719 drop_object (op, tmp, op->contr->count);
… …
738 /* 746 /*
739 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
740 the drop() routine will do unknown things to it when dropping 748 the drop() routine will do unknown things to it when dropping
741 in a shop. --Tero.Pelander@utu.fi 749 in a shop. --Tero.Pelander@utu.fi
742 */ 750 */
743
744 int cnt = MAX_ITEM_PER_DROP; 751 int cnt = MAX_ITEM_PER_ACTION;
745 752
746 if (!params) 753 if (!params)
747 { 754 {
748 while (curinv) 755 while (curinv)
749 { 756 {
750 nextinv = curinv->below; 757 nextinv = curinv->below;
751 758
752 while (nextinv && nextinv->type == MONEY) 759 while (nextinv && nextinv->type == MONEY)
753 nextinv = nextinv->below; 760 nextinv = nextinv->below;
754 761
755 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 762 if (!curinv->flag [FLAG_INV_LOCKED]
756 curinv->type != FOOD && curinv->type != KEY && 763 && !curinv->invisible
757 curinv->type != SPECIAL_KEY && curinv->type != GEM && 764 && curinv->type != MONEY
758 !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)
759 { 770 {
760 drop (op, curinv); 771 drop (op, curinv);
761 if (--cnt <= 0) break; 772 if (--cnt <= 0) break;
762 } 773 }
763 774
… …
771 nextinv = curinv->below; 782 nextinv = curinv->below;
772 783
773 while (nextinv && nextinv->type == MONEY) 784 while (nextinv && nextinv->type == MONEY)
774 nextinv = nextinv->below; 785 nextinv = nextinv->below;
775 786
776 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)))
777 { 788 {
778 drop (op, curinv); 789 drop (op, curinv);
779 if (--cnt <= 0) break; 790 if (--cnt <= 0) break;
780 } 791 }
781 792
… …
789 nextinv = curinv->below; 800 nextinv = curinv->below;
790 801
791 while (nextinv && nextinv->type == MONEY) 802 while (nextinv && nextinv->type == MONEY)
792 nextinv = nextinv->below; 803 nextinv = nextinv->below;
793 804
794 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))
795 { 806 {
796 drop (op, curinv); 807 drop (op, curinv);
797 if (--cnt <= 0) break; 808 if (--cnt <= 0) break;
798 } 809 }
799 810
… …
807 nextinv = curinv->below; 818 nextinv = curinv->below;
808 819
809 while (nextinv && nextinv->type == MONEY) 820 while (nextinv && nextinv->type == MONEY)
810 nextinv = nextinv->below; 821 nextinv = nextinv->below;
811 822
812 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 823 if (!curinv->flag [FLAG_INV_LOCKED] && !curinv->flag [FLAG_APPLIED])
813 { 824 {
814 switch (curinv->type) 825 switch (curinv->type)
815 { 826 {
816 case HORN: 827 case HORN:
817 case BOOK: 828 case BOOK:
… …
849 860
850/* draw_look(op);*/ 861/* draw_look(op);*/
851 return 0; 862 return 0;
852} 863}
853 864
865
866/* This function tries to drop all objects in the <objs> vector.
867 * <dropper> is the object that wants to drop them.
868 * <cnt> can be a 0 pointer or a pointer to the maximum number of
869 * drop operations to perform.
870 *
871 * Returns true if at least one item was dropped.
872 */
873static bool
874drop_vector (object *dropper, vector<object *> &objs, int *cnt)
875{
876 vector<object *>::iterator i;
877
878 bool did_one = false;
879
880 for (i = objs.begin (); i != objs.end (); i++)
881 {
882 drop (dropper, *i);
883 if (cnt && --*cnt <= 0) break;
884 did_one = true;
885 }
886
887 return did_one;
888}
889
854/* Object op wants to drop object(s) params. params can be a 890/* Object op wants to drop object(s) params. params can be a
855 * comma seperated list. 891 * comma seperated list.
856 */ 892 */
857int 893int
858command_drop (object *op, char *params) 894command_drop (object *op, char *params)
859{ 895{
860 object *tmp, *next; 896 object *tmp, *next;
861 int did_one = 0;
862 897
863 if (!params) 898 if (!params)
864 { 899 {
865 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
866 return 0; 901 return 0;
867 } 902 }
868 else 903 else
869 { 904 {
870 int cnt = MAX_ITEM_PER_DROP; 905 vector<object *> matched_objs;
871 906
872 for (tmp = op->inv; tmp; tmp = next) 907 for (tmp = op->inv; tmp; tmp = next)
873 { 908 {
874 next = tmp->below; 909 next = tmp->below;
875 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 910 if (tmp->flag [FLAG_NO_DROP] || tmp->invisible)
876 continue; 911 continue;
877 912
878 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
879 { 914 matched_objs.push_back (tmp);
880 drop (op, tmp);
881 if (--cnt <= 0) break;
882 did_one = 1;
883 } 915 }
884 }
885 916
886 if (!did_one) 917 int cnt = MAX_ITEM_PER_ACTION;
918
919 if (!drop_vector (op, matched_objs, &cnt))
887 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
888 921
889 if (cnt <= 0) 922 if (cnt <= 0)
890 op->failmsg ("Only dropped some items, can't drop that many items at once."); 923 op->failmsg ("Only dropped some items, can't drop that many items at once.");
891 } 924 }
… …
917 } 950 }
918 951
919 return 0; 952 return 0;
920} 953}
921 954
922/* op should be a player.
923 * we return the object the player has marked with the 'mark' command
924 * below. If no match is found (or object has changed), we return
925 * NULL. We leave it up to the calling function to print messages if
926 * nothing is found.
927 */
928object *
929find_marked_object (object *op)
930{
931 object *tmp;
932
933 if (!op || !op->contr)
934 return NULL;
935
936 if (!op->contr->mark)
937 {
938/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
939 return 0;
940 }
941
942 /* This may seem like overkill, but we need to make sure that they
943 * player hasn't dropped the item. We use count on the off chance that
944 * an item got reincarnated at some point.
945 */
946 for (tmp = op->inv; tmp; tmp = tmp->below)
947 {
948 if (tmp->invisible)
949 continue;
950
951 if (tmp == op->contr->mark)
952 {
953 if (!tmp->destroyed ())
954 return tmp;
955 else
956 {
957 op->contr->mark = 0;
958/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
959 return 0;
960 }
961 }
962 }
963
964 return 0;
965}
966
967std::string 955std::string
968object::describe_monster (object *who) 956object::describe_monster (object *who)
969{ 957{
970 dynbuf_text buf (512, 512); 958 dynbuf_text buf (512, 512);
971 959
972 object *mon = head ? head : this; 960 object *mon = head ? head : this;
973 961
974 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 962 if (mon->flag [FLAG_UNDEAD])
975 buf << " - It is an undead force.\n"; 963 buf << "It is an undead force.\r";
976 964
977 if (mon->level > who->level) 965 if (mon->level > who->level)
978 buf << " - It is likely more powerful than you.\n"; 966 buf << "It is likely more powerful than you.\r";
979 else if (mon->level < who->level) 967 else if (mon->level < who->level)
980 buf << " - It is likely less powerful than you.\n"; 968 buf << "It is likely less powerful than you.\r";
981 else 969 else
982 buf << " - It is probably as powerful as you.\n"; 970 buf << "It is probably as powerful as you.\r";
983 971
984 if (mon->attacktype & AT_ACID) 972 if (mon->attacktype & AT_ACID)
985 buf << " - You seem to smell an acrid odor.\n"; 973 buf << "You seem to smell an acrid odor.\r";
986 974
987 /* Anyone know why this used to use the clone value instead of the 975 /* Anyone know why this used to use the clone value instead of the
988 * maxhp field? This seems that it should give more accurate results. 976 * maxhp field? This seems that it should give more accurate results.
989 */ 977 */
990 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 978 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
991 { /* From 1-4 */ 979 { /* From 1-4 */
992 case 1: 980 case 1:
993 buf << " - It is in a bad shape.\n"; 981 buf << "It is in a bad shape.\r";
994 break; 982 break;
995 case 2: 983 case 2:
996 buf << " - It is hurt.\n"; 984 buf << "It is hurt.\r";
997 break; 985 break;
998 case 3: 986 case 3:
999 buf << " - It is somewhat hurt.\n"; 987 buf << "It is somewhat hurt.\r";
1000 break; 988 break;
1001 case 4: 989 case 4:
1002 buf << " - It is in excellent shape.\n"; 990 buf << "It is in excellent shape.\r";
1003 break; 991 break;
1004 } 992 }
1005 993
1006 if (present_in_ob (POISONING, mon)) 994 if (present_in_ob (POISONING, mon))
1007 buf << " - It looks very ill.\n"; 995 buf << "It looks very ill.\r";
996
997 buf << '\n';
1008 998
1009 return buf; 999 return buf;
1010} 1000}
1011 1001
1012/* tmp is the object being described, pl is who is examing it. */ 1002/* tmp is the object being described, pl is who is examing it. */
… …
1019} 1009}
1020 1010
1021std::string 1011std::string
1022object::long_desc (object *who) 1012object::long_desc (object *who)
1023{ 1013{
1024 std::string buf (query_name (this)); 1014 std::string buf (query_name ());
1025 1015
1026 switch (type) 1016 switch (type)
1027 { 1017 {
1028 case RING: 1018 case RING:
1029 case SKILL: 1019 case SKILL:
… …
1034 case SHIELD: 1024 case SHIELD:
1035 case BOOTS: 1025 case BOOTS:
1036 case GLOVES: 1026 case GLOVES:
1037 case AMULET: 1027 case AMULET:
1038 case GIRDLE: 1028 case GIRDLE:
1029 case RANGED:
1039 case BOW: 1030 case BOW:
1040 case ARROW: 1031 case ARROW:
1041 case CLOAK: 1032 case CLOAK:
1042 case FOOD: 1033 case FOOD:
1043 case DRINK: 1034 case DRINK:
1044 case FLESH: 1035 case FLESH:
1045 case SKILL_TOOL: 1036 case SKILL_TOOL:
1037 case LAMP:
1046 case POWER_CRYSTAL: 1038 case POWER_CRYSTAL:
1047 { 1039 {
1048 const char *cp = ::describe_item (this, who); 1040 const char *cp = ::describe_item (this, who);
1049 1041
1050 if (*cp) 1042 if (*cp)
… …
1065examine_monster (object *op, object *tmp) 1057examine_monster (object *op, object *tmp)
1066{ 1058{
1067 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 ());
1068} 1060}
1069 1061
1070std::string
1071object::describe (object *who)
1072{
1073 dynbuf_text buf (1024, 1024);
1074
1075 buf.printf ("That is: %s.\n\n", long_desc (who).c_str ());
1076
1077 if (custom_name)
1078 buf.printf ("You call it %s.\n\n", &custom_name);
1079
1080 switch (type)
1081 {
1082 case SPELLBOOK:
1083 if (flag [FLAG_IDENTIFIED] && inv)
1084 buf.printf ("%s is a %s %s spell.\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1085 break;
1086
1087 case BOOK:
1088 if (msg)
1089 buf << "Something is written in it.\n";
1090 break;
1091
1092 case CONTAINER:
1093 if (race != NULL)
1094 {
1095 if (weight_limit && stats.Str < 100)
1096 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1097 &race, weight_limit / (10.0 * (100 - stats.Str)));
1098 else
1099 buf.printf ("It can hold only %s.\n", &race);
1100 }
1101 else if (weight_limit && stats.Str < 100)
1102 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1103 break;
1104
1105 case WAND:
1106 if (flag [FLAG_IDENTIFIED])
1107 buf.printf ("It has %d charges left.\n", stats.food);
1108 break;
1109 }
1110
1111 if (materialname && !msg)
1112 buf.printf ("It is made of: %s.\n", &materialname);
1113
1114 if (who)
1115 /* Where to wear this item */
1116 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1117 if (slot[i].info)
1118 {
1119 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1120
1121 if (slot[i].info < -1 && who->slot[i].info)
1122 buf.printf ("(%d)", -slot[i].info);
1123
1124 buf << ".\n";
1125 }
1126
1127 if (weight)
1128 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1129
1130 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1131 {
1132 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1133
1134 if (is_in_shop (who))
1135 {
1136 if (flag [FLAG_UNPAID])
1137 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1138 else
1139 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1140 }
1141 }
1142
1143 if (flag [FLAG_MONSTER])
1144 buf << describe_monster (who);
1145
1146 /* Is this item buildable? */
1147 if (flag [FLAG_IS_BUILDABLE])
1148 buf << "This is a buildable item.\n";
1149
1150 /* Does the object have a message? Don't show message for all object
1151 * types - especially if the first entry is a match
1152 */
1153 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1154 {
1155 /* This is just a hack so when identifying the items, we print
1156 * out the extra message
1157 */
1158 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1159 buf << "The object has a story:\n\n";
1160
1161 buf << msg << '\n';
1162 }
1163
1164 buf << '\n';
1165
1166 return std::string (buf.linearise (), buf.size ());
1167}
1168
1169static void 1062static void
1170display_new_pickup (object *op) 1063display_new_pickup (object *op)
1171{ 1064{
1172 int i = op->contr->mode; 1065 int i = op->contr->mode;
1173 1066
1174 if (!(i & PU_NEWMODE))
1175 return;
1176
1177 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1178 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0); 1067 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1179 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0); 1068 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1180 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0); 1069 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1181 1070
1182 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5); 1071 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
… …
1233 }; 1122 };
1234 1123
1235 if (!params) 1124 if (!params)
1236 { 1125 {
1237 /* if the new mode is used, just print the settings */ 1126 /* if the new mode is used, just print the settings */
1238 if (op->contr->mode & PU_NEWMODE)
1239 {
1240 display_new_pickup (op); 1127 display_new_pickup (op);
1241 return 1;
1242 }
1243 if (1)
1244 LOG (llevDebug, "command_pickup: !params\n");
1245 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1246 return 0; 1128 return 0;
1247 } 1129 }
1248 1130
1249 while (*params == ' ' && *params) 1131 while (*params == ' ' && *params)
1250 params++; 1132 params++;
… …
1256 for (mode = 0; names[mode]; mode++) 1138 for (mode = 0; names[mode]; mode++)
1257 { 1139 {
1258 if (!strcmp (names[mode], params + 1)) 1140 if (!strcmp (names[mode], params + 1))
1259 { 1141 {
1260 i = op->contr->mode; 1142 i = op->contr->mode;
1261 if (!(i & PU_NEWMODE)) 1143
1262 i = PU_NEWMODE;
1263 if (*params == '+') 1144 if (*params == '+')
1264 i = i | modes[mode]; 1145 i = i | modes[mode];
1265 else 1146 else
1266 i = i & ~modes[mode]; 1147 i = i & ~modes[mode];
1148
1267 op->contr->mode = i; 1149 op->contr->mode = i;
1268 display_new_pickup (op); 1150 display_new_pickup (op);
1269 return 1; 1151 return 1;
1270 } 1152 }
1271 } 1153 }
… …
1273 return 1; 1155 return 1;
1274 } 1156 }
1275 1157
1276 if (sscanf (params, "%u", &i) != 1) 1158 if (sscanf (params, "%u", &i) != 1)
1277 { 1159 {
1278 if (1)
1279 LOG (llevDebug, "command_pickup: params==NULL\n");
1280 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> ."); 1160 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1281 return 1; 1161 return 1;
1282 } 1162 }
1283 set_pickup_mode (op, i); 1163
1164 if (i <= PU_RATIO)
1165 i |= op->contr->mode & ~PU_RATIO;
1166
1167 op->contr->mode = i;
1284 1168
1285 return 1; 1169 return 1;
1286} 1170}
1287 1171
1288void
1289set_pickup_mode (object *op, int i)
1290{
1291 switch (op->contr->mode = i)
1292 {
1293 case 0:
1294 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1295 break;
1296 case 1:
1297 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1298 break;
1299 case 2:
1300 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1301 break;
1302 case 3:
1303 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1304 break;
1305 case 4:
1306 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1307 break;
1308 case 5:
1309 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1310 break;
1311 case 6:
1312 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1313 break;
1314 case 7:
1315 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1316 break;
1317 }
1318}
1319
1320int 1172int
1321command_search_items (object *op, char *params) 1173command_search_items (object *op, char *params)
1322{ 1174{
1323 char buf[MAX_BUF];
1324
1325 if (settings.search_items == FALSE)
1326 return 1;
1327
1328 if (params == NULL) 1175 if (params == NULL)
1329 { 1176 {
1330 if (op->contr->search_str[0] == '\0') 1177 if (op->contr->search_str[0] == '\0')
1331 { 1178 {
1332 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1179 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1333 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all"); 1180 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1334 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'."); 1181 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1335 return 1; 1182 return 1;
1336 } 1183 }
1337 1184
1338 op->contr->search_str[0] = '\0'; 1185 op->contr->search_str[0] = '\0';
1339 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1186 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1340 op->update_stats (); 1187 op->contr->queue_stats_update ();
1341 return 1; 1188 return 1;
1342 } 1189 }
1343 1190
1344 if ((int) strlen (params) >= MAX_BUF) 1191 if (strlen (params) >= sizeof (op->contr->search_str))
1345 { 1192 {
1346 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1193 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1347 return 1; 1194 return 1;
1348 } 1195 }
1349 1196
1350 strcpy (op->contr->search_str, params); 1197 strcpy (op->contr->search_str, params);
1351 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1198 new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1352 new_draw_info (NDI_UNIQUE, 0, op, buf); 1199 op->contr->queue_stats_update ();
1353 op->update_stats (); 1200
1354 return 1; 1201 return 1;
1355} 1202}
1356 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