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.73 by root, Tue May 6 20:00:12 2008 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 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 }
… …
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
… …
484 * but that probably will make it more difficult to read, and 467 * but that probably will make it more difficult to read, and
485 * not make it any more efficient 468 * not make it any more efficient
486 */ 469 */
487 if (params && item_matched_string (op, tmp, params)) 470 if (params && item_matched_string (op, tmp, params))
488 { 471 {
472 if (--cnt < 0) break;
489 pick_up (op, tmp); 473 pick_up (op, tmp);
490 if (--cnt <= 0) break;
491 } 474 }
492 else if (can_pick (op, tmp) && !params) 475 else if (can_pick (op, tmp) && !params)
493 { 476 {
477 if (--cnt < 0) break;
494 pick_up (op, tmp); 478 pick_up (op, tmp);
495 break; 479 break;
496 } 480 }
497 481
498 tmp = next; 482 tmp = next;
… …
519 503
520 return 0; 504 return 0;
521} 505}
522 506
523/* 507/*
524 * This function was part of drop, now is own function. 508 * This function was part of drop, now is own function.
525 * Player 'op' tries to put object 'tmp' into sack 'sack', 509 * Player 'op' tries to put object 'tmp' into sack 'sack',
526 * 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 *
527 * Note that the 'sack' in question can now be a transport, 512 * Note that the 'sack' in question can now be a transport,
528 * so this function isn't named very good anymore. 513 * so this function isn't named very good anymore.
529 */ 514 */
530void 515void
531put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 516put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
532{ 517{
533 object *tmp2, *sack2; 518 object *tmp2;
534 char buf[MAX_BUF]; 519 char buf[MAX_BUF];
535 520
536 if (sack == tmp) 521 if (sack == tmp)
537 return; /* Can't put an object in itself */ 522 return; /* Can't put an object in itself */
538 523
539 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 524 if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
540 { 525 {
541 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));
542 return; 527 return;
543 } 528 }
544 529
… …
546 { 531 {
547 /* 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
548 * we instead move the contents of that container into the active 533 * we instead move the contents of that container into the active
549 * 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.
550 */ 535 */
551 sack2 = tmp;
552 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));
553 537
554 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 538 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
555 { 539 {
556 tmp = tmp2->below; 540 tmp = tmp2->below;
557 541
558 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)))
559 put_object_in_sack (op, sack, tmp2, 0); 543 put_object_in_sack (op, sack, tmp2, 0);
560 else 544 else
561 { 545 {
562 sprintf (buf, "Your %s fills up.", query_name (sack)); 546 sprintf (buf, "Your %s fills up.", query_name (sack));
563 new_draw_info (NDI_UNIQUE, 0, op, buf); 547 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
572 * already checked this. 556 * already checked this.
573 */ 557 */
574 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)))
575 return; 559 return;
576 560
577 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 561 if (tmp->flag [FLAG_APPLIED])
578 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 562 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
579 return; 563 return;
580 564
581 /* 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 */
582 if (!can_split (op, tmp, nrof)) 566 if (!can_split (op, tmp, nrof))
583 return; 567 return;
584 568
585 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));
586 sack->insert (tmp); 570 sack->insert (tmp);
587} 571}
588 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
589/* 628/*
590 * This function was part of drop, now is own function. 629 * This function was part of drop, now is own function.
591 * 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
592 * nrof objects is tried to dropped. 631 * nrof objects are tried to drop.
593 * This is used when dropping objects onto the floor. 632 * This is used when dropping objects onto the floor.
594 */ 633 */
595void 634void
596drop_object (object *op, object *tmp, uint32 nrof) 635drop_object (object *op, object *tmp, uint32 nrof)
597{ 636{
598 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 637 if (tmp->flag [FLAG_NO_DROP])
599 return; 638 return;
600 639
601 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 640 if (tmp->flag [FLAG_APPLIED])
602 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 641 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
603 return; /* can't unapply it */ 642 return; /* can't unapply it */
604
605 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
606 643
607 /* 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
608 * off 645 * off
609 */ 646 */
610 if (!can_split (op, tmp, nrof)) 647 if (!can_split (op, tmp, nrof))
611
612 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
613 return; 648 return;
614 649
615 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 650 drop_object (op, tmp);
616 {
617 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
618 op->statusmsg ("The gods who lent it to you retrieves it.");
619 651
620 tmp->destroy (); 652 if (!tmp->destroyed () && !tmp->is_inserted ())
621 op->update_stats ();
622 return;
623 } 653 {
624 654 // if nothing happened with the object we give it back
625 /* Call this before we update the various windows/players. At least 655 op->insert (tmp);
626 * that we, we know the weight is correct.
627 */
628 // 2007-11-26: moved op->update_stats away and calling it later after
629 // all items of a drop command have been processed.
630
631 for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
632 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
633 return;
634
635 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
636 { 656 }
637 if (!sell_item (tmp, op))
638 return; // if we can't sell it we don't drop it
639 }
640
641 tmp->x = op->x;
642 tmp->y = op->y;
643
644 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
645} 657}
646 658
647void 659void
648drop (object *op, object *tmp) 660drop (object *op, object *tmp)
649{ 661{
… …
658 if (tmp->env && tmp->env->type != PLAYER) 670 if (tmp->env && tmp->env->type != PLAYER)
659 { 671 {
660 /* Just toss the object - probably shouldn't be hanging 672 /* Just toss the object - probably shouldn't be hanging
661 * around anyways 673 * around anyways
662 */ 674 */
663 tmp->remove ();
664 tmp->destroy (); 675 tmp->destroy ();
665 return; 676 return;
666 } 677 }
667 else 678 else
668 {
669 while (tmp && tmp->invisible) 679 while (tmp && tmp->invisible)
670 tmp = tmp->below; 680 tmp = tmp->below;
671 }
672 } 681 }
673 682
674 if (tmp == NULL) 683 if (!tmp)
675 { 684 {
676 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.");
677 return; 686 return;
678 } 687 }
679 688
680 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 689 if (tmp->flag [FLAG_INV_LOCKED])
681 { 690 {
682 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 691 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
683 return; 692 return;
684 } 693 }
685 694
686 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 695 if (tmp->flag [FLAG_NO_DROP])
687 { 696 {
688#if 0 697#if 0
689 /* 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. */
690 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.");
691#endif 700#endif
… …
693 } 702 }
694 703
695 if (op->type == PLAYER && op->contr->last_used == tmp) 704 if (op->type == PLAYER && op->contr->last_used == tmp)
696 op->contr->last_used = tmp->below ? tmp->below 705 op->contr->last_used = tmp->below ? tmp->below
697 : tmp->above ? tmp->above 706 : tmp->above ? tmp->above
698 : 0; 707 : (object *)0;
699 708
700 if (op->container) 709 if (op->container_ ())
701 { 710 {
702 if (op->type == PLAYER) 711 if (op->type == PLAYER)
703 put_object_in_sack (op, op->container, tmp, op->contr->count); 712 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
704 else 713 else
705 put_object_in_sack (op, op->container, tmp, 0); 714 put_object_in_sack (op, op->container_ (), tmp, 0);
706 } 715 }
707 else 716 else
708 { 717 {
709 if (op->type == PLAYER) 718 if (op->type == PLAYER)
710 drop_object (op, tmp, op->contr->count); 719 drop_object (op, tmp, op->contr->count);
… …
728 } 737 }
729 738
730 object *curinv = op->inv; 739 object *curinv = op->inv;
731 object *nextinv; 740 object *nextinv;
732 741
733 /* 742 /*
734 This is the default. Drops everything not locked or considered 743 This is the default. Drops everything not locked or considered
735 not something that should be dropped. 744 not something that should be dropped.
736 */ 745 */
737 /* 746 /*
738 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
739 the drop() routine will do unknown things to it when dropping 748 the drop() routine will do unknown things to it when dropping
740 in a shop. --Tero.Pelander@utu.fi 749 in a shop. --Tero.Pelander@utu.fi
741 */ 750 */
742
743 int cnt = MAX_ITEM_PER_DROP; 751 int cnt = MAX_ITEM_PER_ACTION;
744 752
745 if (!params) 753 if (!params)
746 { 754 {
747 while (curinv) 755 while (curinv)
748 { 756 {
749 nextinv = curinv->below; 757 nextinv = curinv->below;
750 758
751 while (nextinv && nextinv->type == MONEY) 759 while (nextinv && nextinv->type == MONEY)
752 nextinv = nextinv->below; 760 nextinv = nextinv->below;
753 761
754 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 762 if (!curinv->flag [FLAG_INV_LOCKED]
755 curinv->type != FOOD && curinv->type != KEY && 763 && !curinv->invisible
756 curinv->type != SPECIAL_KEY && curinv->type != GEM && 764 && curinv->type != MONEY
757 !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)
758 { 770 {
759 drop (op, curinv); 771 drop (op, curinv);
760 if (--cnt <= 0) break; 772 if (--cnt <= 0) break;
761 } 773 }
762 774
… …
770 nextinv = curinv->below; 782 nextinv = curinv->below;
771 783
772 while (nextinv && nextinv->type == MONEY) 784 while (nextinv && nextinv->type == MONEY)
773 nextinv = nextinv->below; 785 nextinv = nextinv->below;
774 786
775 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)))
776 { 788 {
777 drop (op, curinv); 789 drop (op, curinv);
778 if (--cnt <= 0) break; 790 if (--cnt <= 0) break;
779 } 791 }
780 792
… …
788 nextinv = curinv->below; 800 nextinv = curinv->below;
789 801
790 while (nextinv && nextinv->type == MONEY) 802 while (nextinv && nextinv->type == MONEY)
791 nextinv = nextinv->below; 803 nextinv = nextinv->below;
792 804
793 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))
794 { 806 {
795 drop (op, curinv); 807 drop (op, curinv);
796 if (--cnt <= 0) break; 808 if (--cnt <= 0) break;
797 } 809 }
798 810
… …
806 nextinv = curinv->below; 818 nextinv = curinv->below;
807 819
808 while (nextinv && nextinv->type == MONEY) 820 while (nextinv && nextinv->type == MONEY)
809 nextinv = nextinv->below; 821 nextinv = nextinv->below;
810 822
811 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 823 if (!curinv->flag [FLAG_INV_LOCKED] && !curinv->flag [FLAG_APPLIED])
812 { 824 {
813 switch (curinv->type) 825 switch (curinv->type)
814 { 826 {
815 case HORN: 827 case HORN:
816 case BOOK: 828 case BOOK:
… …
848 860
849/* draw_look(op);*/ 861/* draw_look(op);*/
850 return 0; 862 return 0;
851} 863}
852 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
853/* 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
854 * comma seperated list. 891 * comma seperated list.
855 */ 892 */
856int 893int
857command_drop (object *op, char *params) 894command_drop (object *op, char *params)
858{ 895{
859 object *tmp, *next; 896 object *tmp, *next;
860 int did_one = 0;
861 897
862 if (!params) 898 if (!params)
863 { 899 {
864 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
865 return 0; 901 return 0;
866 } 902 }
867 else 903 else
868 { 904 {
869 int cnt = MAX_ITEM_PER_DROP; 905 vector<object *> matched_objs;
870 906
871 for (tmp = op->inv; tmp; tmp = next) 907 for (tmp = op->inv; tmp; tmp = next)
872 { 908 {
873 next = tmp->below; 909 next = tmp->below;
874 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 910 if (tmp->flag [FLAG_NO_DROP] || tmp->invisible)
875 continue; 911 continue;
876 912
877 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
878 { 914 matched_objs.push_back (tmp);
879 drop (op, tmp);
880 if (--cnt <= 0) break;
881 did_one = 1;
882 } 915 }
883 }
884 916
885 if (!did_one) 917 int cnt = MAX_ITEM_PER_ACTION;
918
919 if (!drop_vector (op, matched_objs, &cnt))
886 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
887 921
888 if (cnt <= 0) 922 if (cnt <= 0)
889 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.");
890 } 924 }
… …
916 } 950 }
917 951
918 return 0; 952 return 0;
919} 953}
920 954
921/* op should be a player.
922 * we return the object the player has marked with the 'mark' command
923 * below. If no match is found (or object has changed), we return
924 * NULL. We leave it up to the calling function to print messages if
925 * nothing is found.
926 */
927object *
928find_marked_object (object *op)
929{
930 object *tmp;
931
932 if (!op || !op->contr)
933 return NULL;
934
935 if (!op->contr->mark)
936 {
937/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
938 return 0;
939 }
940
941 /* This may seem like overkill, but we need to make sure that they
942 * player hasn't dropped the item. We use count on the off chance that
943 * an item got reincarnated at some point.
944 */
945 for (tmp = op->inv; tmp; tmp = tmp->below)
946 {
947 if (tmp->invisible)
948 continue;
949
950 if (tmp == op->contr->mark)
951 {
952 if (!tmp->destroyed ())
953 return tmp;
954 else
955 {
956 op->contr->mark = 0;
957/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
958 return 0;
959 }
960 }
961 }
962
963 return 0;
964}
965
966std::string 955std::string
967object::describe_monster (object *who) 956object::describe_monster (object *who)
968{ 957{
969 dynbuf_text buf (512, 512); 958 dynbuf_text buf (512, 512);
970 959
971 object *mon = head ? head : this; 960 object *mon = head ? head : this;
972 961
973 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 962 if (mon->flag [FLAG_UNDEAD])
974 buf << "It is an undead force.\n"; 963 buf << "It is an undead force.\r";
975 964
976 if (mon->level > who->level) 965 if (mon->level > who->level)
977 buf << "It is likely more powerful than you.\n"; 966 buf << "It is likely more powerful than you.\r";
978 else if (mon->level < who->level) 967 else if (mon->level < who->level)
979 buf << "It is likely less powerful than you.\n"; 968 buf << "It is likely less powerful than you.\r";
980 else 969 else
981 buf << "It is probably as powerful as you.\n"; 970 buf << "It is probably as powerful as you.\r";
982 971
983 if (mon->attacktype & AT_ACID) 972 if (mon->attacktype & AT_ACID)
984 buf << "You seem to smell an acrid odor.\n"; 973 buf << "You seem to smell an acrid odor.\r";
985 974
986 /* 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
987 * maxhp field? This seems that it should give more accurate results. 976 * maxhp field? This seems that it should give more accurate results.
988 */ 977 */
989 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 978 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
990 { /* From 1-4 */ 979 { /* From 1-4 */
991 case 1: 980 case 1:
992 buf << "It is in a bad shape.\n"; 981 buf << "It is in a bad shape.\r";
993 break; 982 break;
994 case 2: 983 case 2:
995 buf << "It is hurt.\n"; 984 buf << "It is hurt.\r";
996 break; 985 break;
997 case 3: 986 case 3:
998 buf << "It is somewhat hurt.\n"; 987 buf << "It is somewhat hurt.\r";
999 break; 988 break;
1000 case 4: 989 case 4:
1001 buf << "It is in excellent shape.\n"; 990 buf << "It is in excellent shape.\r";
1002 break; 991 break;
1003 } 992 }
1004 993
1005 if (present_in_ob (POISONING, mon)) 994 if (present_in_ob (POISONING, mon))
1006 buf << "It looks very ill.\n"; 995 buf << "It looks very ill.\r";
996
997 buf << '\n';
1007 998
1008 return buf; 999 return buf;
1009} 1000}
1010 1001
1011/* 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. */
… …
1018} 1009}
1019 1010
1020std::string 1011std::string
1021object::long_desc (object *who) 1012object::long_desc (object *who)
1022{ 1013{
1023 std::string buf (query_name (this)); 1014 std::string buf (query_name ());
1024 1015
1025 switch (type) 1016 switch (type)
1026 { 1017 {
1027 case RING: 1018 case RING:
1028 case SKILL: 1019 case SKILL:
… …
1033 case SHIELD: 1024 case SHIELD:
1034 case BOOTS: 1025 case BOOTS:
1035 case GLOVES: 1026 case GLOVES:
1036 case AMULET: 1027 case AMULET:
1037 case GIRDLE: 1028 case GIRDLE:
1029 case RANGED:
1038 case BOW: 1030 case BOW:
1039 case ARROW: 1031 case ARROW:
1040 case CLOAK: 1032 case CLOAK:
1041 case FOOD: 1033 case FOOD:
1042 case DRINK: 1034 case DRINK:
1043 case FLESH: 1035 case FLESH:
1044 case SKILL_TOOL: 1036 case SKILL_TOOL:
1037 case LAMP:
1045 case POWER_CRYSTAL: 1038 case POWER_CRYSTAL:
1046 { 1039 {
1047 const char *cp = ::describe_item (this, who); 1040 const char *cp = ::describe_item (this, who);
1048 1041
1049 if (*cp) 1042 if (*cp)
… …
1064examine_monster (object *op, object *tmp) 1057examine_monster (object *op, object *tmp)
1065{ 1058{
1066 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 ());
1067} 1060}
1068 1061
1069std::string
1070object::describe (object *who)
1071{
1072 dynbuf_text buf (1024, 1024);
1073
1074 buf.printf ("That is: %s.\n", long_desc (who).c_str ());
1075
1076 if (custom_name)
1077 buf.printf ("You call it %s\n", &custom_name);
1078
1079 switch (type)
1080 {
1081 case SPELLBOOK:
1082 if (flag [FLAG_IDENTIFIED] && inv)
1083 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1084 break;
1085
1086 case BOOK:
1087 if (msg)
1088 buf << "Something is written in it.\n";
1089 break;
1090
1091 case CONTAINER:
1092 if (race != NULL)
1093 {
1094 if (weight_limit && stats.Str < 100)
1095 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1096 &race, weight_limit / (10.0 * (100 - stats.Str)));
1097 else
1098 buf.printf ("It can hold only %s.\n", &race);
1099 }
1100 else if (weight_limit && stats.Str < 100)
1101 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1102 break;
1103
1104 case WAND:
1105 if (flag [FLAG_IDENTIFIED])
1106 buf.printf ("It has %d charges left.\n", stats.food);
1107 break;
1108 }
1109
1110 if (materialname && !msg)
1111 buf.printf ("It is made of: %s.\n", &materialname);
1112
1113 if (who)
1114 /* Where to wear this item */
1115 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1116 if (slot[i].info)
1117 {
1118 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1119
1120 if (slot[i].info < -1 && who->slot[i].info)
1121 buf.printf ("(%d)", -slot[i].info);
1122
1123 buf << ".\n";
1124 }
1125
1126 if (weight)
1127 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1128
1129 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1130 {
1131 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1132
1133 if (is_in_shop (who))
1134 {
1135 if (flag [FLAG_UNPAID])
1136 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1137 else
1138 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1139 }
1140 }
1141
1142 if (flag [FLAG_MONSTER])
1143 buf << describe_monster (who);
1144
1145 /* Is this item buildable? */
1146 if (flag [FLAG_IS_BUILDABLE])
1147 buf << "This is a buildable item.\n";
1148
1149 /* Does the object have a message? Don't show message for all object
1150 * types - especially if the first entry is a match
1151 */
1152 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && *msg != '@')
1153 {
1154 /* This is just a hack so when identifying the items, we print
1155 * out the extra message
1156 */
1157 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1158 buf << "The object has a story:\n";
1159
1160 buf << msg << '\n';
1161 }
1162
1163 buf << '\n';
1164
1165 return std::string (buf.linearise (), buf.size ());
1166}
1167
1168static void 1062static void
1169display_new_pickup (object *op) 1063display_new_pickup (object *op)
1170{ 1064{
1171 int i = op->contr->mode; 1065 int i = op->contr->mode;
1172 1066
1173 if (!(i & PU_NEWMODE))
1174 return;
1175
1176 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1177 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);
1178 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);
1179 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);
1180 1070
1181 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);
… …
1232 }; 1122 };
1233 1123
1234 if (!params) 1124 if (!params)
1235 { 1125 {
1236 /* if the new mode is used, just print the settings */ 1126 /* if the new mode is used, just print the settings */
1237 if (op->contr->mode & PU_NEWMODE)
1238 {
1239 display_new_pickup (op); 1127 display_new_pickup (op);
1240 return 1;
1241 }
1242 if (1)
1243 LOG (llevDebug, "command_pickup: !params\n");
1244 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1245 return 0; 1128 return 0;
1246 } 1129 }
1247 1130
1248 while (*params == ' ' && *params) 1131 while (*params == ' ' && *params)
1249 params++; 1132 params++;
… …
1255 for (mode = 0; names[mode]; mode++) 1138 for (mode = 0; names[mode]; mode++)
1256 { 1139 {
1257 if (!strcmp (names[mode], params + 1)) 1140 if (!strcmp (names[mode], params + 1))
1258 { 1141 {
1259 i = op->contr->mode; 1142 i = op->contr->mode;
1260 if (!(i & PU_NEWMODE)) 1143
1261 i = PU_NEWMODE;
1262 if (*params == '+') 1144 if (*params == '+')
1263 i = i | modes[mode]; 1145 i = i | modes[mode];
1264 else 1146 else
1265 i = i & ~modes[mode]; 1147 i = i & ~modes[mode];
1148
1266 op->contr->mode = i; 1149 op->contr->mode = i;
1267 display_new_pickup (op); 1150 display_new_pickup (op);
1268 return 1; 1151 return 1;
1269 } 1152 }
1270 } 1153 }
… …
1272 return 1; 1155 return 1;
1273 } 1156 }
1274 1157
1275 if (sscanf (params, "%u", &i) != 1) 1158 if (sscanf (params, "%u", &i) != 1)
1276 { 1159 {
1277 if (1)
1278 LOG (llevDebug, "command_pickup: params==NULL\n");
1279 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.");
1280 return 1; 1161 return 1;
1281 } 1162 }
1282 set_pickup_mode (op, i); 1163
1164 if (i <= PU_RATIO)
1165 i |= op->contr->mode & ~PU_RATIO;
1166
1167 op->contr->mode = i;
1283 1168
1284 return 1; 1169 return 1;
1285} 1170}
1286 1171
1287void
1288set_pickup_mode (object *op, int i)
1289{
1290 switch (op->contr->mode = i)
1291 {
1292 case 0:
1293 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1294 break;
1295 case 1:
1296 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1297 break;
1298 case 2:
1299 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1300 break;
1301 case 3:
1302 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1303 break;
1304 case 4:
1305 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1306 break;
1307 case 5:
1308 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1309 break;
1310 case 6:
1311 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1312 break;
1313 case 7:
1314 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1315 break;
1316 }
1317}
1318
1319int 1172int
1320command_search_items (object *op, char *params) 1173command_search_items (object *op, char *params)
1321{ 1174{
1322 char buf[MAX_BUF];
1323
1324 if (settings.search_items == FALSE)
1325 return 1;
1326
1327 if (params == NULL) 1175 if (params == NULL)
1328 { 1176 {
1329 if (op->contr->search_str[0] == '\0') 1177 if (op->contr->search_str[0] == '\0')
1330 { 1178 {
1331 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1179 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1332 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");
1333 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'.");
1334 return 1; 1182 return 1;
1335 } 1183 }
1336 1184
1337 op->contr->search_str[0] = '\0'; 1185 op->contr->search_str[0] = '\0';
1338 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1186 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1339 op->update_stats (); 1187 op->contr->queue_stats_update ();
1340 return 1; 1188 return 1;
1341 } 1189 }
1342 1190
1343 if ((int) strlen (params) >= MAX_BUF) 1191 if (strlen (params) >= sizeof (op->contr->search_str))
1344 { 1192 {
1345 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1193 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1346 return 1; 1194 return 1;
1347 } 1195 }
1348 1196
1349 strcpy (op->contr->search_str, params); 1197 strcpy (op->contr->search_str, params);
1350 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));
1351 new_draw_info (NDI_UNIQUE, 0, op, buf); 1199 op->contr->queue_stats_update ();
1352 op->update_stats (); 1200
1353 return 1; 1201 return 1;
1354} 1202}
1355 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