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