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.82 by elmex, Tue Oct 7 11:10:30 2008 UTC vs.
Revision 1.133 by root, Sun Jan 29 02:47:05 2017 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* 25/*
25 * Object (handling) commands 26 * Object (handling) commands
26 */ 27 */
27 28
28#include <global.h> 29#include <global.h>
29#include <loader.h>
30#include <skills.h> 30#include <skills.h>
31#include <sproto.h> 31#include <sproto.h>
32#include <living.h> 32#include <living.h>
33#include <math.h>
34 33
35/* 34/*
36 * Object id parsing functions 35 * Object id parsing functions
37 */ 36 */
38 37
… …
68 67
69 int tmpmatch = item_matched_string (pl, tmp, params); 68 int tmpmatch = item_matched_string (pl, tmp, params);
70 69
71 if (tmpmatch > match_val) 70 if (tmpmatch > match_val)
72 { 71 {
73 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED))) 72 if ((aflag == AP_APPLY) && (tmp->flag [FLAG_APPLIED]))
74 continue; 73 continue;
75 74
76 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) 75 if ((aflag == AP_UNAPPLY) && (!tmp->flag [FLAG_APPLIED]))
77 continue; 76 continue;
78 77
79 match_val = tmpmatch; 78 match_val = tmpmatch;
80 best = tmp; 79 best = tmp;
81 } 80 }
… …
133 { 132 {
134 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); 133 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
135 return 0; 134 return 0;
136 } 135 }
137 136
138 skill = find_skill_by_name (pl, params); 137 skill = find_skill_by_name_fuzzy (pl, params);
139 138
140 if (!skill) 139 if (!skill)
141 { 140 {
142 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 141 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the %s skill.", params);
143 return 0; 142 return 0;
144 } 143 }
145 144
146 pl->change_skill (0); 145 pl->apply (skill);
147 apply_special (pl, skill, AP_APPLY);
148 return 1; 146 return 1;
149}
150
151/* These functions (command_search, command_disarm) are really just wrappers for
152 * things like 'use_skill ...'). In fact, they should really be obsoleted
153 * and replaced with those.
154 */
155int
156command_search (object *op, char *params)
157{
158 return use_skill (op, skill_names[SK_FIND_TRAPS]);
159}
160
161int
162command_disarm (object *op, char *params)
163{
164 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
165} 147}
166 148
167/* A little special because we do want to pass the full params along 149/* A little special because we do want to pass the full params along
168 * as it includes the object to throw. 150 * as it includes the object to throw.
169 */ 151 */
170int 152int
171command_throw (object *op, char *params) 153command_throw (object *op, char *params)
172{ 154{
173 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING])) 155 if (object *skop = find_skill_by_name (op, shstr_throwing))
174 return do_skill (op, op, skop, op->facing, params); 156 return do_skill (op, op, skop, op->facing, params);
175 else 157 else
176 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing."); 158 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the throwing skill.");
177 159
178 return 0; 160 return 0;
179} 161}
180 162
181int 163int
… …
207 189
208 while (*params == ' ') 190 while (*params == ' ')
209 params++; 191 params++;
210 192
211 if (object *inv = find_best_apply_object_match (op, params, aflag)) 193 if (object *inv = find_best_apply_object_match (op, params, aflag))
212 player_apply (op, inv, aflag, 0); 194 op->apply (inv, aflag);
213 else 195 else
214 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params); 196 op->failmsgf ("Could not find any match to the %s.", params);
215 } 197 }
216 198
217 return 0; 199 return 0;
218} 200}
219 201
… …
227 * not need to use split_ob and stuff. 209 * not need to use split_ob and stuff.
228 */ 210 */
229int 211int
230sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 212sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
231{ 213{
232 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 214 if (!sack->flag [FLAG_APPLIED])
233 { 215 {
234 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); 216 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
235 return 0; 217 return 0;
236 } 218 }
237 219
… …
241 return 0; 223 return 0;
242 } 224 }
243 225
244 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) 226 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
245 { 227 {
246 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); 228 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can only put objects of type '%s' into the %s.", &sack->race, query_name (sack));
247 return 0; 229 return 0;
248 } 230 }
249 231
250 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 232 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
251 { 233 {
252 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); 234 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
253 return 0; 235 return 0;
254 } 236 }
255 237
256 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 238 if (sack->weight_limit
239 && weight_t (sack->carrying
240 + sack->number_of ()
257 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 241 * (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
258 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 242 * (100 - sack->stats.Str) / 100)
243 > sack->weight_limit)
259 { 244 {
260 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 245 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
261 return 0; 246 return 0;
262 } 247 }
263 248
… …
266} 251}
267 252
268/* Pick up commands follow */ 253/* Pick up commands follow */
269 254
270/* pl = player (not always - monsters can use this now) 255/* pl = player (not always - monsters can use this now)
271 * op is the object to put tmp into, 256 * op is the object to put tmp into,
272 * tmp is the object to pick up, nrof is the number to 257 * tmp is the object to pick up, nrof is the number to
273 * pick up (0 means all of them) 258 * pick up (0 means all of them)
274 */ 259 */
275static void 260static void
276pick_up_object (object *pl, object *op, object *tmp, int nrof) 261pick_up_object (object *pl, object *op, object *tmp, int nrof)
277{ 262{
278 object *env = tmp->env;
279 uint32 weight, effective_weight_limit; 263 weight_t weight, effective_weight_limit;
280 int tmp_nrof = tmp->number_of (); 264 int tmp_nrof = tmp->number_of ();
281 265
282 /* IF the player is flying & trying to take the item out of a container 266 /* IF the player is flying & trying to take the item out of a container
283 * that is in his inventory, let him. tmp->env points to the container 267 * that is in his inventory, let him. tmp->env points to the container
284 * (sack, luggage, etc), tmp->env->env then points to the player (nested 268 * (sack, luggage, etc), tmp->env->env then points to the player (nested
285 * containers not allowed as of now) 269 * containers not allowed as of now)
286 */ 270 */
287 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 271 if ((pl->move_type & MOVE_FLYING) && !pl->flag [FLAG_WIZ] && tmp->in_player () != pl)
288 { 272 {
289 pl->failmsg ("You are levitating, you can't reach the ground! " 273 pl->failmsg ("You are levitating, you can't reach the ground! "
290 "H<You have to stop levitating first, if you can, either by using your levitation skill, " 274 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
291 "or waiting till the levitation effect wears off.>"); 275 "or waiting till the levitation effect wears off.>");
292 return; 276 return;
293 } 277 }
294 278
295 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 279 if (tmp->flag [FLAG_NO_DROP])
296 return; 280 return;
297 281
298 if (nrof > tmp_nrof || nrof <= 0) 282 if (nrof > tmp_nrof || nrof <= 0)
299 nrof = tmp_nrof; 283 nrof = tmp_nrof;
300 284
… …
312 } 296 }
313 297
314 if (!can_split (pl, tmp, nrof)) 298 if (!can_split (pl, tmp, nrof))
315 return; 299 return;
316 300
317 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 301 if (tmp->flag [FLAG_UNPAID])
318 { 302 {
319 tmp->flag.reset (FLAG_UNPAID); 303 tmp->flag.reset (FLAG_UNPAID);
320 new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP)); 304 new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
321 tmp->flag.set (FLAG_UNPAID); 305 tmp->flag.set (FLAG_UNPAID);
322 } 306 }
… …
377 count = tmp->nrof; 361 count = tmp->nrof;
378 362
379 /* container is open, so use it */ 363 /* container is open, so use it */
380 if (tmp->flag [FLAG_STARTEQUIP]) 364 if (tmp->flag [FLAG_STARTEQUIP])
381 alt = op; 365 alt = op;
382 else if (op->container) 366 else if ((alt = op->container_ ()))
383 { 367 {
384 alt = op->container;
385 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 368 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
386 goto leave; 369 goto leave;
387 } 370 }
388 else 371 else
389 { /* non container pickup */ 372 { /* non container pickup */
390 for (alt = op->inv; alt; alt = alt->below) 373 for (alt = op->inv; alt; alt = alt->below)
391 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && 374 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] &&
392 alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count)) 375 alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count))
393 break; /* perfect match */ 376 break; /* perfect match */
394 377
395 if (!alt) 378 if (!alt)
396 for (alt = op->inv; alt; alt = alt->below) 379 for (alt = op->inv; alt; alt = alt->below)
397 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count)) 380 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] && sack_can_hold (NULL, alt, tmp, count))
398 break; /* General container comes next */ 381 break; /* General container comes next */
399 382
400 if (!alt) 383 if (!alt)
401 alt = op; /* No free containers */ 384 alt = op; /* No free containers */
402 } 385 }
… …
412#ifdef PICKUP_DEBUG 395#ifdef PICKUP_DEBUG
413 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); 396 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
414#endif 397#endif
415 398
416 /* startequip items are not allowed to be put into containers: */ 399 /* startequip items are not allowed to be put into containers: */
417 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 400 if (op->type == PLAYER && alt->type == CONTAINER && tmp->flag [FLAG_STARTEQUIP])
418 { 401 {
419 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!"); 402 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!");
420 goto leave; 403 goto leave;
421 } 404 }
422 405
… …
443int 426int
444command_take (object *op, char *params) 427command_take (object *op, char *params)
445{ 428{
446 object *tmp, *next; 429 object *tmp, *next;
447 430
448 if (op->container) 431 if (op->container_ ())
449 tmp = op->container->inv; 432 tmp = op->container_ ()->inv;
450 else 433 else
451 { 434 {
452 tmp = op->above; 435 tmp = op->above;
453 if (tmp) 436 if (tmp)
454 while (tmp->above) 437 while (tmp->above)
… …
466 449
467 /* Makes processing easier */ 450 /* Makes processing easier */
468 if (params && *params == '\0') 451 if (params && *params == '\0')
469 params = 0; 452 params = 0;
470 453
471 int cnt = MAX_ITEM_PER_DROP; 454 int cnt = MAX_ITEM_PER_ACTION;
472 455
473 while (tmp) 456 while (tmp)
474 { 457 {
475 next = tmp->below; 458 next = tmp->below;
476 459
… …
520 503
521 return 0; 504 return 0;
522} 505}
523 506
524/* 507/*
525 * This function was part of drop, now is own function. 508 * This function was part of drop, now is own function.
526 * Player 'op' tries to put object 'tmp' into sack 'sack', 509 * Player 'op' tries to put object 'tmp' into sack 'sack',
527 * if nrof is non zero, then nrof objects is tried to put into sack. 510 * if nrof is non zero, then nrof objects is tried to put into sack.
511 *
528 * Note that the 'sack' in question can now be a transport, 512 * Note that the 'sack' in question can now be a transport,
529 * so this function isn't named very good anymore. 513 * so this function isn't named very good anymore.
530 */ 514 */
531void 515void
532put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 516put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
533{ 517{
534 object *tmp2, *sack2; 518 object *tmp2;
535 char buf[MAX_BUF]; 519 char buf[MAX_BUF];
536 520
537 if (sack == tmp) 521 if (sack == tmp)
538 return; /* Can't put an object in itself */ 522 return; /* Can't put an object in itself */
539 523
540 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 524 if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
541 { 525 {
542 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack)); 526 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
543 return; 527 return;
544 } 528 }
545 529
… …
547 { 531 {
548 /* Eneq(@csd.uu.se): If the object to be dropped is a container 532 /* Eneq(@csd.uu.se): If the object to be dropped is a container
549 * we instead move the contents of that container into the active 533 * we instead move the contents of that container into the active
550 * container, this is only done if the object has something in it. 534 * container, this is only done if the object has something in it.
551 */ 535 */
552 sack2 = tmp;
553 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack)); 536 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack));
554 537
555 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 538 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
556 { 539 {
557 tmp = tmp2->below; 540 tmp = tmp2->below;
558 541
559 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 542 if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
560 put_object_in_sack (op, sack, tmp2, 0); 543 put_object_in_sack (op, sack, tmp2, 0);
561 else 544 else
562 { 545 {
563 sprintf (buf, "Your %s fills up.", query_name (sack)); 546 sprintf (buf, "Your %s fills up.", query_name (sack));
564 new_draw_info (NDI_UNIQUE, 0, op, buf); 547 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
573 * already checked this. 556 * already checked this.
574 */ 557 */
575 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof))) 558 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
576 return; 559 return;
577 560
578 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 561 if (tmp->flag [FLAG_APPLIED])
579 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 562 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
580 return; 563 return;
581 564
582 /* we want to put some portion of the item into the container */ 565 /* we want to put some portion of the item into the container */
583 if (!can_split (op, tmp, nrof)) 566 if (!can_split (op, tmp, nrof))
584 return; 567 return;
585 568
586 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 569 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
587 sack->insert (tmp); 570 sack->insert (tmp);
588}
589
590/*
591 * This function was part of drop, now is own function.
592 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
593 * nrof objects is tried to dropped.
594 * This is used when dropping objects onto the floor.
595 */
596void
597drop_object (object *op, object *tmp, uint32 nrof)
598{
599 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
600 return;
601
602 if (QUERY_FLAG (tmp, FLAG_APPLIED))
603 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
604 return; /* can't unapply it */
605
606 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
607
608 /* We are only dropping some of the items. We split the current object
609 * off
610 */
611 if (!can_split (op, tmp, nrof))
612 return;
613
614 drop_object (op, tmp);
615
616 if (!tmp->destroyed () && !tmp->is_inserted ())
617 {
618 // if nothing happened with the object we give it back
619 op->insert (tmp);
620 }
621} 571}
622 572
623/* In contrast to drop_object (op, tmp, nrof) above this function takes the 573/* In contrast to drop_object (op, tmp, nrof) above this function takes the
624 * already split off object, and feeds it to the event handlers and does 574 * already split off object, and feeds it to the event handlers and does
625 * other magic with it. 575 * other magic with it.
… …
628 * object that was dropped. 578 * object that was dropped.
629 * 579 *
630 * Make sure to check what happened with <obj> after this function returns! 580 * Make sure to check what happened with <obj> after this function returns!
631 * Otherwise you may leak this object. 581 * Otherwise you may leak this object.
632 */ 582 */
633
634void 583void
635drop_object (object *dropper, object *obj) 584drop_object (object *dropper, object *obj)
636{ 585{
637 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper))) 586 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
638 return; 587 return;
639 588
640 if (obj->destroyed () || obj->is_inserted ()) 589 if (obj->destroyed () || obj->is_inserted ())
641 return; 590 return;
642 591
643 if (QUERY_FLAG (obj, FLAG_STARTEQUIP)) 592 if (obj->flag [FLAG_STARTEQUIP])
644 { 593 {
645 dropper->statusmsg (format ("You drop the %s.", query_name (obj))); 594 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
646 dropper->statusmsg ("The god who lent it to you retrieves it."); 595 dropper->statusmsg ("The god who lent it to you retrieves it.");
647 596
648 obj->destroy (); 597 obj->destroy ();
… …
657 return; 606 return;
658 607
659 if (obj->destroyed () || obj->is_inserted ()) 608 if (obj->destroyed () || obj->is_inserted ())
660 return; 609 return;
661 610
662 if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY) 611 if (dropper->is_in_shop () && !obj->flag [FLAG_UNPAID] && obj->type != MONEY)
663 if (!sell_item (obj, dropper)) 612 if (!sell_item (obj, dropper))
664 return; 613 return;
614
615 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
616 return;
665 617
666 /* If nothing special happened with this object, the default action is to 618 /* If nothing special happened with this object, the default action is to
667 * insert it below the dropper: 619 * insert it below the dropper:
668 */ 620 */
669 621
670 obj->x = dropper->x; 622 obj->x = dropper->x;
671 obj->y = dropper->y; 623 obj->y = dropper->y;
672 624
673 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR); 625 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
626}
627
628/*
629 * This function was part of drop, now is own function.
630 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
631 * nrof objects are tried to drop.
632 * This is used when dropping objects onto the floor.
633 */
634void
635drop_object (object *op, object *tmp, uint32 nrof)
636{
637 if (tmp->flag [FLAG_NO_DROP])
638 return;
639
640 if (tmp->flag [FLAG_APPLIED])
641 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
642 return; /* can't unapply it */
643
644 /* We are only dropping some of the items. We split the current object
645 * off
646 */
647 if (!can_split (op, tmp, nrof))
648 return;
649
650 drop_object (op, tmp);
651
652 if (!tmp->destroyed () && !tmp->is_inserted ())
653 {
654 // if nothing happened with the object we give it back
655 op->insert (tmp);
656 }
674} 657}
675 658
676void 659void
677drop (object *op, object *tmp) 660drop (object *op, object *tmp)
678{ 661{
… …
691 */ 674 */
692 tmp->destroy (); 675 tmp->destroy ();
693 return; 676 return;
694 } 677 }
695 else 678 else
696 {
697 while (tmp && tmp->invisible) 679 while (tmp && tmp->invisible)
698 tmp = tmp->below; 680 tmp = tmp->below;
699 }
700 } 681 }
701 682
702 if (tmp == NULL) 683 if (!tmp)
703 { 684 {
704 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 685 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
705 return; 686 return;
706 } 687 }
707 688
708 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 689 if (tmp->flag [FLAG_INV_LOCKED])
709 { 690 {
710 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 691 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
711 return; 692 return;
712 } 693 }
713 694
714 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 695 if (tmp->flag [FLAG_NO_DROP])
715 { 696 {
716#if 0 697#if 0
717 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 698 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
718 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 699 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
719#endif 700#endif
… …
721 } 702 }
722 703
723 if (op->type == PLAYER && op->contr->last_used == tmp) 704 if (op->type == PLAYER && op->contr->last_used == tmp)
724 op->contr->last_used = tmp->below ? tmp->below 705 op->contr->last_used = tmp->below ? tmp->below
725 : tmp->above ? tmp->above 706 : tmp->above ? tmp->above
726 : 0; 707 : (object *)0;
727 708
728 if (op->container) 709 if (op->container_ ())
729 { 710 {
730 if (op->type == PLAYER) 711 if (op->type == PLAYER)
731 put_object_in_sack (op, op->container, tmp, op->contr->count); 712 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
732 else 713 else
733 put_object_in_sack (op, op->container, tmp, 0); 714 put_object_in_sack (op, op->container_ (), tmp, 0);
734 } 715 }
735 else 716 else
736 { 717 {
737 if (op->type == PLAYER) 718 if (op->type == PLAYER)
738 drop_object (op, tmp, op->contr->count); 719 drop_object (op, tmp, op->contr->count);
… …
756 } 737 }
757 738
758 object *curinv = op->inv; 739 object *curinv = op->inv;
759 object *nextinv; 740 object *nextinv;
760 741
761 /* 742 /*
762 This is the default. Drops everything not locked or considered 743 This is the default. Drops everything not locked or considered
763 not something that should be dropped. 744 not something that should be dropped.
764 */ 745 */
765 /* 746 /*
766 Care must be taken that the next item pointer is not to money as 747 Care must be taken that the next item pointer is not to money as
767 the drop() routine will do unknown things to it when dropping 748 the drop() routine will do unknown things to it when dropping
768 in a shop. --Tero.Pelander@utu.fi 749 in a shop. --Tero.Pelander@utu.fi
769 */ 750 */
770
771 int cnt = MAX_ITEM_PER_DROP; 751 int cnt = MAX_ITEM_PER_ACTION;
772 752
773 if (!params) 753 if (!params)
774 { 754 {
775 while (curinv) 755 while (curinv)
776 { 756 {
777 nextinv = curinv->below; 757 nextinv = curinv->below;
778 758
779 while (nextinv && nextinv->type == MONEY) 759 while (nextinv && nextinv->type == MONEY)
780 nextinv = nextinv->below; 760 nextinv = nextinv->below;
781 761
782 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 762 if (!curinv->flag [FLAG_INV_LOCKED]
783 curinv->type != FOOD && curinv->type != KEY && 763 && !curinv->invisible
784 curinv->type != SPECIAL_KEY && curinv->type != GEM && 764 && curinv->type != MONEY
785 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 765 && curinv->type != FOOD
766 && curinv->type != KEY
767 && curinv->type != SPECIAL_KEY
768 && curinv->type != GEM
769 && curinv->type != CONTAINER)
786 { 770 {
787 drop (op, curinv); 771 drop (op, curinv);
788 if (--cnt <= 0) break; 772 if (--cnt <= 0) break;
789 } 773 }
790 774
… …
798 nextinv = curinv->below; 782 nextinv = curinv->below;
799 783
800 while (nextinv && nextinv->type == MONEY) 784 while (nextinv && nextinv->type == MONEY)
801 nextinv = nextinv->below; 785 nextinv = nextinv->below;
802 786
803 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 787 if (!curinv->flag [FLAG_INV_LOCKED] && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
804 { 788 {
805 drop (op, curinv); 789 drop (op, curinv);
806 if (--cnt <= 0) break; 790 if (--cnt <= 0) break;
807 } 791 }
808 792
… …
816 nextinv = curinv->below; 800 nextinv = curinv->below;
817 801
818 while (nextinv && nextinv->type == MONEY) 802 while (nextinv && nextinv->type == MONEY)
819 nextinv = nextinv->below; 803 nextinv = nextinv->below;
820 804
821 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 805 if (!curinv->flag [FLAG_INV_LOCKED] && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
822 { 806 {
823 drop (op, curinv); 807 drop (op, curinv);
824 if (--cnt <= 0) break; 808 if (--cnt <= 0) break;
825 } 809 }
826 810
… …
834 nextinv = curinv->below; 818 nextinv = curinv->below;
835 819
836 while (nextinv && nextinv->type == MONEY) 820 while (nextinv && nextinv->type == MONEY)
837 nextinv = nextinv->below; 821 nextinv = nextinv->below;
838 822
839 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 823 if (!curinv->flag [FLAG_INV_LOCKED] && !curinv->flag [FLAG_APPLIED])
840 { 824 {
841 switch (curinv->type) 825 switch (curinv->type)
842 { 826 {
843 case HORN: 827 case HORN:
844 case BOOK: 828 case BOOK:
… …
884 * <cnt> can be a 0 pointer or a pointer to the maximum number of 868 * <cnt> can be a 0 pointer or a pointer to the maximum number of
885 * drop operations to perform. 869 * drop operations to perform.
886 * 870 *
887 * Returns true if at least one item was dropped. 871 * Returns true if at least one item was dropped.
888 */ 872 */
889bool 873static bool
890drop_vector (object *dropper, vector<object *> &objs, int *cnt) 874drop_vector (object *dropper, vector<object *> &objs, int *cnt)
891{ 875{
892 vector<object *>::iterator i; 876 vector<object *>::iterator i;
893 877
894 bool did_one = false; 878 bool did_one = false;
… …
908 */ 892 */
909int 893int
910command_drop (object *op, char *params) 894command_drop (object *op, char *params)
911{ 895{
912 object *tmp, *next; 896 object *tmp, *next;
913 int did_one = 0;
914 897
915 if (!params) 898 if (!params)
916 { 899 {
917 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
918 return 0; 901 return 0;
… …
922 vector<object *> matched_objs; 905 vector<object *> matched_objs;
923 906
924 for (tmp = op->inv; tmp; tmp = next) 907 for (tmp = op->inv; tmp; tmp = next)
925 { 908 {
926 next = tmp->below; 909 next = tmp->below;
927 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 910 if (tmp->flag [FLAG_NO_DROP] || tmp->invisible)
928 continue; 911 continue;
929 912
930 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
931 matched_objs.push_back (tmp); 914 matched_objs.push_back (tmp);
932 } 915 }
933 916
934 int cnt = MAX_ITEM_PER_DROP; 917 int cnt = MAX_ITEM_PER_ACTION;
935 918
936 if (!drop_vector (op, matched_objs, &cnt)) 919 if (!drop_vector (op, matched_objs, &cnt))
937 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
938 921
939 if (cnt <= 0) 922 if (cnt <= 0)
… …
967 } 950 }
968 951
969 return 0; 952 return 0;
970} 953}
971 954
972/* op should be a player.
973 * we return the object the player has marked with the 'mark' command
974 * below. If no match is found (or object has changed), we return
975 * NULL. We leave it up to the calling function to print messages if
976 * nothing is found.
977 */
978object *
979find_marked_object (object *op)
980{
981 object *tmp;
982
983 if (!op || !op->contr)
984 return NULL;
985
986 if (!op->contr->mark)
987 {
988/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
989 return 0;
990 }
991
992 /* This may seem like overkill, but we need to make sure that they
993 * player hasn't dropped the item. We use count on the off chance that
994 * an item got reincarnated at some point.
995 */
996 for (tmp = op->inv; tmp; tmp = tmp->below)
997 {
998 if (tmp->invisible)
999 continue;
1000
1001 if (tmp == op->contr->mark)
1002 {
1003 if (!tmp->destroyed ())
1004 return tmp;
1005 else
1006 {
1007 op->contr->mark = 0;
1008/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
1009 return 0;
1010 }
1011 }
1012 }
1013
1014 return 0;
1015}
1016
1017std::string 955std::string
1018object::describe_monster (object *who) 956object::describe_monster (object *who)
1019{ 957{
1020 dynbuf_text buf (512, 512); 958 dynbuf_text buf (512, 512);
1021 959
1022 object *mon = head ? head : this; 960 object *mon = head ? head : this;
1023 961
1024 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 962 if (mon->flag [FLAG_UNDEAD])
1025 buf << "It is an undead force.\r"; 963 buf << "It is an undead force.\r";
1026 964
1027 if (mon->level > who->level) 965 if (mon->level > who->level)
1028 buf << "It is likely more powerful than you.\r"; 966 buf << "It is likely more powerful than you.\r";
1029 else if (mon->level < who->level) 967 else if (mon->level < who->level)
… …
1071} 1009}
1072 1010
1073std::string 1011std::string
1074object::long_desc (object *who) 1012object::long_desc (object *who)
1075{ 1013{
1076 std::string buf (query_name (this)); 1014 std::string buf (query_name ());
1077 1015
1078 switch (type) 1016 switch (type)
1079 { 1017 {
1080 case RING: 1018 case RING:
1081 case SKILL: 1019 case SKILL:
… …
1086 case SHIELD: 1024 case SHIELD:
1087 case BOOTS: 1025 case BOOTS:
1088 case GLOVES: 1026 case GLOVES:
1089 case AMULET: 1027 case AMULET:
1090 case GIRDLE: 1028 case GIRDLE:
1029 case RANGED:
1091 case BOW: 1030 case BOW:
1092 case ARROW: 1031 case ARROW:
1093 case CLOAK: 1032 case CLOAK:
1094 case FOOD: 1033 case FOOD:
1095 case DRINK: 1034 case DRINK:
1096 case FLESH: 1035 case FLESH:
1097 case SKILL_TOOL: 1036 case SKILL_TOOL:
1037 case LAMP:
1098 case POWER_CRYSTAL: 1038 case POWER_CRYSTAL:
1099 { 1039 {
1100 const char *cp = ::describe_item (this, who); 1040 const char *cp = ::describe_item (this, who);
1101 1041
1102 if (*cp) 1042 if (*cp)
… …
1117examine_monster (object *op, object *tmp) 1057examine_monster (object *op, object *tmp)
1118{ 1058{
1119 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ()); 1059 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1120} 1060}
1121 1061
1122std::string
1123object::describe (object *who)
1124{
1125 dynbuf_text buf (1024, 1024);
1126
1127 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1128
1129 if (custom_name)
1130 buf.printf ("You call it %s.\r", &custom_name);
1131
1132 switch (type)
1133 {
1134 case SPELLBOOK:
1135 if (flag [FLAG_IDENTIFIED] && inv)
1136 buf.printf ("%s is a %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1137 break;
1138
1139 case BOOK:
1140 if (msg)
1141 buf << "Something is written in it.\r";
1142 break;
1143
1144 case CONTAINER:
1145 if (race)
1146 {
1147 if (weight_limit && stats.Str < 100)
1148 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1149 &race, weight_limit / (10.0 * (100 - stats.Str)));
1150 else
1151 buf.printf ("It can hold only %s.\r", &race);
1152 }
1153 else if (weight_limit && stats.Str < 100)
1154 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1155 break;
1156
1157 case WAND:
1158 if (flag [FLAG_IDENTIFIED])
1159 buf.printf ("It has %d charges left.\r", stats.food);
1160 break;
1161 }
1162
1163 if (materialname && !msg)
1164 buf.printf ("It is made of: %s.\r", &materialname);
1165
1166 if (who)
1167 /* Where to wear this item */
1168 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1169 if (slot[i].info)
1170 {
1171 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1172
1173 if (slot[i].info < -1 && who->slot[i].info)
1174 buf.printf ("(%d)", -slot[i].info);
1175
1176 buf << ".\r";
1177 }
1178
1179 if (weight)
1180 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1181
1182 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1183 {
1184 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1185
1186 if (is_in_shop (who))
1187 {
1188 if (flag [FLAG_UNPAID])
1189 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1190 else
1191 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1192 }
1193 }
1194
1195 if (flag [FLAG_MONSTER])
1196 buf << describe_monster (who);
1197
1198 /* Is this item buildable? */
1199 if (flag [FLAG_IS_BUILDABLE])
1200 buf << "This is a buildable item.\r";
1201
1202 /* Does the object have a message? Don't show message for all object
1203 * types - especially if the first entry is a match
1204 */
1205 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1206 {
1207 /* This is just a hack so when identifying the items, we print
1208 * out the extra message
1209 */
1210 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1211 buf << "The object has a story:\r";
1212
1213 buf << msg << '\n';
1214 }
1215
1216 buf << '\n';
1217
1218 return std::string (buf.linearise (), buf.size ());
1219}
1220
1221static void 1062static void
1222display_new_pickup (object *op) 1063display_new_pickup (object *op)
1223{ 1064{
1224 int i = op->contr->mode; 1065 int i = op->contr->mode;
1225 1066
1226 if (!(i & PU_NEWMODE))
1227 return;
1228
1229 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1230 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0); 1067 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1231 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0); 1068 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1232 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0); 1069 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1233 1070
1234 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5); 1071 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
… …
1285 }; 1122 };
1286 1123
1287 if (!params) 1124 if (!params)
1288 { 1125 {
1289 /* if the new mode is used, just print the settings */ 1126 /* if the new mode is used, just print the settings */
1290 if (op->contr->mode & PU_NEWMODE)
1291 {
1292 display_new_pickup (op); 1127 display_new_pickup (op);
1293 return 1;
1294 }
1295 if (1)
1296 LOG (llevDebug, "command_pickup: !params\n");
1297 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1298 return 0; 1128 return 0;
1299 } 1129 }
1300 1130
1301 while (*params == ' ' && *params) 1131 while (*params == ' ' && *params)
1302 params++; 1132 params++;
… …
1308 for (mode = 0; names[mode]; mode++) 1138 for (mode = 0; names[mode]; mode++)
1309 { 1139 {
1310 if (!strcmp (names[mode], params + 1)) 1140 if (!strcmp (names[mode], params + 1))
1311 { 1141 {
1312 i = op->contr->mode; 1142 i = op->contr->mode;
1313 if (!(i & PU_NEWMODE)) 1143
1314 i = PU_NEWMODE;
1315 if (*params == '+') 1144 if (*params == '+')
1316 i = i | modes[mode]; 1145 i = i | modes[mode];
1317 else 1146 else
1318 i = i & ~modes[mode]; 1147 i = i & ~modes[mode];
1148
1319 op->contr->mode = i; 1149 op->contr->mode = i;
1320 display_new_pickup (op); 1150 display_new_pickup (op);
1321 return 1; 1151 return 1;
1322 } 1152 }
1323 } 1153 }
… …
1325 return 1; 1155 return 1;
1326 } 1156 }
1327 1157
1328 if (sscanf (params, "%u", &i) != 1) 1158 if (sscanf (params, "%u", &i) != 1)
1329 { 1159 {
1330 if (1)
1331 LOG (llevDebug, "command_pickup: params==NULL\n");
1332 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> ."); 1160 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1333 return 1; 1161 return 1;
1334 } 1162 }
1335 set_pickup_mode (op, i); 1163
1164 if (i <= PU_RATIO)
1165 i |= op->contr->mode & ~PU_RATIO;
1166
1167 op->contr->mode = i;
1336 1168
1337 return 1; 1169 return 1;
1338} 1170}
1339 1171
1340void
1341set_pickup_mode (object *op, int i)
1342{
1343 switch (op->contr->mode = i)
1344 {
1345 case 0:
1346 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1347 break;
1348 case 1:
1349 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1350 break;
1351 case 2:
1352 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1353 break;
1354 case 3:
1355 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1356 break;
1357 case 4:
1358 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1359 break;
1360 case 5:
1361 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1362 break;
1363 case 6:
1364 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1365 break;
1366 case 7:
1367 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1368 break;
1369 }
1370}
1371
1372int 1172int
1373command_search_items (object *op, char *params) 1173command_search_items (object *op, char *params)
1374{ 1174{
1375 char buf[MAX_BUF];
1376
1377 if (settings.search_items == FALSE)
1378 return 1;
1379
1380 if (params == NULL) 1175 if (params == NULL)
1381 { 1176 {
1382 if (op->contr->search_str[0] == '\0') 1177 if (op->contr->search_str[0] == '\0')
1383 { 1178 {
1384 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1179 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1385 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all"); 1180 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1386 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'."); 1181 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1387 return 1; 1182 return 1;
1388 } 1183 }
1389 1184
1390 op->contr->search_str[0] = '\0'; 1185 op->contr->search_str[0] = '\0';
1391 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1186 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1392 op->update_stats (); 1187 op->contr->queue_stats_update ();
1393 return 1; 1188 return 1;
1394 } 1189 }
1395 1190
1396 if ((int) strlen (params) >= MAX_BUF) 1191 if (strlen (params) >= sizeof (op->contr->search_str))
1397 { 1192 {
1398 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1193 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1399 return 1; 1194 return 1;
1400 } 1195 }
1401 1196
1402 strcpy (op->contr->search_str, params); 1197 strcpy (op->contr->search_str, params);
1403 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1198 new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1404 new_draw_info (NDI_UNIQUE, 0, op, buf); 1199 op->contr->queue_stats_update ();
1405 op->update_stats (); 1200
1406 return 1; 1201 return 1;
1407} 1202}
1408 1203
1204int
1205command_unlock (object *op, char *params)
1206{
1207 /* if the unlock command typed with nothing, unlock everything,
1208 * this might be bad
1209 */
1210 if (params == NULL)
1211 {
1212 for (object *item = op->inv; item; item = item->below)
1213 {
1214 item->clr_flag (FLAG_INV_LOCKED);
1215 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
1216 esrv_update_item (UPD_FLAGS, op, item);
1217 }
1218 return 0;
1219 }
1220
1221 /* if the unlock command is used with a param,
1222 * unlock what matches. i.e. unlock material, should unlock all the materials
1223 */
1224 for (object *item = op->inv; item; item = item->below)
1225 if (item->name.contains (params))
1226 {
1227 item->clr_flag (FLAG_INV_LOCKED);
1228 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
1229 esrv_update_item (UPD_FLAGS, op, item);
1230 }
1231
1232 return 0;
1233}
1234
1235int
1236command_lock (object *op, char *params)
1237{
1238 /* if the lock command is typed by itself, lock everything
1239 */
1240 if (params == NULL)
1241 {
1242 for (object *item = op->inv; item; item = item->below)
1243 {
1244 item->set_flag (FLAG_INV_LOCKED);
1245 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
1246 esrv_update_item (UPD_FLAGS, op, item);
1247 }
1248 return 0;
1249 }
1250
1251 /* if the lock command is used with a param, lock what matches.
1252 * i.e. lock material, should lock all the materials
1253 */
1254 for (object *item = op->inv; item; item = item->below)
1255 if (item->name.contains (params))
1256 {
1257 item->set_flag (FLAG_INV_LOCKED);
1258 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
1259 esrv_update_item (UPD_FLAGS, op, item);
1260 }
1261
1262 return 0;
1263}
1264
1265/* op should be a player, params is any params.
1266 * If no params given, we print out the currently marked object.
1267 * otherwise, try to find a matching object - try best match first.
1268 */
1269int
1270command_mark (object *op, char *params)
1271{
1272 if (!params)
1273 {
1274 if (object *mark = op->mark ())
1275 op->statusmsg (format ("%s is marked.", query_name (mark)));
1276 else
1277 op->failmsg ("You have no marked object.");
1278 }
1279 else
1280 {
1281 if (object *mark = find_best_object_match (op, params))
1282 {
1283 op->contr->mark = mark;
1284 op->statusmsg (format ("Marked item %s", query_name (mark)));
1285 }
1286 else
1287 op->failmsgf ("Could not find an object that matches %s", params);
1288 }
1289
1290 return 0; /*shouldnt get here */
1291}
1292

Diff Legend

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