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.68 by root, Tue Apr 22 02:46:18 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 }
94} 93}
95 94
96static bool 95static bool
97can_split (object *pl, object *&op, sint32 nrof) 96can_split (object *pl, object *&op, sint32 nrof)
98{ 97{
99 if (object *tmp = op->split (nrof)) 98 if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
100 { 99 {
101 op = tmp; 100 op = tmp;
102 return true; 101 return true;
103 } 102 }
104 else 103 else
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])
302 {
303 tmp->flag.reset (FLAG_UNPAID);
316 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));
305 tmp->flag.set (FLAG_UNPAID);
306 }
317 else 307 else
318 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp)); 308 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
319 309
320 tmp = insert_ob_in_ob (tmp, op); 310 op->insert (tmp);
321
322 /* All the stuff below deals with client/server code, and is only
323 * usable by players
324 */
325 if (pl->contr)
326 {
327 esrv_send_item (pl, tmp);
328
329 /* These are needed to update the weight for the container we
330 * are putting the object in.
331 */
332 if (op != pl)
333 {
334 esrv_update_item (UPD_WEIGHT, pl, op);
335 esrv_send_item (pl, pl);
336 }
337
338 /* Update the container the object was in */
339 if (env && env != pl && env != op)
340 esrv_update_item (UPD_WEIGHT, pl, env);
341 }
342} 311}
343 312
344/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 313/* modified slightly to allow monsters use this -b.t. 5-31-95 */
345void 314void
346pick_up (object *op, object *alt) 315pick_up (object *op, object *alt)
392 count = tmp->nrof; 361 count = tmp->nrof;
393 362
394 /* container is open, so use it */ 363 /* container is open, so use it */
395 if (tmp->flag [FLAG_STARTEQUIP]) 364 if (tmp->flag [FLAG_STARTEQUIP])
396 alt = op; 365 alt = op;
397 else if (op->container) 366 else if ((alt = op->container_ ()))
398 { 367 {
399 alt = op->container;
400 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 368 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
401 goto leave; 369 goto leave;
402 } 370 }
403 else 371 else
404 { /* non container pickup */ 372 { /* non container pickup */
405 for (alt = op->inv; alt; alt = alt->below) 373 for (alt = op->inv; alt; alt = alt->below)
406 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && 374 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] &&
407 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))
408 break; /* perfect match */ 376 break; /* perfect match */
409 377
410 if (!alt) 378 if (!alt)
411 for (alt = op->inv; alt; alt = alt->below) 379 for (alt = op->inv; alt; alt = alt->below)
412 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))
413 break; /* General container comes next */ 381 break; /* General container comes next */
414 382
415 if (!alt) 383 if (!alt)
416 alt = op; /* No free containers */ 384 alt = op; /* No free containers */
417 } 385 }
427#ifdef PICKUP_DEBUG 395#ifdef PICKUP_DEBUG
428 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);
429#endif 397#endif
430 398
431 /* startequip items are not allowed to be put into containers: */ 399 /* startequip items are not allowed to be put into containers: */
432 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 400 if (op->type == PLAYER && alt->type == CONTAINER && tmp->flag [FLAG_STARTEQUIP])
433 { 401 {
434 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!");
435 goto leave; 403 goto leave;
436 } 404 }
437 405
458int 426int
459command_take (object *op, char *params) 427command_take (object *op, char *params)
460{ 428{
461 object *tmp, *next; 429 object *tmp, *next;
462 430
463 if (op->container) 431 if (op->container_ ())
464 tmp = op->container->inv; 432 tmp = op->container_ ()->inv;
465 else 433 else
466 { 434 {
467 tmp = op->above; 435 tmp = op->above;
468 if (tmp) 436 if (tmp)
469 while (tmp->above) 437 while (tmp->above)
481 449
482 /* Makes processing easier */ 450 /* Makes processing easier */
483 if (params && *params == '\0') 451 if (params && *params == '\0')
484 params = 0; 452 params = 0;
485 453
486 int cnt = MAX_ITEM_PER_DROP; 454 int cnt = MAX_ITEM_PER_ACTION;
487 455
488 while (tmp) 456 while (tmp)
489 { 457 {
490 next = tmp->below; 458 next = tmp->below;
491 459
499 * but that probably will make it more difficult to read, and 467 * but that probably will make it more difficult to read, and
500 * not make it any more efficient 468 * not make it any more efficient
501 */ 469 */
502 if (params && item_matched_string (op, tmp, params)) 470 if (params && item_matched_string (op, tmp, params))
503 { 471 {
472 if (--cnt < 0) break;
504 pick_up (op, tmp); 473 pick_up (op, tmp);
505 if (--cnt <= 0) break;
506 } 474 }
507 else if (can_pick (op, tmp) && !params) 475 else if (can_pick (op, tmp) && !params)
508 { 476 {
477 if (--cnt < 0) break;
509 pick_up (op, tmp); 478 pick_up (op, tmp);
510 break; 479 break;
511 } 480 }
512 481
513 tmp = next; 482 tmp = next;
514 } 483 }
515 484
516 if (cnt <= 0) 485 if (cnt < 0)
517 { 486 {
518 op->failmsg ("Couldn't pick up so many items at once."); 487 op->failmsg ("Couldn't pick up so many items at once.");
519 return 0; 488 return 0;
520 } 489 }
521 490
534 503
535 return 0; 504 return 0;
536} 505}
537 506
538/* 507/*
539 * This function was part of drop, now is own function. 508 * This function was part of drop, now is own function.
540 * Player 'op' tries to put object 'tmp' into sack 'sack', 509 * Player 'op' tries to put object 'tmp' into sack 'sack',
541 * 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 *
542 * Note that the 'sack' in question can now be a transport, 512 * Note that the 'sack' in question can now be a transport,
543 * so this function isn't named very good anymore. 513 * so this function isn't named very good anymore.
544 */ 514 */
545void 515void
546put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 516put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
547{ 517{
548 object *tmp2, *sack2; 518 object *tmp2;
549 char buf[MAX_BUF]; 519 char buf[MAX_BUF];
550 520
551 if (sack == tmp) 521 if (sack == tmp)
552 return; /* Can't put an object in itself */ 522 return; /* Can't put an object in itself */
553 523
554 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 524 if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
555 { 525 {
556 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));
557 return; 527 return;
558 } 528 }
559 529
561 { 531 {
562 /* 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
563 * we instead move the contents of that container into the active 533 * we instead move the contents of that container into the active
564 * 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.
565 */ 535 */
566 sack2 = tmp;
567 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));
568 537
569 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 538 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
570 { 539 {
571 tmp = tmp2->below; 540 tmp = tmp2->below;
572 541
573 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)))
574 {
575 put_object_in_sack (op, sack, tmp2, 0); 543 put_object_in_sack (op, sack, tmp2, 0);
576 }
577 else 544 else
578 { 545 {
579 sprintf (buf, "Your %s fills up.", query_name (sack)); 546 sprintf (buf, "Your %s fills up.", query_name (sack));
580 new_draw_info (NDI_UNIQUE, 0, op, buf); 547 new_draw_info (NDI_UNIQUE, 0, op, buf);
581 break; 548 break;
582 } 549 }
583 } 550 }
584 551
585 esrv_update_item (UPD_WEIGHT, op, sack2);
586 return; 552 return;
587 } 553 }
588 554
589 /* Don't worry about this for containers - our caller should have 555 /* Don't worry about this for containers - our caller should have
590 * already checked this. 556 * already checked this.
591 */ 557 */
592 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)))
593 return; 559 return;
594 560
595 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 561 if (tmp->flag [FLAG_APPLIED])
596 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 562 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
597 return; 563 return;
598 564
599 /* 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 */
600 if (nrof && tmp->nrof != nrof)
601 {
602 if (!can_split (op, tmp, nrof)) 566 if (!can_split (op, tmp, nrof))
603 return; 567 return;
604 }
605 else
606 tmp->remove ();
607 568
608 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));
609 tmp2 = insert_ob_in_ob (tmp, sack); 570 sack->insert (tmp);
571}
610 572
611 // elmex: 2007-11-26: removed update_stats and replaced 573/* In contrast to drop_object (op, tmp, nrof) above this function takes the
612 // it by update_after_inventory_change () in the caller 574 * already split off object, and feeds it to the event handlers and does
613 // 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;
614 591
615 /* If an object merged (and thus, different object), we need to 592 if (obj->flag [FLAG_STARTEQUIP])
616 * delete the original. 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:
617 */ 620 */
618 if (tmp2 != tmp)
619 esrv_del_item (op->contr, tmp->count);
620 621
621 esrv_send_item (op, tmp2); 622 obj->x = dropper->x;
623 obj->y = dropper->y;
622 624
623 /* update the sacks weight */ 625 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
624 esrv_update_item (UPD_WEIGHT, op, sack);
625} 626}
626 627
627/* 628/*
628 * This function was part of drop, now is own function. 629 * This function was part of drop, now is own function.
629 * 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
630 * nrof objects is tried to dropped. 631 * nrof objects are tried to drop.
631 * This is used when dropping objects onto the floor. 632 * This is used when dropping objects onto the floor.
632 */ 633 */
633void 634void
634drop_object (object *op, object *tmp, uint32 nrof) 635drop_object (object *op, object *tmp, uint32 nrof)
635{ 636{
636 object *floor; 637 if (tmp->flag [FLAG_NO_DROP])
637
638 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
639 return; 638 return;
640 639
641 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 640 if (tmp->flag [FLAG_APPLIED])
642 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 641 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
643 return; /* can't unapply it */ 642 return; /* can't unapply it */
644
645 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
646 643
647 /* 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
648 * off 645 * off
649 */ 646 */
650 if (nrof && tmp->nrof != nrof)
651 {
652 if (!can_split (op, tmp, nrof)) 647 if (!can_split (op, tmp, nrof))
653 return;
654 }
655 else
656 tmp->remove ();
657
658 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
659 return; 648 return;
660 649
661 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 650 drop_object (op, tmp);
662 {
663 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
664 op->statusmsg ("The gods who lent it to you retrieves it.");
665 651
666 tmp->destroy (); 652 if (!tmp->destroyed () && !tmp->is_inserted ())
667 op->update_stats ();
668 return;
669 } 653 {
670 654 // if nothing happened with the object we give it back
671 if (op->type == PLAYER) 655 op->insert (tmp);
672 esrv_del_item (op->contr, tmp->count);
673
674 /* Call this before we update the various windows/players. At least
675 * that we, we know the weight is correct.
676 */
677 // 2007-11-26: moved op->update_stats away and calling it later after
678 // all items of a drop command have been processed.
679
680 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
681 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
682 return;
683
684 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
685 sell_item (tmp, op);
686
687 tmp->x = op->x;
688 tmp->y = op->y;
689
690 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
691}
692
693void update_after_inventory_change (object *op)
694{
695 /* Call this before we update the various windows/players. At least
696 * that we, we know the weight is correct.
697 */
698 op->update_stats ();
699
700 // elmex: kept this for now, i have no idea what happens when i remove it:
701 if (op->type == PLAYER)
702 {
703 /* Need to update the weight for the player */
704 esrv_send_item (op, op);
705 op->contr->ns->floorbox_update ();
706 } 656 }
707} 657}
708 658
709void 659void
710drop (object *op, object *tmp) 660drop (object *op, object *tmp)
720 if (tmp->env && tmp->env->type != PLAYER) 670 if (tmp->env && tmp->env->type != PLAYER)
721 { 671 {
722 /* Just toss the object - probably shouldn't be hanging 672 /* Just toss the object - probably shouldn't be hanging
723 * around anyways 673 * around anyways
724 */ 674 */
725 tmp->remove ();
726 tmp->destroy (); 675 tmp->destroy ();
727 return; 676 return;
728 } 677 }
729 else 678 else
730 {
731 while (tmp != NULL && tmp->invisible) 679 while (tmp && tmp->invisible)
732 tmp = tmp->below; 680 tmp = tmp->below;
733 }
734 } 681 }
735 682
736 if (tmp == NULL) 683 if (!tmp)
737 { 684 {
738 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.");
739 return; 686 return;
740 } 687 }
741 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 688
689 if (tmp->flag [FLAG_INV_LOCKED])
742 { 690 {
743 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 691 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
744 return; 692 return;
745 } 693 }
746 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 694
695 if (tmp->flag [FLAG_NO_DROP])
747 { 696 {
748#if 0 697#if 0
749 /* 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. */
750 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.");
751#endif 700#endif
753 } 702 }
754 703
755 if (op->type == PLAYER && op->contr->last_used == tmp) 704 if (op->type == PLAYER && op->contr->last_used == tmp)
756 op->contr->last_used = tmp->below ? tmp->below 705 op->contr->last_used = tmp->below ? tmp->below
757 : tmp->above ? tmp->above 706 : tmp->above ? tmp->above
758 : 0; 707 : (object *)0;
759 708
760 if (op->container) 709 if (op->container_ ())
761 { 710 {
762 if (op->type == PLAYER) 711 if (op->type == PLAYER)
763 put_object_in_sack (op, op->container, tmp, op->contr->count); 712 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
764 else 713 else
765 put_object_in_sack (op, op->container, tmp, 0); 714 put_object_in_sack (op, op->container_ (), tmp, 0);
766 } 715 }
767 else 716 else
768 { 717 {
769 if (op->type == PLAYER) 718 if (op->type == PLAYER)
770 drop_object (op, tmp, op->contr->count); 719 drop_object (op, tmp, op->contr->count);
774 723
775 if (op->type == PLAYER) 724 if (op->type == PLAYER)
776 op->contr->count = 0; 725 op->contr->count = 0;
777} 726}
778 727
779
780
781/* Command will drop all items that have not been locked */ 728/* Command will drop all items that have not been locked */
782int 729int
783command_dropall (object *op, char *params) 730command_dropall (object *op, char *params)
784{ 731{
785 732
786 object *curinv, *nextinv;
787
788 if (op->inv == NULL) 733 if (op->inv == NULL)
789 { 734 {
790 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 735 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
791 return 0; 736 return 0;
792 } 737 }
793 738
794 curinv = op->inv; 739 object *curinv = op->inv;
740 object *nextinv;
795 741
796 /* 742 /*
797 This is the default. Drops everything not locked or considered 743 This is the default. Drops everything not locked or considered
798 not something that should be dropped. 744 not something that should be dropped.
799 */ 745 */
800 /* 746 /*
801 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
802 the drop() routine will do unknown things to it when dropping 748 the drop() routine will do unknown things to it when dropping
803 in a shop. --Tero.Pelander@utu.fi 749 in a shop. --Tero.Pelander@utu.fi
804 */ 750 */
805
806 int cnt = MAX_ITEM_PER_DROP; 751 int cnt = MAX_ITEM_PER_ACTION;
807 752
808 if (params == NULL) 753 if (!params)
809 { 754 {
810 while (curinv != NULL) 755 while (curinv)
811 { 756 {
812 nextinv = curinv->below; 757 nextinv = curinv->below;
758
813 while (nextinv && nextinv->type == MONEY) 759 while (nextinv && nextinv->type == MONEY)
814 nextinv = nextinv->below; 760 nextinv = nextinv->below;
815 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 761
816 curinv->type != FOOD && curinv->type != KEY && 762 if (!curinv->flag [FLAG_INV_LOCKED]
817 curinv->type != SPECIAL_KEY && curinv->type != GEM && 763 && !curinv->invisible
818 !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)
819 { 770 {
820 drop (op, curinv); 771 drop (op, curinv);
821 if (--cnt <= 0) break; 772 if (--cnt <= 0) break;
822 } 773 }
774
823 curinv = nextinv; 775 curinv = nextinv;
824 } 776 }
825 } 777 }
826
827 else if (strcmp (params, "weapons") == 0) 778 else if (strcmp (params, "weapons") == 0)
828 { 779 {
829 while (curinv != NULL) 780 while (curinv)
830 { 781 {
831 nextinv = curinv->below; 782 nextinv = curinv->below;
783
832 while (nextinv && nextinv->type == MONEY) 784 while (nextinv && nextinv->type == MONEY)
833 nextinv = nextinv->below; 785 nextinv = nextinv->below;
786
834 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)))
835 { 788 {
836 drop (op, curinv); 789 drop (op, curinv);
837 if (--cnt <= 0) break; 790 if (--cnt <= 0) break;
838 } 791 }
792
839 curinv = nextinv; 793 curinv = nextinv;
840 } 794 }
841 } 795 }
842
843 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 796 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
844 { 797 {
845 while (curinv != NULL) 798 while (curinv)
846 { 799 {
847 nextinv = curinv->below; 800 nextinv = curinv->below;
801
848 while (nextinv && nextinv->type == MONEY) 802 while (nextinv && nextinv->type == MONEY)
849 nextinv = nextinv->below; 803 nextinv = nextinv->below;
804
850 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))
851 { 806 {
852 drop (op, curinv); 807 drop (op, curinv);
853 if (--cnt <= 0) break; 808 if (--cnt <= 0) break;
854 } 809 }
810
855 curinv = nextinv; 811 curinv = nextinv;
856 } 812 }
857 } 813 }
858
859 else if (strcmp (params, "misc") == 0) 814 else if (strcmp (params, "misc") == 0)
860 { 815 {
861 while (curinv != NULL) 816 while (curinv)
862 { 817 {
863 nextinv = curinv->below; 818 nextinv = curinv->below;
819
864 while (nextinv && nextinv->type == MONEY) 820 while (nextinv && nextinv->type == MONEY)
865 nextinv = nextinv->below; 821 nextinv = nextinv->below;
866 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 822
823 if (!curinv->flag [FLAG_INV_LOCKED] && !curinv->flag [FLAG_APPLIED])
867 { 824 {
868 switch (curinv->type) 825 switch (curinv->type)
869 { 826 {
870 case HORN: 827 case HORN:
871 case BOOK: 828 case BOOK:
888 break; 845 break;
889 default: 846 default:
890 curinv = nextinv; 847 curinv = nextinv;
891 break; 848 break;
892 } 849 }
850
893 if (--cnt <= 0) break; 851 if (--cnt <= 0) break;
894 } 852 }
853
895 curinv = nextinv; 854 curinv = nextinv;
896 } 855 }
897 } 856 }
898 857
899 if (cnt <= 0) 858 if (cnt <= 0)
900 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.");
901 860
902 update_after_inventory_change (op);
903
904/* draw_look(op);*/ 861/* draw_look(op);*/
905 return 0; 862 return 0;
906} 863}
907 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
908/* 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
909 * comma seperated list. 891 * comma seperated list.
910 */ 892 */
911
912int 893int
913command_drop (object *op, char *params) 894command_drop (object *op, char *params)
914{ 895{
915 object *tmp, *next; 896 object *tmp, *next;
916 int did_one = 0;
917 897
918 if (!params) 898 if (!params)
919 { 899 {
920 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
921 return 0; 901 return 0;
922 } 902 }
923 else 903 else
924 { 904 {
925 int cnt = MAX_ITEM_PER_DROP; 905 vector<object *> matched_objs;
926 906
927 for (tmp = op->inv; tmp; tmp = next) 907 for (tmp = op->inv; tmp; tmp = next)
928 { 908 {
929 next = tmp->below; 909 next = tmp->below;
930 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 910 if (tmp->flag [FLAG_NO_DROP] || tmp->invisible)
931 continue; 911 continue;
932 912
933 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
934 { 914 matched_objs.push_back (tmp);
935 drop (op, tmp);
936 if (--cnt <= 0) break;
937 did_one = 1;
938 } 915 }
939 }
940 916
941 if (!did_one) 917 int cnt = MAX_ITEM_PER_ACTION;
918
919 if (!drop_vector (op, matched_objs, &cnt))
942 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
943 921
944 if (cnt <= 0) 922 if (cnt <= 0)
945 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.");
946
947 update_after_inventory_change (op);
948 } 924 }
949 925
950 return 0; 926 return 0;
951} 927}
952 928
974 } 950 }
975 951
976 return 0; 952 return 0;
977} 953}
978 954
979/* op should be a player.
980 * we return the object the player has marked with the 'mark' command
981 * below. If no match is found (or object has changed), we return
982 * NULL. We leave it up to the calling function to print messages if
983 * nothing is found.
984 */
985object *
986find_marked_object (object *op)
987{
988 object *tmp;
989
990 if (!op || !op->contr)
991 return NULL;
992
993 if (!op->contr->mark)
994 {
995/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
996 return 0;
997 }
998
999 /* This may seem like overkill, but we need to make sure that they
1000 * player hasn't dropped the item. We use count on the off chance that
1001 * an item got reincarnated at some point.
1002 */
1003 for (tmp = op->inv; tmp; tmp = tmp->below)
1004 {
1005 if (tmp->invisible)
1006 continue;
1007
1008 if (tmp == op->contr->mark)
1009 {
1010 if (!tmp->destroyed ())
1011 return tmp;
1012 else
1013 {
1014 op->contr->mark = 0;
1015/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
1016 return 0;
1017 }
1018 }
1019 }
1020
1021 return 0;
1022}
1023
1024std::string 955std::string
1025object::describe_monster (object *who) 956object::describe_monster (object *who)
1026{ 957{
1027 dynbuf_text buf (512, 512); 958 dynbuf_text buf (512, 512);
1028 959
1029 object *mon = head ? head : this; 960 object *mon = head ? head : this;
1030 961
1031 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 962 if (mon->flag [FLAG_UNDEAD])
1032 buf << "It is an undead force.\n"; 963 buf << "It is an undead force.\r";
1033 964
1034 if (mon->level > who->level) 965 if (mon->level > who->level)
1035 buf << "It is likely more powerful than you.\n"; 966 buf << "It is likely more powerful than you.\r";
1036 else if (mon->level < who->level) 967 else if (mon->level < who->level)
1037 buf << "It is likely less powerful than you.\n"; 968 buf << "It is likely less powerful than you.\r";
1038 else 969 else
1039 buf << "It is probably as powerful as you.\n"; 970 buf << "It is probably as powerful as you.\r";
1040 971
1041 if (mon->attacktype & AT_ACID) 972 if (mon->attacktype & AT_ACID)
1042 buf << "You seem to smell an acrid odor.\n"; 973 buf << "You seem to smell an acrid odor.\r";
1043 974
1044 /* 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
1045 * maxhp field? This seems that it should give more accurate results. 976 * maxhp field? This seems that it should give more accurate results.
1046 */ 977 */
1047 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 978 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1048 { /* From 1-4 */ 979 { /* From 1-4 */
1049 case 1: 980 case 1:
1050 buf << "It is in a bad shape.\n"; 981 buf << "It is in a bad shape.\r";
1051 break; 982 break;
1052 case 2: 983 case 2:
1053 buf << "It is hurt.\n"; 984 buf << "It is hurt.\r";
1054 break; 985 break;
1055 case 3: 986 case 3:
1056 buf << "It is somewhat hurt.\n"; 987 buf << "It is somewhat hurt.\r";
1057 break; 988 break;
1058 case 4: 989 case 4:
1059 buf << "It is in excellent shape.\n"; 990 buf << "It is in excellent shape.\r";
1060 break; 991 break;
1061 } 992 }
1062 993
1063 if (present_in_ob (POISONING, mon)) 994 if (present_in_ob (POISONING, mon))
1064 buf << "It looks very ill.\n"; 995 buf << "It looks very ill.\r";
996
997 buf << '\n';
1065 998
1066 return buf; 999 return buf;
1067} 1000}
1068 1001
1069/* 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. */
1076} 1009}
1077 1010
1078std::string 1011std::string
1079object::long_desc (object *who) 1012object::long_desc (object *who)
1080{ 1013{
1081 std::string buf (query_name (this)); 1014 std::string buf (query_name ());
1082 1015
1083 switch (type) 1016 switch (type)
1084 { 1017 {
1085 case RING: 1018 case RING:
1086 case SKILL: 1019 case SKILL:
1091 case SHIELD: 1024 case SHIELD:
1092 case BOOTS: 1025 case BOOTS:
1093 case GLOVES: 1026 case GLOVES:
1094 case AMULET: 1027 case AMULET:
1095 case GIRDLE: 1028 case GIRDLE:
1029 case RANGED:
1096 case BOW: 1030 case BOW:
1097 case ARROW: 1031 case ARROW:
1098 case CLOAK: 1032 case CLOAK:
1099 case FOOD: 1033 case FOOD:
1100 case DRINK: 1034 case DRINK:
1101 case FLESH: 1035 case FLESH:
1102 case SKILL_TOOL: 1036 case SKILL_TOOL:
1037 case LAMP:
1103 case POWER_CRYSTAL: 1038 case POWER_CRYSTAL:
1104 { 1039 {
1105 const char *cp = ::describe_item (this, who); 1040 const char *cp = ::describe_item (this, who);
1106 1041
1107 if (*cp) 1042 if (*cp)
1122examine_monster (object *op, object *tmp) 1057examine_monster (object *op, object *tmp)
1123{ 1058{
1124 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 ());
1125} 1060}
1126 1061
1127std::string
1128object::describe (object *who)
1129{
1130 dynbuf_text buf (1024, 1024);
1131
1132 buf.printf ("That is: %s.\n", long_desc (who).c_str ());
1133
1134 if (custom_name)
1135 buf.printf ("You call it %s\n", &custom_name);
1136
1137 switch (type)
1138 {
1139 case SPELLBOOK:
1140 if (flag [FLAG_IDENTIFIED] && inv)
1141 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1142 break;
1143
1144 case BOOK:
1145 if (msg)
1146 buf << "Something is written in it.\n";
1147 break;
1148
1149 case CONTAINER:
1150 if (race != NULL)
1151 {
1152 if (weight_limit && stats.Str < 100)
1153 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1154 &race, weight_limit / (10.0 * (100 - stats.Str)));
1155 else
1156 buf.printf ("It can hold only %s.\n", &race);
1157 }
1158 else if (weight_limit && stats.Str < 100)
1159 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1160 break;
1161
1162 case WAND:
1163 if (flag [FLAG_IDENTIFIED])
1164 buf.printf ("It has %d charges left.\n", stats.food);
1165 break;
1166 }
1167
1168 if (materialname && !msg)
1169 buf.printf ("It is made of: %s.\n", &materialname);
1170
1171 if (who)
1172 /* Where to wear this item */
1173 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1174 if (slot[i].info)
1175 {
1176 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1177
1178 if (slot[i].info < -1 && who->slot[i].info)
1179 buf.printf ("(%d)", -slot[i].info);
1180
1181 buf << ".\n";
1182 }
1183
1184 if (weight)
1185 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1186
1187 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1188 {
1189 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1190
1191 if (is_in_shop (who))
1192 {
1193 if (flag [FLAG_UNPAID])
1194 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1195 else
1196 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1197 }
1198 }
1199
1200 if (flag [FLAG_MONSTER])
1201 buf << describe_monster (who);
1202
1203 /* Is this item buildable? */
1204 if (flag [FLAG_IS_BUILDABLE])
1205 buf << "This is a buildable item.\n";
1206
1207 /* Does the object have a message? Don't show message for all object
1208 * types - especially if the first entry is a match
1209 */
1210 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && *msg != '@')
1211 {
1212 /* This is just a hack so when identifying the items, we print
1213 * out the extra message
1214 */
1215 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1216 buf << "The object has a story:\n";
1217
1218 buf << msg << '\n';
1219 }
1220
1221 buf << '\n';
1222
1223 return std::string (buf.linearise (), buf.size ());
1224}
1225
1226static void 1062static void
1227display_new_pickup (object *op) 1063display_new_pickup (object *op)
1228{ 1064{
1229 int i = op->contr->mode; 1065 int i = op->contr->mode;
1230 1066
1231 if (!(i & PU_NEWMODE))
1232 return;
1233
1234 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1235 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);
1236 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);
1237 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);
1238 1070
1239 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);
1290 }; 1122 };
1291 1123
1292 if (!params) 1124 if (!params)
1293 { 1125 {
1294 /* if the new mode is used, just print the settings */ 1126 /* if the new mode is used, just print the settings */
1295 if (op->contr->mode & PU_NEWMODE)
1296 {
1297 display_new_pickup (op); 1127 display_new_pickup (op);
1298 return 1;
1299 }
1300 if (1)
1301 LOG (llevDebug, "command_pickup: !params\n");
1302 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1303 return 0; 1128 return 0;
1304 } 1129 }
1305 1130
1306 while (*params == ' ' && *params) 1131 while (*params == ' ' && *params)
1307 params++; 1132 params++;
1313 for (mode = 0; names[mode]; mode++) 1138 for (mode = 0; names[mode]; mode++)
1314 { 1139 {
1315 if (!strcmp (names[mode], params + 1)) 1140 if (!strcmp (names[mode], params + 1))
1316 { 1141 {
1317 i = op->contr->mode; 1142 i = op->contr->mode;
1318 if (!(i & PU_NEWMODE)) 1143
1319 i = PU_NEWMODE;
1320 if (*params == '+') 1144 if (*params == '+')
1321 i = i | modes[mode]; 1145 i = i | modes[mode];
1322 else 1146 else
1323 i = i & ~modes[mode]; 1147 i = i & ~modes[mode];
1148
1324 op->contr->mode = i; 1149 op->contr->mode = i;
1325 display_new_pickup (op); 1150 display_new_pickup (op);
1326 return 1; 1151 return 1;
1327 } 1152 }
1328 } 1153 }
1330 return 1; 1155 return 1;
1331 } 1156 }
1332 1157
1333 if (sscanf (params, "%u", &i) != 1) 1158 if (sscanf (params, "%u", &i) != 1)
1334 { 1159 {
1335 if (1)
1336 LOG (llevDebug, "command_pickup: params==NULL\n");
1337 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.");
1338 return 1; 1161 return 1;
1339 } 1162 }
1340 set_pickup_mode (op, i); 1163
1164 if (i <= PU_RATIO)
1165 i |= op->contr->mode & ~PU_RATIO;
1166
1167 op->contr->mode = i;
1341 1168
1342 return 1; 1169 return 1;
1343} 1170}
1344 1171
1345void
1346set_pickup_mode (object *op, int i)
1347{
1348 switch (op->contr->mode = i)
1349 {
1350 case 0:
1351 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1352 break;
1353 case 1:
1354 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1355 break;
1356 case 2:
1357 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1358 break;
1359 case 3:
1360 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1361 break;
1362 case 4:
1363 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1364 break;
1365 case 5:
1366 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1367 break;
1368 case 6:
1369 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1370 break;
1371 case 7:
1372 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1373 break;
1374 }
1375}
1376
1377int 1172int
1378command_search_items (object *op, char *params) 1173command_search_items (object *op, char *params)
1379{ 1174{
1380 char buf[MAX_BUF];
1381
1382 if (settings.search_items == FALSE)
1383 return 1;
1384
1385 if (params == NULL) 1175 if (params == NULL)
1386 { 1176 {
1387 if (op->contr->search_str[0] == '\0') 1177 if (op->contr->search_str[0] == '\0')
1388 { 1178 {
1389 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1179 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1390 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");
1391 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'.");
1392 return 1; 1182 return 1;
1393 } 1183 }
1394 1184
1395 op->contr->search_str[0] = '\0'; 1185 op->contr->search_str[0] = '\0';
1396 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1186 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1397 op->update_stats (); 1187 op->contr->queue_stats_update ();
1398 return 1; 1188 return 1;
1399 } 1189 }
1400 1190
1401 if ((int) strlen (params) >= MAX_BUF) 1191 if (strlen (params) >= sizeof (op->contr->search_str))
1402 { 1192 {
1403 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1193 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1404 return 1; 1194 return 1;
1405 } 1195 }
1406 1196
1407 strcpy (op->contr->search_str, params); 1197 strcpy (op->contr->search_str, params);
1408 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));
1409 new_draw_info (NDI_UNIQUE, 0, op, buf); 1199 op->contr->queue_stats_update ();
1410 op->update_stats (); 1200
1411 return 1; 1201 return 1;
1412} 1202}
1413 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