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.72 by root, Tue May 6 16:32:34 2008 UTC vs.
Revision 1.134 by root, Sat Nov 17 23:40:03 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 10 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
20 * 22 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 24 */
23 25
24/* 26/*
25 * Object (handling) commands 27 * Object (handling) commands
26 */ 28 */
27 29
28#include <global.h> 30#include <global.h>
29#include <loader.h>
30#include <skills.h> 31#include <skills.h>
31#include <sproto.h> 32#include <sproto.h>
32#include <living.h> 33#include <living.h>
33#include <math.h>
34 34
35/* 35/*
36 * Object id parsing functions 36 * Object id parsing functions
37 */ 37 */
38 38
… …
68 68
69 int tmpmatch = item_matched_string (pl, tmp, params); 69 int tmpmatch = item_matched_string (pl, tmp, params);
70 70
71 if (tmpmatch > match_val) 71 if (tmpmatch > match_val)
72 { 72 {
73 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED))) 73 if ((aflag == AP_APPLY) && (tmp->flag [FLAG_APPLIED]))
74 continue; 74 continue;
75 75
76 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) 76 if ((aflag == AP_UNAPPLY) && (!tmp->flag [FLAG_APPLIED]))
77 continue; 77 continue;
78 78
79 match_val = tmpmatch; 79 match_val = tmpmatch;
80 best = tmp; 80 best = tmp;
81 } 81 }
… …
133 { 133 {
134 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); 134 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
135 return 0; 135 return 0;
136 } 136 }
137 137
138 skill = find_skill_by_name (pl, params); 138 skill = find_skill_by_name_fuzzy (pl, params);
139 139
140 if (!skill) 140 if (!skill)
141 { 141 {
142 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 142 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the %s skill.", params);
143 return 0; 143 return 0;
144 } 144 }
145 145
146 pl->change_skill (0); 146 pl->apply (skill);
147 apply_special (pl, skill, AP_APPLY);
148 return 1; 147 return 1;
149}
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} 148}
166 149
167/* A little special because we do want to pass the full params along 150/* A little special because we do want to pass the full params along
168 * as it includes the object to throw. 151 * as it includes the object to throw.
169 */ 152 */
170int 153int
171command_throw (object *op, char *params) 154command_throw (object *op, char *params)
172{ 155{
173 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING])) 156 if (object *skop = find_skill_by_name (op, shstr_throwing))
174 return do_skill (op, op, skop, op->facing, params); 157 return do_skill (op, op, skop, op->facing, params);
175 else 158 else
176 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing."); 159 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the throwing skill.");
177 160
178 return 0; 161 return 0;
179} 162}
180 163
181int 164int
… …
207 190
208 while (*params == ' ') 191 while (*params == ' ')
209 params++; 192 params++;
210 193
211 if (object *inv = find_best_apply_object_match (op, params, aflag)) 194 if (object *inv = find_best_apply_object_match (op, params, aflag))
212 player_apply (op, inv, aflag, 0); 195 op->apply (inv, aflag);
213 else 196 else
214 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params); 197 op->failmsgf ("Could not find any match to the %s.", params);
215 } 198 }
216 199
217 return 0; 200 return 0;
218} 201}
219 202
… …
227 * not need to use split_ob and stuff. 210 * not need to use split_ob and stuff.
228 */ 211 */
229int 212int
230sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 213sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
231{ 214{
232 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 215 if (!sack->flag [FLAG_APPLIED])
233 { 216 {
234 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); 217 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
235 return 0; 218 return 0;
236 } 219 }
237 220
… …
241 return 0; 224 return 0;
242 } 225 }
243 226
244 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) 227 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
245 { 228 {
246 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); 229 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can only put objects of type '%s' into the %s.", &sack->race, query_name (sack));
247 return 0; 230 return 0;
248 } 231 }
249 232
250 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 233 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
251 { 234 {
252 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); 235 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
253 return 0; 236 return 0;
254 } 237 }
255 238
256 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 239 if (sack->weight_limit
240 && weight_t (sack->carrying
241 + sack->number_of ()
257 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 242 * (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
258 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 243 * (100 - sack->stats.Str) / 100)
244 > sack->weight_limit)
259 { 245 {
260 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 246 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
261 return 0; 247 return 0;
262 } 248 }
263 249
… …
266} 252}
267 253
268/* Pick up commands follow */ 254/* Pick up commands follow */
269 255
270/* pl = player (not always - monsters can use this now) 256/* pl = player (not always - monsters can use this now)
271 * op is the object to put tmp into, 257 * op is the object to put tmp into,
272 * tmp is the object to pick up, nrof is the number to 258 * tmp is the object to pick up, nrof is the number to
273 * pick up (0 means all of them) 259 * pick up (0 means all of them)
274 */ 260 */
275static void 261static void
276pick_up_object (object *pl, object *op, object *tmp, int nrof) 262pick_up_object (object *pl, object *op, object *tmp, int nrof)
277{ 263{
278 object *env = tmp->env;
279 uint32 weight, effective_weight_limit; 264 weight_t weight, effective_weight_limit;
280 int tmp_nrof = tmp->number_of (); 265 int tmp_nrof = tmp->number_of ();
281 266
282 /* IF the player is flying & trying to take the item out of a container 267 /* IF the player is flying & trying to take the item out of a container
283 * that is in his inventory, let him. tmp->env points to the container 268 * that is in his inventory, let him. tmp->env points to the container
284 * (sack, luggage, etc), tmp->env->env then points to the player (nested 269 * (sack, luggage, etc), tmp->env->env then points to the player (nested
285 * containers not allowed as of now) 270 * containers not allowed as of now)
286 */ 271 */
287 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 272 if ((pl->move_type & MOVE_FLYING) && !pl->flag [FLAG_WIZ] && tmp->in_player () != pl)
288 { 273 {
289 pl->failmsg ("You are levitating, you can't reach the ground! " 274 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, " 275 "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.>"); 276 "or waiting till the levitation effect wears off.>");
292 return; 277 return;
293 } 278 }
294 279
295 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 280 if (tmp->flag [FLAG_NO_DROP])
296 return; 281 return;
297 282
298 if (nrof > tmp_nrof || nrof <= 0) 283 if (nrof > tmp_nrof || nrof <= 0)
299 nrof = tmp_nrof; 284 nrof = tmp_nrof;
300 285
… …
312 } 297 }
313 298
314 if (!can_split (pl, tmp, nrof)) 299 if (!can_split (pl, tmp, nrof))
315 return; 300 return;
316 301
317 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 302 if (tmp->flag [FLAG_UNPAID])
318 { 303 {
319 tmp->flag.reset (FLAG_UNPAID); 304 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)); 305 new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
321 tmp->flag.set (FLAG_UNPAID); 306 tmp->flag.set (FLAG_UNPAID);
322 } 307 }
… …
377 count = tmp->nrof; 362 count = tmp->nrof;
378 363
379 /* container is open, so use it */ 364 /* container is open, so use it */
380 if (tmp->flag [FLAG_STARTEQUIP]) 365 if (tmp->flag [FLAG_STARTEQUIP])
381 alt = op; 366 alt = op;
382 else if (op->container) 367 else if ((alt = op->container_ ()))
383 { 368 {
384 alt = op->container;
385 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 369 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
386 goto leave; 370 goto leave;
387 } 371 }
388 else 372 else
389 { /* non container pickup */ 373 { /* non container pickup */
390 for (alt = op->inv; alt; alt = alt->below) 374 for (alt = op->inv; alt; alt = alt->below)
391 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && 375 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] &&
392 alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count)) 376 alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count))
393 break; /* perfect match */ 377 break; /* perfect match */
394 378
395 if (!alt) 379 if (!alt)
396 for (alt = op->inv; alt; alt = alt->below) 380 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)) 381 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] && sack_can_hold (NULL, alt, tmp, count))
398 break; /* General container comes next */ 382 break; /* General container comes next */
399 383
400 if (!alt) 384 if (!alt)
401 alt = op; /* No free containers */ 385 alt = op; /* No free containers */
402 } 386 }
… …
412#ifdef PICKUP_DEBUG 396#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); 397 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
414#endif 398#endif
415 399
416 /* startequip items are not allowed to be put into containers: */ 400 /* startequip items are not allowed to be put into containers: */
417 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 401 if (op->type == PLAYER && alt->type == CONTAINER && tmp->flag [FLAG_STARTEQUIP])
418 { 402 {
419 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!"); 403 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!");
420 goto leave; 404 goto leave;
421 } 405 }
422 406
… …
443int 427int
444command_take (object *op, char *params) 428command_take (object *op, char *params)
445{ 429{
446 object *tmp, *next; 430 object *tmp, *next;
447 431
448 if (op->container) 432 if (op->container_ ())
449 tmp = op->container->inv; 433 tmp = op->container_ ()->inv;
450 else 434 else
451 { 435 {
452 tmp = op->above; 436 tmp = op->above;
453 if (tmp) 437 if (tmp)
454 while (tmp->above) 438 while (tmp->above)
… …
466 450
467 /* Makes processing easier */ 451 /* Makes processing easier */
468 if (params && *params == '\0') 452 if (params && *params == '\0')
469 params = 0; 453 params = 0;
470 454
471 int cnt = MAX_ITEM_PER_DROP; 455 int cnt = MAX_ITEM_PER_ACTION;
472 456
473 while (tmp) 457 while (tmp)
474 { 458 {
475 next = tmp->below; 459 next = tmp->below;
476 460
… …
484 * but that probably will make it more difficult to read, and 468 * but that probably will make it more difficult to read, and
485 * not make it any more efficient 469 * not make it any more efficient
486 */ 470 */
487 if (params && item_matched_string (op, tmp, params)) 471 if (params && item_matched_string (op, tmp, params))
488 { 472 {
473 if (--cnt < 0) break;
489 pick_up (op, tmp); 474 pick_up (op, tmp);
490 if (--cnt <= 0) break;
491 } 475 }
492 else if (can_pick (op, tmp) && !params) 476 else if (can_pick (op, tmp) && !params)
493 { 477 {
478 if (--cnt < 0) break;
494 pick_up (op, tmp); 479 pick_up (op, tmp);
495 break; 480 break;
496 } 481 }
497 482
498 tmp = next; 483 tmp = next;
499 } 484 }
500 485
501 if (cnt <= 0) 486 if (cnt < 0)
502 { 487 {
503 op->failmsg ("Couldn't pick up so many items at once."); 488 op->failmsg ("Couldn't pick up so many items at once.");
504 return 0; 489 return 0;
505 } 490 }
506 491
… …
519 504
520 return 0; 505 return 0;
521} 506}
522 507
523/* 508/*
524 * This function was part of drop, now is own function. 509 * This function was part of drop, now is own function.
525 * Player 'op' tries to put object 'tmp' into sack 'sack', 510 * 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. 511 * if nrof is non zero, then nrof objects is tried to put into sack.
512 *
527 * Note that the 'sack' in question can now be a transport, 513 * Note that the 'sack' in question can now be a transport,
528 * so this function isn't named very good anymore. 514 * so this function isn't named very good anymore.
529 */ 515 */
530void 516void
531put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 517put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
532{ 518{
533 object *tmp2, *sack2; 519 object *tmp2;
534 char buf[MAX_BUF]; 520 char buf[MAX_BUF];
535 521
536 if (sack == tmp) 522 if (sack == tmp)
537 return; /* Can't put an object in itself */ 523 return; /* Can't put an object in itself */
538 524
539 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 525 if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
540 { 526 {
541 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack)); 527 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
542 return; 528 return;
543 } 529 }
544 530
… …
546 { 532 {
547 /* Eneq(@csd.uu.se): If the object to be dropped is a container 533 /* Eneq(@csd.uu.se): If the object to be dropped is a container
548 * we instead move the contents of that container into the active 534 * we instead move the contents of that container into the active
549 * container, this is only done if the object has something in it. 535 * container, this is only done if the object has something in it.
550 */ 536 */
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)); 537 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack));
553 538
554 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 539 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
555 { 540 {
556 tmp = tmp2->below; 541 tmp = tmp2->below;
557 542
558 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 543 if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
559 put_object_in_sack (op, sack, tmp2, 0); 544 put_object_in_sack (op, sack, tmp2, 0);
560 else 545 else
561 { 546 {
562 sprintf (buf, "Your %s fills up.", query_name (sack)); 547 sprintf (buf, "Your %s fills up.", query_name (sack));
563 new_draw_info (NDI_UNIQUE, 0, op, buf); 548 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
572 * already checked this. 557 * already checked this.
573 */ 558 */
574 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof))) 559 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
575 return; 560 return;
576 561
577 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 562 if (tmp->flag [FLAG_APPLIED])
578 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 563 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
579 return; 564 return;
580 565
581 /* we want to put some portion of the item into the container */ 566 /* we want to put some portion of the item into the container */
582 if (!can_split (op, tmp, nrof)) 567 if (!can_split (op, tmp, nrof))
583 return; 568 return;
584 569
585 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 570 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
586 sack->insert (tmp); 571 sack->insert (tmp);
587} 572}
588 573
574/* In contrast to drop_object (op, tmp, nrof) above this function takes the
575 * already split off object, and feeds it to the event handlers and does
576 * other magic with it.
577 *
578 * <droppper> is the object that dropped this object and <obj> is the
579 * object that was dropped.
580 *
581 * Make sure to check what happened with <obj> after this function returns!
582 * Otherwise you may leak this object.
583 */
584void
585drop_object (object *dropper, object *obj)
586{
587 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
588 return;
589
590 if (obj->destroyed () || obj->is_inserted ())
591 return;
592
593 if (obj->flag [FLAG_STARTEQUIP])
594 {
595 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
596 dropper->statusmsg ("The god who lent it to you retrieves it.");
597
598 obj->destroy ();
599 dropper->update_stats ();
600 return;
601 }
602
603 for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
604 floor;
605 floor = floor->above)
606 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
607 return;
608
609 if (obj->destroyed () || obj->is_inserted ())
610 return;
611
612 if (dropper->is_in_shop () && !obj->flag [FLAG_UNPAID] && obj->type != MONEY)
613 if (!sell_item (obj, dropper))
614 return;
615
616 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
617 return;
618
619 /* If nothing special happened with this object, the default action is to
620 * insert it below the dropper:
621 */
622
623 obj->x = dropper->x;
624 obj->y = dropper->y;
625
626 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
627}
628
589/* 629/*
590 * This function was part of drop, now is own function. 630 * This function was part of drop, now is own function.
591 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 631 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
592 * nrof objects is tried to dropped. 632 * nrof objects are tried to drop.
593 * This is used when dropping objects onto the floor. 633 * This is used when dropping objects onto the floor.
594 */ 634 */
595void 635void
596drop_object (object *op, object *tmp, uint32 nrof) 636drop_object (object *op, object *tmp, uint32 nrof)
597{ 637{
598 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 638 if (tmp->flag [FLAG_NO_DROP])
599 return; 639 return;
600 640
601 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 641 if (tmp->flag [FLAG_APPLIED])
602 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 642 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
603 return; /* can't unapply it */ 643 return; /* can't unapply it */
604
605 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
606 644
607 /* We are only dropping some of the items. We split the current object 645 /* We are only dropping some of the items. We split the current object
608 * off 646 * off
609 */ 647 */
610 if (!can_split (op, tmp, nrof)) 648 if (!can_split (op, tmp, nrof))
611
612 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
613 return; 649 return;
614 650
615 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 651 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 652
620 tmp->destroy (); 653 if (!tmp->destroyed () && !tmp->is_inserted ())
621 op->update_stats ();
622 return;
623 } 654 {
624 655 // if nothing happened with the object we give it back
625 /* Call this before we update the various windows/players. At least 656 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 { 657 }
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} 658}
646 659
647void 660void
648drop (object *op, object *tmp) 661drop (object *op, object *tmp)
649{ 662{
… …
658 if (tmp->env && tmp->env->type != PLAYER) 671 if (tmp->env && tmp->env->type != PLAYER)
659 { 672 {
660 /* Just toss the object - probably shouldn't be hanging 673 /* Just toss the object - probably shouldn't be hanging
661 * around anyways 674 * around anyways
662 */ 675 */
663 tmp->remove ();
664 tmp->destroy (); 676 tmp->destroy ();
665 return; 677 return;
666 } 678 }
667 else 679 else
668 {
669 while (tmp && tmp->invisible) 680 while (tmp && tmp->invisible)
670 tmp = tmp->below; 681 tmp = tmp->below;
671 }
672 } 682 }
673 683
674 if (tmp == NULL) 684 if (!tmp)
675 { 685 {
676 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 686 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
677 return; 687 return;
678 } 688 }
679 689
680 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 690 if (tmp->flag [FLAG_INV_LOCKED])
681 { 691 {
682 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 692 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
683 return; 693 return;
684 } 694 }
685 695
686 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 696 if (tmp->flag [FLAG_NO_DROP])
687 { 697 {
688#if 0 698#if 0
689 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 699 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
690 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 700 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
691#endif 701#endif
… …
693 } 703 }
694 704
695 if (op->type == PLAYER && op->contr->last_used == tmp) 705 if (op->type == PLAYER && op->contr->last_used == tmp)
696 op->contr->last_used = tmp->below ? tmp->below 706 op->contr->last_used = tmp->below ? tmp->below
697 : tmp->above ? tmp->above 707 : tmp->above ? tmp->above
698 : 0; 708 : (object *)0;
699 709
700 if (op->container) 710 if (op->container_ ())
701 { 711 {
702 if (op->type == PLAYER) 712 if (op->type == PLAYER)
703 put_object_in_sack (op, op->container, tmp, op->contr->count); 713 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
704 else 714 else
705 put_object_in_sack (op, op->container, tmp, 0); 715 put_object_in_sack (op, op->container_ (), tmp, 0);
706 } 716 }
707 else 717 else
708 { 718 {
709 if (op->type == PLAYER) 719 if (op->type == PLAYER)
710 drop_object (op, tmp, op->contr->count); 720 drop_object (op, tmp, op->contr->count);
… …
728 } 738 }
729 739
730 object *curinv = op->inv; 740 object *curinv = op->inv;
731 object *nextinv; 741 object *nextinv;
732 742
733 /* 743 /*
734 This is the default. Drops everything not locked or considered 744 This is the default. Drops everything not locked or considered
735 not something that should be dropped. 745 not something that should be dropped.
736 */ 746 */
737 /* 747 /*
738 Care must be taken that the next item pointer is not to money as 748 Care must be taken that the next item pointer is not to money as
739 the drop() routine will do unknown things to it when dropping 749 the drop() routine will do unknown things to it when dropping
740 in a shop. --Tero.Pelander@utu.fi 750 in a shop. --Tero.Pelander@utu.fi
741 */ 751 */
742
743 int cnt = MAX_ITEM_PER_DROP; 752 int cnt = MAX_ITEM_PER_ACTION;
744 753
745 if (!params) 754 if (!params)
746 { 755 {
747 while (curinv) 756 while (curinv)
748 { 757 {
749 nextinv = curinv->below; 758 nextinv = curinv->below;
750 759
751 while (nextinv && nextinv->type == MONEY) 760 while (nextinv && nextinv->type == MONEY)
752 nextinv = nextinv->below; 761 nextinv = nextinv->below;
753 762
754 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 763 if (!curinv->flag [FLAG_INV_LOCKED]
755 curinv->type != FOOD && curinv->type != KEY && 764 && !curinv->invisible
756 curinv->type != SPECIAL_KEY && curinv->type != GEM && 765 && curinv->type != MONEY
757 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 766 && curinv->type != FOOD
767 && curinv->type != KEY
768 && curinv->type != SPECIAL_KEY
769 && curinv->type != GEM
770 && curinv->type != CONTAINER)
758 { 771 {
759 drop (op, curinv); 772 drop (op, curinv);
760 if (--cnt <= 0) break; 773 if (--cnt <= 0) break;
761 } 774 }
762 775
… …
770 nextinv = curinv->below; 783 nextinv = curinv->below;
771 784
772 while (nextinv && nextinv->type == MONEY) 785 while (nextinv && nextinv->type == MONEY)
773 nextinv = nextinv->below; 786 nextinv = nextinv->below;
774 787
775 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 788 if (!curinv->flag [FLAG_INV_LOCKED] && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
776 { 789 {
777 drop (op, curinv); 790 drop (op, curinv);
778 if (--cnt <= 0) break; 791 if (--cnt <= 0) break;
779 } 792 }
780 793
… …
788 nextinv = curinv->below; 801 nextinv = curinv->below;
789 802
790 while (nextinv && nextinv->type == MONEY) 803 while (nextinv && nextinv->type == MONEY)
791 nextinv = nextinv->below; 804 nextinv = nextinv->below;
792 805
793 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 806 if (!curinv->flag [FLAG_INV_LOCKED] && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
794 { 807 {
795 drop (op, curinv); 808 drop (op, curinv);
796 if (--cnt <= 0) break; 809 if (--cnt <= 0) break;
797 } 810 }
798 811
… …
806 nextinv = curinv->below; 819 nextinv = curinv->below;
807 820
808 while (nextinv && nextinv->type == MONEY) 821 while (nextinv && nextinv->type == MONEY)
809 nextinv = nextinv->below; 822 nextinv = nextinv->below;
810 823
811 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 824 if (!curinv->flag [FLAG_INV_LOCKED] && !curinv->flag [FLAG_APPLIED])
812 { 825 {
813 switch (curinv->type) 826 switch (curinv->type)
814 { 827 {
815 case HORN: 828 case HORN:
816 case BOOK: 829 case BOOK:
… …
848 861
849/* draw_look(op);*/ 862/* draw_look(op);*/
850 return 0; 863 return 0;
851} 864}
852 865
866
867/* This function tries to drop all objects in the <objs> vector.
868 * <dropper> is the object that wants to drop them.
869 * <cnt> can be a 0 pointer or a pointer to the maximum number of
870 * drop operations to perform.
871 *
872 * Returns true if at least one item was dropped.
873 */
874static bool
875drop_vector (object *dropper, vector<object *> &objs, int *cnt)
876{
877 vector<object *>::iterator i;
878
879 bool did_one = false;
880
881 for (i = objs.begin (); i != objs.end (); i++)
882 {
883 drop (dropper, *i);
884 if (cnt && --*cnt <= 0) break;
885 did_one = true;
886 }
887
888 return did_one;
889}
890
853/* Object op wants to drop object(s) params. params can be a 891/* Object op wants to drop object(s) params. params can be a
854 * comma seperated list. 892 * comma seperated list.
855 */ 893 */
856int 894int
857command_drop (object *op, char *params) 895command_drop (object *op, char *params)
858{ 896{
859 object *tmp, *next; 897 object *tmp, *next;
860 int did_one = 0;
861 898
862 if (!params) 899 if (!params)
863 { 900 {
864 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 901 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
865 return 0; 902 return 0;
866 } 903 }
867 else 904 else
868 { 905 {
869 int cnt = MAX_ITEM_PER_DROP; 906 vector<object *> matched_objs;
870 907
871 for (tmp = op->inv; tmp; tmp = next) 908 for (tmp = op->inv; tmp; tmp = next)
872 { 909 {
873 next = tmp->below; 910 next = tmp->below;
874 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 911 if (tmp->flag [FLAG_NO_DROP] || tmp->invisible)
875 continue; 912 continue;
876 913
877 if (item_matched_string (op, tmp, params)) 914 if (item_matched_string (op, tmp, params))
878 { 915 matched_objs.push_back (tmp);
879 drop (op, tmp);
880 if (--cnt <= 0) break;
881 did_one = 1;
882 } 916 }
883 }
884 917
885 if (!did_one) 918 int cnt = MAX_ITEM_PER_ACTION;
919
920 if (!drop_vector (op, matched_objs, &cnt))
886 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 921 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
887 922
888 if (cnt <= 0) 923 if (cnt <= 0)
889 op->failmsg ("Only dropped some items, can't drop that many items at once."); 924 op->failmsg ("Only dropped some items, can't drop that many items at once.");
890 } 925 }
… …
916 } 951 }
917 952
918 return 0; 953 return 0;
919} 954}
920 955
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 956std::string
967object::describe_monster (object *who) 957object::describe_monster (object *who)
968{ 958{
969 dynbuf_text buf (512, 512); 959 dynbuf_text buf (512, 512);
970 960
971 object *mon = head ? head : this; 961 object *mon = head ? head : this;
972 962
973 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 963 if (mon->flag [FLAG_UNDEAD])
974 buf << "It is an undead force.\n"; 964 buf << "It is an undead force.\r";
975 965
976 if (mon->level > who->level) 966 if (mon->level > who->level)
977 buf << "It is likely more powerful than you.\n"; 967 buf << "It is likely more powerful than you.\r";
978 else if (mon->level < who->level) 968 else if (mon->level < who->level)
979 buf << "It is likely less powerful than you.\n"; 969 buf << "It is likely less powerful than you.\r";
980 else 970 else
981 buf << "It is probably as powerful as you.\n"; 971 buf << "It is probably as powerful as you.\r";
982 972
983 if (mon->attacktype & AT_ACID) 973 if (mon->attacktype & AT_ACID)
984 buf << "You seem to smell an acrid odor.\n"; 974 buf << "You seem to smell an acrid odor.\r";
985 975
986 /* Anyone know why this used to use the clone value instead of the 976 /* 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. 977 * maxhp field? This seems that it should give more accurate results.
988 */ 978 */
989 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 979 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
990 { /* From 1-4 */ 980 { /* From 1-4 */
991 case 1: 981 case 1:
992 buf << "It is in a bad shape.\n"; 982 buf << "It is in a bad shape.\r";
993 break; 983 break;
994 case 2: 984 case 2:
995 buf << "It is hurt.\n"; 985 buf << "It is hurt.\r";
996 break; 986 break;
997 case 3: 987 case 3:
998 buf << "It is somewhat hurt.\n"; 988 buf << "It is somewhat hurt.\r";
999 break; 989 break;
1000 case 4: 990 case 4:
1001 buf << "It is in excellent shape.\n"; 991 buf << "It is in excellent shape.\r";
1002 break; 992 break;
1003 } 993 }
1004 994
1005 if (present_in_ob (POISONING, mon)) 995 if (present_in_ob (POISONING, mon))
1006 buf << "It looks very ill.\n"; 996 buf << "It looks very ill.\r";
997
998 buf << '\n';
1007 999
1008 return buf; 1000 return buf;
1009} 1001}
1010 1002
1011/* tmp is the object being described, pl is who is examing it. */ 1003/* tmp is the object being described, pl is who is examing it. */
… …
1018} 1010}
1019 1011
1020std::string 1012std::string
1021object::long_desc (object *who) 1013object::long_desc (object *who)
1022{ 1014{
1023 std::string buf (query_name (this)); 1015 std::string buf (query_name ());
1024 1016
1025 switch (type) 1017 switch (type)
1026 { 1018 {
1027 case RING: 1019 case RING:
1028 case SKILL: 1020 case SKILL:
… …
1033 case SHIELD: 1025 case SHIELD:
1034 case BOOTS: 1026 case BOOTS:
1035 case GLOVES: 1027 case GLOVES:
1036 case AMULET: 1028 case AMULET:
1037 case GIRDLE: 1029 case GIRDLE:
1030 case RANGED:
1038 case BOW: 1031 case BOW:
1039 case ARROW: 1032 case ARROW:
1040 case CLOAK: 1033 case CLOAK:
1041 case FOOD: 1034 case FOOD:
1042 case DRINK: 1035 case DRINK:
1043 case FLESH: 1036 case FLESH:
1044 case SKILL_TOOL: 1037 case SKILL_TOOL:
1038 case LAMP:
1045 case POWER_CRYSTAL: 1039 case POWER_CRYSTAL:
1046 { 1040 {
1047 const char *cp = ::describe_item (this, who); 1041 const char *cp = ::describe_item (this, who);
1048 1042
1049 if (*cp) 1043 if (*cp)
… …
1064examine_monster (object *op, object *tmp) 1058examine_monster (object *op, object *tmp)
1065{ 1059{
1066 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ()); 1060 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1067} 1061}
1068 1062
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 1063static void
1169display_new_pickup (object *op) 1064display_new_pickup (object *op)
1170{ 1065{
1171 int i = op->contr->mode; 1066 int i = op->contr->mode;
1172 1067
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); 1068 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); 1069 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); 1070 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1180 1071
1181 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5); 1072 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
… …
1232 }; 1123 };
1233 1124
1234 if (!params) 1125 if (!params)
1235 { 1126 {
1236 /* if the new mode is used, just print the settings */ 1127 /* if the new mode is used, just print the settings */
1237 if (op->contr->mode & PU_NEWMODE)
1238 {
1239 display_new_pickup (op); 1128 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; 1129 return 0;
1246 } 1130 }
1247 1131
1248 while (*params == ' ' && *params) 1132 while (*params == ' ' && *params)
1249 params++; 1133 params++;
… …
1255 for (mode = 0; names[mode]; mode++) 1139 for (mode = 0; names[mode]; mode++)
1256 { 1140 {
1257 if (!strcmp (names[mode], params + 1)) 1141 if (!strcmp (names[mode], params + 1))
1258 { 1142 {
1259 i = op->contr->mode; 1143 i = op->contr->mode;
1260 if (!(i & PU_NEWMODE)) 1144
1261 i = PU_NEWMODE;
1262 if (*params == '+') 1145 if (*params == '+')
1263 i = i | modes[mode]; 1146 i = i | modes[mode];
1264 else 1147 else
1265 i = i & ~modes[mode]; 1148 i = i & ~modes[mode];
1149
1266 op->contr->mode = i; 1150 op->contr->mode = i;
1267 display_new_pickup (op); 1151 display_new_pickup (op);
1268 return 1; 1152 return 1;
1269 } 1153 }
1270 } 1154 }
… …
1272 return 1; 1156 return 1;
1273 } 1157 }
1274 1158
1275 if (sscanf (params, "%u", &i) != 1) 1159 if (sscanf (params, "%u", &i) != 1)
1276 { 1160 {
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> ."); 1161 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1280 return 1; 1162 return 1;
1281 } 1163 }
1282 set_pickup_mode (op, i); 1164
1165 if (i <= PU_RATIO)
1166 i |= op->contr->mode & ~PU_RATIO;
1167
1168 op->contr->mode = i;
1283 1169
1284 return 1; 1170 return 1;
1285} 1171}
1286 1172
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 1173int
1320command_search_items (object *op, char *params) 1174command_search_items (object *op, char *params)
1321{ 1175{
1322 char buf[MAX_BUF];
1323
1324 if (settings.search_items == FALSE)
1325 return 1;
1326
1327 if (params == NULL) 1176 if (params == NULL)
1328 { 1177 {
1329 if (op->contr->search_str[0] == '\0') 1178 if (op->contr->search_str[0] == '\0')
1330 { 1179 {
1331 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1180 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"); 1181 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'."); 1182 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1334 return 1; 1183 return 1;
1335 } 1184 }
1336 1185
1337 op->contr->search_str[0] = '\0'; 1186 op->contr->search_str[0] = '\0';
1338 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1187 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1339 op->update_stats (); 1188 op->contr->queue_stats_update ();
1340 return 1; 1189 return 1;
1341 } 1190 }
1342 1191
1343 if ((int) strlen (params) >= MAX_BUF) 1192 if (strlen (params) >= sizeof (op->contr->search_str))
1344 { 1193 {
1345 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1194 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1346 return 1; 1195 return 1;
1347 } 1196 }
1348 1197
1349 strcpy (op->contr->search_str, params); 1198 strcpy (op->contr->search_str, params);
1350 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1199 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); 1200 op->contr->queue_stats_update ();
1352 op->update_stats (); 1201
1353 return 1; 1202 return 1;
1354} 1203}
1355 1204
1205int
1206command_unlock (object *op, char *params)
1207{
1208 /* if the unlock command typed with nothing, unlock everything,
1209 * this might be bad
1210 */
1211 if (params == NULL)
1212 {
1213 for (object *item = op->inv; item; item = item->below)
1214 {
1215 item->clr_flag (FLAG_INV_LOCKED);
1216 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
1217 esrv_update_item (UPD_FLAGS, op, item);
1218 }
1219 return 0;
1220 }
1221
1222 /* if the unlock command is used with a param,
1223 * unlock what matches. i.e. unlock material, should unlock all the materials
1224 */
1225 for (object *item = op->inv; item; item = item->below)
1226 if (item->name.contains (params))
1227 {
1228 item->clr_flag (FLAG_INV_LOCKED);
1229 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
1230 esrv_update_item (UPD_FLAGS, op, item);
1231 }
1232
1233 return 0;
1234}
1235
1236int
1237command_lock (object *op, char *params)
1238{
1239 /* if the lock command is typed by itself, lock everything
1240 */
1241 if (params == NULL)
1242 {
1243 for (object *item = op->inv; item; item = item->below)
1244 {
1245 item->set_flag (FLAG_INV_LOCKED);
1246 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
1247 esrv_update_item (UPD_FLAGS, op, item);
1248 }
1249 return 0;
1250 }
1251
1252 /* if the lock command is used with a param, lock what matches.
1253 * i.e. lock material, should lock all the materials
1254 */
1255 for (object *item = op->inv; item; item = item->below)
1256 if (item->name.contains (params))
1257 {
1258 item->set_flag (FLAG_INV_LOCKED);
1259 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
1260 esrv_update_item (UPD_FLAGS, op, item);
1261 }
1262
1263 return 0;
1264}
1265
1266/* op should be a player, params is any params.
1267 * If no params given, we print out the currently marked object.
1268 * otherwise, try to find a matching object - try best match first.
1269 */
1270int
1271command_mark (object *op, char *params)
1272{
1273 if (!params)
1274 {
1275 if (object *mark = op->mark ())
1276 op->statusmsg (format ("%s is marked.", query_name (mark)));
1277 else
1278 op->failmsg ("You have no marked object.");
1279 }
1280 else
1281 {
1282 if (object *mark = find_best_object_match (op, params))
1283 {
1284 op->contr->mark = mark;
1285 op->statusmsg (format ("Marked item %s", query_name (mark)));
1286 }
1287 else
1288 op->failmsgf ("Could not find an object that matches %s", params);
1289 }
1290
1291 return 0; /*shouldnt get here */
1292}
1293

Diff Legend

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