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