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.134 by root, Sat Nov 17 23:40:03 2018 UTC

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