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.56 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.89 by elmex, Mon Jan 12 00:17:23 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* 24/*
26 * Object (handling) commands 25 * Object (handling) commands
27 */ 26 */
… …
92find_best_object_match (object *pl, const char *params) 91find_best_object_match (object *pl, const char *params)
93{ 92{
94 return find_best_apply_object_match (pl, params, AP_TOGGLE); 93 return find_best_apply_object_match (pl, params, AP_TOGGLE);
95} 94}
96 95
96static bool
97can_split (object *pl, object *&op, sint32 nrof)
98{
99 if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
100 {
101 op = tmp;
102 return true;
103 }
104 else
105 {
106 if (op->nrof > 1)
107 new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %s.", op->nrof, &op->name_pl);
108 else
109 new_draw_info_format (NDI_UNIQUE, 0, pl, "There is only one %s.", &op->name);
110
111 return false;
112 }
113}
114
97int 115int
98command_uskill (object *pl, char *params) 116command_uskill (object *pl, char *params)
99{ 117{
100 if (!params) 118 if (!params)
101 { 119 {
… …
115 { 133 {
116 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); 134 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
117 return 0; 135 return 0;
118 } 136 }
119 137
120 skill = find_skill_by_name (pl, params); 138 skill = find_skill_by_name_fuzzy (pl, params);
121 139
122 if (!skill) 140 if (!skill)
123 { 141 {
124 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 142 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);
125 return 0; 143 return 0;
126 } 144 }
127 145
128 pl->change_skill (0); 146 pl->change_skill (0);
129 apply_special (pl, skill, AP_APPLY); 147 apply_special (pl, skill, AP_APPLY);
130 return 1; 148 return 1;
131}
132
133/* These functions (command_search, command_disarm) are really just wrappers for
134 * things like 'use_skill ...'). In fact, they should really be obsoleted
135 * and replaced with those.
136 */
137int
138command_search (object *op, char *params)
139{
140 return use_skill (op, skill_names[SK_FIND_TRAPS]);
141}
142
143int
144command_disarm (object *op, char *params)
145{
146 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
147} 149}
148 150
149/* A little special because we do want to pass the full params along 151/* A little special because we do want to pass the full params along
150 * as it includes the object to throw. 152 * as it includes the object to throw.
151 */ 153 */
… …
209 * not need to use split_ob and stuff. 211 * not need to use split_ob and stuff.
210 */ 212 */
211int 213int
212sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 214sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
213{ 215{
214
215 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 216 if (!QUERY_FLAG (sack, FLAG_APPLIED))
216 { 217 {
217 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); 218 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
218 return 0; 219 return 0;
219 } 220 }
221
220 if (sack == op) 222 if (sack == op)
221 { 223 {
222 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack)); 224 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack));
223 return 0; 225 return 0;
224 } 226 }
227
225 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) 228 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
226 { 229 {
227 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); 230 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));
228 return 0; 231 return 0;
229 } 232 }
233
230 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 234 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
231 { 235 {
232 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); 236 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
233 return 0; 237 return 0;
234 } 238 }
239
235 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 240 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
236 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 241 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
237 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 242 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
238 { 243 {
239 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 244 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
240 return 0; 245 return 0;
241 } 246 }
247
242 /* All other checks pass, must be OK */ 248 /* All other checks pass, must be OK */
243 return 1; 249 return 1;
244} 250}
245 251
246/* Pick up commands follow */ 252/* Pick up commands follow */
… …
251 * pick up (0 means all of them) 257 * pick up (0 means all of them)
252 */ 258 */
253static void 259static void
254pick_up_object (object *pl, object *op, object *tmp, int nrof) 260pick_up_object (object *pl, object *op, object *tmp, int nrof)
255{ 261{
256 /* buf needs to be big (more than 256 chars) because you can get
257 * very long item names.
258 */
259 char buf[HUGE_BUF];
260 object *env = tmp->env; 262 object *env = tmp->env;
261 uint32 weight, effective_weight_limit; 263 uint32 weight, effective_weight_limit;
262 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 264 int tmp_nrof = tmp->number_of ();
263 265
264 /* 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
265 * 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
266 * (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
267 * containers not allowed as of now) 269 * containers not allowed as of now)
268 */ 270 */
269 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 271 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
270 { 272 {
271 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.>");
272 return; 276 return;
273 } 277 }
274 278
275 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 279 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
276 return; 280 return;
277 281
278 if (nrof > tmp_nrof || nrof == 0) 282 if (nrof > tmp_nrof || nrof <= 0)
279 nrof = tmp_nrof; 283 nrof = tmp_nrof;
280 284
281 /* Figure out how much weight this object will add to the player */ 285 /* Figure out how much weight this object will add to the player */
282 weight = tmp->weight * nrof; 286 weight = tmp->weight * nrof;
283 if (tmp->inv) 287 if (tmp->inv)
284 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 288 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
285 289
286 if (pl->stats.Str <= MAX_STAT)
287 effective_weight_limit = weight_limit[pl->stats.Str]; 290 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
288 else
289 effective_weight_limit = weight_limit[MAX_STAT];
290 291
291 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 292 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
292 { 293 {
293 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 294 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
294 return; 295 return;
295 } 296 }
296 297
297 if (nrof != tmp_nrof) 298 if (!can_split (pl, tmp, nrof))
298 {
299 object *tmp2 = tmp;
300
301 tmp = get_split_ob (tmp, nrof);
302 if (!tmp)
303 {
304 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
305 return; 299 return;
306 }
307 300
308 /* Tell the client what happened to the rest of objects */ 301 if (QUERY_FLAG (tmp, FLAG_UNPAID))
309 if (pl->contr) 302 {
310 if (tmp2->destroyed ()) 303 tmp->flag.reset (FLAG_UNPAID);
311 esrv_del_item (pl->contr, tmp2->count); 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));
312 else 305 tmp->flag.set (FLAG_UNPAID);
313 esrv_update_item (UPD_NROF, pl, tmp2);
314 } 306 }
315 else 307 else
316 { 308 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
317 /* If the object is in a container, send a delete to the client.
318 * - we are moving all the items from the container to elsewhere,
319 * so it needs to be deleted.
320 */
321 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
322 {
323 if (tmp->env && pl->type == PLAYER)
324 esrv_del_item (pl->contr, tmp->count);
325 309
326 tmp->remove (); /* Unlink it */ 310 op->insert (tmp);
327 }
328 }
329
330 if (QUERY_FLAG (tmp, FLAG_UNPAID))
331 sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
332 else
333 sprintf (buf, "You pick up the %s.", query_name (tmp));
334
335 new_draw_info (NDI_UNIQUE, 0, pl, buf);
336
337 tmp = insert_ob_in_ob (tmp, op);
338
339 /* All the stuff below deals with client/server code, and is only
340 * usable by players
341 */
342 if (pl->contr)
343 {
344 esrv_send_item (pl, tmp);
345
346 /* These are needed to update the weight for the container we
347 * are putting the object in.
348 */
349 if (op != pl)
350 {
351 esrv_update_item (UPD_WEIGHT, pl, op);
352 esrv_send_item (pl, pl);
353 }
354
355 /* Update the container the object was in */
356 if (env && env != pl && env != op)
357 esrv_update_item (UPD_WEIGHT, pl, env);
358 }
359} 311}
360 312
361/* 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 */
362void 314void
363pick_up (object *op, object *alt) 315pick_up (object *op, object *alt)
… …
373 if (!can_pick (op, alt)) 325 if (!can_pick (op, alt))
374 { 326 {
375 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name); 327 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
376 goto leave; 328 goto leave;
377 } 329 }
330
378 tmp = alt; 331 tmp = alt;
379 } 332 }
380 else 333 else
381 { 334 {
382 if (op->below == NULL || !can_pick (op, op->below)) 335 if (op->below == NULL || !can_pick (op, op->below))
… …
391 /* Try to catch it. */ 344 /* Try to catch it. */
392 tmp_map = tmp->map; 345 tmp_map = tmp->map;
393 tmp = stop_item (tmp); 346 tmp = stop_item (tmp);
394 if (tmp == NULL) 347 if (tmp == NULL)
395 goto leave; 348 goto leave;
349
396 need_fix_tmp = 1; 350 need_fix_tmp = 1;
397 if (!can_pick (op, tmp)) 351 if (!can_pick (op, tmp))
398 goto leave; 352 goto leave;
399 353
400 if (op->type == PLAYER) 354 if (op->type == PLAYER)
… …
405 } 359 }
406 else 360 else
407 count = tmp->nrof; 361 count = tmp->nrof;
408 362
409 /* container is open, so use it */ 363 /* container is open, so use it */
364 if (tmp->flag [FLAG_STARTEQUIP])
365 alt = op;
410 if (op->container) 366 else if (op->container)
411 { 367 {
412 alt = op->container; 368 alt = op->container;
413 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 369 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
414 goto leave; 370 goto leave;
415 } 371 }
… …
434 /* here it could be possible to check rent, 390 /* here it could be possible to check rent,
435 * if someone wants to implement it 391 * if someone wants to implement it
436 */ 392 */
437 alt = op; 393 alt = op;
438 } 394 }
395
439#ifdef PICKUP_DEBUG 396#ifdef PICKUP_DEBUG
440 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); 397 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
441#endif 398#endif
442 399
443 /* startequip items are not allowed to be put into containers: */ 400 /* startequip items are not allowed to be put into containers: */
… …
493 450
494 /* Makes processing easier */ 451 /* Makes processing easier */
495 if (params && *params == '\0') 452 if (params && *params == '\0')
496 params = 0; 453 params = 0;
497 454
455 int cnt = MAX_ITEM_PER_DROP;
456
498 while (tmp) 457 while (tmp)
499 { 458 {
500 next = tmp->below; 459 next = tmp->below;
501 460
502 if (tmp->invisible) 461 if (tmp->invisible)
… …
508 /* This following two if and else if could be merged into line 467 /* This following two if and else if could be merged into line
509 * but that probably will make it more difficult to read, and 468 * but that probably will make it more difficult to read, and
510 * not make it any more efficient 469 * not make it any more efficient
511 */ 470 */
512 if (params && item_matched_string (op, tmp, params)) 471 if (params && item_matched_string (op, tmp, params))
472 {
473 if (--cnt < 0) break;
513 pick_up (op, tmp); 474 pick_up (op, tmp);
475 }
514 else if (can_pick (op, tmp) && !params) 476 else if (can_pick (op, tmp) && !params)
515 { 477 {
478 if (--cnt < 0) break;
516 pick_up (op, tmp); 479 pick_up (op, tmp);
517 break; 480 break;
518 } 481 }
519 482
520 tmp = next; 483 tmp = next;
484 }
485
486 if (cnt < 0)
487 {
488 op->failmsg ("Couldn't pick up so many items at once.");
489 return 0;
521 } 490 }
522 491
523 if (!params && !tmp) 492 if (!params && !tmp)
524 { 493 {
525 for (tmp = op->below; tmp; tmp = tmp->below) 494 for (tmp = op->below; tmp; tmp = tmp->below)
526 if (!tmp->invisible) 495 if (!tmp->invisible)
527 { 496 {
528 char buf[MAX_BUF];
529
530 sprintf (buf, "You can't pick up a %s.", &tmp->name); 497 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up a %s.", &tmp->name);
531 new_draw_info (NDI_UNIQUE, 0, op, buf);
532 break; 498 break;
533 } 499 }
534 500
535 if (!tmp) 501 if (!tmp)
536 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 502 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
537 } 503 }
538 504
539 return 0; 505 return 0;
540} 506}
541 507
542
543/* 508/*
544 * This function was part of drop, now is own function. 509 * This function was part of drop, now is own function.
545 * Player 'op' tries to put object 'tmp' into sack 'sack', 510 * Player 'op' tries to put object 'tmp' into sack 'sack',
546 * if nrof is non zero, then nrof objects is tried to put into sack. 511 * if nrof is non zero, then nrof objects is tried to put into sack.
512 *
547 * Note that the 'sack' in question can now be a transport, 513 * Note that the 'sack' in question can now be a transport,
548 * so this function isn't named very good anymore. 514 * so this function isn't named very good anymore.
549 */ 515 */
550void 516void
551put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 517put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
… …
562 return; 528 return;
563 } 529 }
564 530
565 if (tmp->type == CONTAINER && tmp->inv) 531 if (tmp->type == CONTAINER && tmp->inv)
566 { 532 {
567
568 /* Eneq(@csd.uu.se): If the object to be dropped is a container 533 /* Eneq(@csd.uu.se): If the object to be dropped is a container
569 * we instead move the contents of that container into the active 534 * we instead move the contents of that container into the active
570 * container, this is only done if the object has something in it. 535 * container, this is only done if the object has something in it.
571 */ 536 */
572 sack2 = tmp; 537 sack2 = tmp;
… …
575 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 540 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
576 { 541 {
577 tmp = tmp2->below; 542 tmp = tmp2->below;
578 543
579 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 544 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))
580 {
581 put_object_in_sack (op, sack, tmp2, 0); 545 put_object_in_sack (op, sack, tmp2, 0);
582 }
583 else 546 else
584 { 547 {
585 sprintf (buf, "Your %s fills up.", query_name (sack)); 548 sprintf (buf, "Your %s fills up.", query_name (sack));
586 new_draw_info (NDI_UNIQUE, 0, op, buf); 549 new_draw_info (NDI_UNIQUE, 0, op, buf);
587 break; 550 break;
588 } 551 }
589 } 552 }
590 553
591 esrv_update_item (UPD_WEIGHT, op, sack2);
592 return; 554 return;
593 } 555 }
594 556
595 /* Don't worry about this for containers - our caller should have 557 /* Don't worry about this for containers - our caller should have
596 * already checked this. 558 * already checked this.
… …
601 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 563 if (QUERY_FLAG (tmp, FLAG_APPLIED))
602 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 564 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
603 return; 565 return;
604 566
605 /* we want to put some portion of the item into the container */ 567 /* we want to put some portion of the item into the container */
606 if (nrof && tmp->nrof != nrof) 568 if (!can_split (op, tmp, nrof))
607 {
608 object *tmp2 = tmp;
609
610 tmp = get_split_ob (tmp, nrof);
611
612 if (!tmp)
613 {
614 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
615 return; 569 return;
616 }
617 /* Tell a client what happened other objects */
618 if (tmp2->destroyed ())
619 esrv_del_item (op->contr, tmp2->count);
620 else /* this can proably be replaced with an update */
621 esrv_send_item (op, tmp2);
622 }
623 else
624 tmp->remove ();
625 570
626 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 571 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
627 tmp2 = insert_ob_in_ob (tmp, sack); 572 sack->insert (tmp);
628 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
629 /* in object.c */
630
631 /* If an object merged (and thus, different object), we need to
632 * delete the original.
633 */
634 if (tmp2 != tmp)
635 esrv_del_item (op->contr, tmp->count);
636
637 esrv_send_item (op, tmp2);
638
639 /* update the sacks weight */
640 esrv_update_item (UPD_WEIGHT, op, sack);
641} 573}
642 574
643/* 575/*
644 * This function was part of drop, now is own function. 576 * This function was part of drop, now is own function.
645 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 577 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
… …
647 * This is used when dropping objects onto the floor. 579 * This is used when dropping objects onto the floor.
648 */ 580 */
649void 581void
650drop_object (object *op, object *tmp, uint32 nrof) 582drop_object (object *op, object *tmp, uint32 nrof)
651{ 583{
652 char buf[MAX_BUF];
653 object *floor;
654
655 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 584 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
656 return; 585 return;
657 586
658 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 587 if (QUERY_FLAG (tmp, FLAG_APPLIED))
659 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 588 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
… …
662 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D 591 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
663 592
664 /* We are only dropping some of the items. We split the current object 593 /* We are only dropping some of the items. We split the current object
665 * off 594 * off
666 */ 595 */
667 if (nrof && tmp->nrof != nrof) 596 if (!can_split (op, tmp, nrof))
668 {
669 object *tmp2 = tmp;
670
671 tmp = get_split_ob (tmp, nrof);
672 if (!tmp)
673 {
674 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
675 return;
676 }
677 /* Tell a client what happened rest of objects. tmp2 is now the
678 * original object
679 */
680 if (op->type == PLAYER)
681 {
682 if (tmp2->destroyed ())
683 esrv_del_item (op->contr, tmp2->count);
684 else
685 esrv_send_item (op, tmp2);
686 }
687 }
688 else
689 tmp->remove ();
690
691 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
692 return; 597 return;
693 598
599 drop_object (op, tmp);
600
601 if (!tmp->destroyed () && !tmp->is_inserted ())
602 {
603 // if nothing happened with the object we give it back
604 op->insert (tmp);
605 }
606}
607
608/* In contrast to drop_object (op, tmp, nrof) above this function takes the
609 * already split off object, and feeds it to the event handlers and does
610 * other magic with it.
611 *
612 * <droppper> is the object that dropped this object and <obj> is the
613 * object that was dropped.
614 *
615 * Make sure to check what happened with <obj> after this function returns!
616 * Otherwise you may leak this object.
617 */
618
619void
620drop_object (object *dropper, object *obj)
621{
622 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
623 return;
624
625 if (obj->destroyed () || obj->is_inserted ())
626 return;
627
694 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 628 if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
695 { 629 {
696 sprintf (buf, "You drop the %s.", query_name (tmp)); 630 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
697 new_draw_info (NDI_UNIQUE, 0, op, buf); 631 dropper->statusmsg ("The god who lent it to you retrieves it.");
698 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
699 632
700 if (op->type == PLAYER)
701 esrv_del_item (op->contr, tmp->count);
702
703 tmp->destroy (); 633 obj->destroy ();
704 op->update_stats (); 634 dropper->update_stats ();
705 return; 635 return;
706 } 636 }
707 637
708 if (op->type == PLAYER) 638 for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
709 esrv_del_item (op->contr, tmp->count); 639 floor;
640 floor = floor->above)
641 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
642 return;
710 643
711 /* Call this before we update the various windows/players. At least 644 if (obj->destroyed () || obj->is_inserted ())
712 * that we, we know the weight is correct. 645 return;
646
647 if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
648 if (!sell_item (obj, dropper))
649 return;
650
651 /* If nothing special happened with this object, the default action is to
652 * insert it below the dropper:
713 */ 653 */
714 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
715 /* in object.c */
716 654
717 if (op->type == PLAYER) 655 obj->x = dropper->x;
718 { 656 obj->y = dropper->y;
719 /* Need to update the weight for the player */
720 esrv_send_item (op, op);
721 op->contr->ns->floorbox_update ();
722 }
723 657
724 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
725 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
726 return;
727
728 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
729 sell_item (tmp, op);
730
731 tmp->x = op->x;
732 tmp->y = op->y;
733
734 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 658 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
735} 659}
736 660
737void 661void
738drop (object *op, object *tmp) 662drop (object *op, object *tmp)
739{ 663{
… …
748 if (tmp->env && tmp->env->type != PLAYER) 672 if (tmp->env && tmp->env->type != PLAYER)
749 { 673 {
750 /* Just toss the object - probably shouldn't be hanging 674 /* Just toss the object - probably shouldn't be hanging
751 * around anyways 675 * around anyways
752 */ 676 */
753 tmp->remove ();
754 tmp->destroy (); 677 tmp->destroy ();
755 return; 678 return;
756 } 679 }
757 else 680 else
758 { 681 {
759 while (tmp != NULL && tmp->invisible) 682 while (tmp && tmp->invisible)
760 tmp = tmp->below; 683 tmp = tmp->below;
761 } 684 }
762 } 685 }
763 686
764 if (tmp == NULL) 687 if (tmp == NULL)
765 { 688 {
766 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 689 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
767 return; 690 return;
768 } 691 }
692
769 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 693 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
770 { 694 {
771 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 695 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
772 return; 696 return;
773 } 697 }
698
774 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 699 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
775 { 700 {
776#if 0 701#if 0
777 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 702 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
778 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 703 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
… …
802 727
803 if (op->type == PLAYER) 728 if (op->type == PLAYER)
804 op->contr->count = 0; 729 op->contr->count = 0;
805} 730}
806 731
807
808
809/* Command will drop all items that have not been locked */ 732/* Command will drop all items that have not been locked */
810int 733int
811command_dropall (object *op, char *params) 734command_dropall (object *op, char *params)
812{ 735{
813 736
814 object *curinv, *nextinv;
815
816 if (op->inv == NULL) 737 if (op->inv == NULL)
817 { 738 {
818 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 739 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
819 return 0; 740 return 0;
820 } 741 }
821 742
822 curinv = op->inv; 743 object *curinv = op->inv;
744 object *nextinv;
823 745
824 /* 746 /*
825 This is the default. Drops everything not locked or considered 747 This is the default. Drops everything not locked or considered
826 not something that should be dropped. 748 not something that should be dropped.
827 */ 749 */
… …
829 Care must be taken that the next item pointer is not to money as 751 Care must be taken that the next item pointer is not to money as
830 the drop() routine will do unknown things to it when dropping 752 the drop() routine will do unknown things to it when dropping
831 in a shop. --Tero.Pelander@utu.fi 753 in a shop. --Tero.Pelander@utu.fi
832 */ 754 */
833 755
834 if (params == NULL) 756 int cnt = MAX_ITEM_PER_DROP;
757
758 if (!params)
835 { 759 {
836 while (curinv != NULL) 760 while (curinv)
837 { 761 {
838 nextinv = curinv->below; 762 nextinv = curinv->below;
763
839 while (nextinv && nextinv->type == MONEY) 764 while (nextinv && nextinv->type == MONEY)
840 nextinv = nextinv->below; 765 nextinv = nextinv->below;
766
841 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 767 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
842 curinv->type != FOOD && curinv->type != KEY && 768 curinv->type != FOOD && curinv->type != KEY &&
843 curinv->type != SPECIAL_KEY && curinv->type != GEM && 769 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
844 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 770 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
845 { 771 {
846 drop (op, curinv); 772 drop (op, curinv);
773 if (--cnt <= 0) break;
847 } 774 }
775
848 curinv = nextinv; 776 curinv = nextinv;
849 } 777 }
850 } 778 }
851
852 else if (strcmp (params, "weapons") == 0) 779 else if (strcmp (params, "weapons") == 0)
853 { 780 {
854 while (curinv != NULL) 781 while (curinv)
855 { 782 {
856 nextinv = curinv->below; 783 nextinv = curinv->below;
784
857 while (nextinv && nextinv->type == MONEY) 785 while (nextinv && nextinv->type == MONEY)
858 nextinv = nextinv->below; 786 nextinv = nextinv->below;
787
859 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 788 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
860 { 789 {
861 drop (op, curinv); 790 drop (op, curinv);
791 if (--cnt <= 0) break;
862 } 792 }
793
863 curinv = nextinv; 794 curinv = nextinv;
864 } 795 }
865 } 796 }
866
867 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 797 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
868 { 798 {
869 while (curinv != NULL) 799 while (curinv)
870 { 800 {
871 nextinv = curinv->below; 801 nextinv = curinv->below;
802
872 while (nextinv && nextinv->type == MONEY) 803 while (nextinv && nextinv->type == MONEY)
873 nextinv = nextinv->below; 804 nextinv = nextinv->below;
805
874 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 806 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
875 { 807 {
876 drop (op, curinv); 808 drop (op, curinv);
809 if (--cnt <= 0) break;
877 } 810 }
811
878 curinv = nextinv; 812 curinv = nextinv;
879 } 813 }
880 } 814 }
881
882 else if (strcmp (params, "misc") == 0) 815 else if (strcmp (params, "misc") == 0)
883 { 816 {
884 while (curinv != NULL) 817 while (curinv)
885 { 818 {
886 nextinv = curinv->below; 819 nextinv = curinv->below;
820
887 while (nextinv && nextinv->type == MONEY) 821 while (nextinv && nextinv->type == MONEY)
888 nextinv = nextinv->below; 822 nextinv = nextinv->below;
823
889 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 824 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
890 { 825 {
891 switch (curinv->type) 826 switch (curinv->type)
892 { 827 {
893 case HORN: 828 case HORN:
… …
911 break; 846 break;
912 default: 847 default:
913 curinv = nextinv; 848 curinv = nextinv;
914 break; 849 break;
915 } 850 }
851
852 if (--cnt <= 0) break;
916 } 853 }
854
917 curinv = nextinv; 855 curinv = nextinv;
918 } 856 }
919 } 857 }
920 858
921 op->contr->ns->floorbox_update (); 859 if (cnt <= 0)
860 op->failmsg ("Only dropped some items, can't drop that many items at once.");
922 861
923/* draw_look(op);*/ 862/* draw_look(op);*/
924 return 0; 863 return 0;
864}
865
866
867/* This function tries to drop all objects in the <objs> vector.
868 * <dropper> is the object that wants to drop them.
869 * <cnt> can be a 0 pointer or a pointer to the maximum number of
870 * drop operations to perform.
871 *
872 * Returns true if at least one item was dropped.
873 */
874bool
875drop_vector (object *dropper, vector<object *> &objs, int *cnt)
876{
877 vector<object *>::iterator i;
878
879 bool did_one = false;
880
881 for (i = objs.begin (); i != objs.end (); i++)
882 {
883 drop (dropper, *i);
884 if (cnt && --*cnt <= 0) break;
885 did_one = true;
886 }
887
888 return did_one;
925} 889}
926 890
927/* Object op wants to drop object(s) params. params can be a 891/* Object op wants to drop object(s) params. params can be a
928 * comma seperated list. 892 * comma seperated list.
929 */ 893 */
930
931int 894int
932command_drop (object *op, char *params) 895command_drop (object *op, char *params)
933{ 896{
934 object *tmp, *next; 897 object *tmp, *next;
935 int did_one = 0; 898 int did_one = 0;
… …
939 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 902 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
940 return 0; 903 return 0;
941 } 904 }
942 else 905 else
943 { 906 {
907 vector<object *> matched_objs;
908
944 for (tmp = op->inv; tmp; tmp = next) 909 for (tmp = op->inv; tmp; tmp = next)
945 { 910 {
946 next = tmp->below; 911 next = tmp->below;
947 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 912 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
948 continue; 913 continue;
914
949 if (item_matched_string (op, tmp, params)) 915 if (item_matched_string (op, tmp, params))
950 { 916 matched_objs.push_back (tmp);
951 drop (op, tmp);
952 did_one = 1;
953 } 917 }
954 } 918
955 if (!did_one) 919 int cnt = MAX_ITEM_PER_DROP;
920
921 if (!drop_vector (op, matched_objs, &cnt))
956 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 922 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
957 } 923
958 if (op->type == PLAYER) 924 if (cnt <= 0)
959 { 925 op->failmsg ("Only dropped some items, can't drop that many items at once.");
960 op->contr->count = 0;
961 op->contr->ns->floorbox_update ();
962 }; 926 }
963 927
964/* draw_look(op);*/
965 return 0; 928 return 0;
966} 929}
967 930
968int 931int
969command_examine (object *op, char *params) 932command_examine (object *op, char *params)
… …
972 { 935 {
973 object *tmp = op->below; 936 object *tmp = op->below;
974 937
975 while (tmp && !tmp->client_visible ()) 938 while (tmp && !tmp->client_visible ())
976 tmp = tmp->below; 939 tmp = tmp->below;
940
977 if (tmp) 941 if (tmp)
978 examine (op, tmp); 942 examine (op, tmp);
979 } 943 }
980 else 944 else
981 { 945 {
982 object *tmp = find_best_object_match (op, params); 946 object *tmp = find_best_object_match (op, params);
983 947
984 if (tmp) 948 if (tmp)
985 examine (op, tmp); 949 examine (op, tmp);
986 else 950 else
987 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params); 951 op->contr->infobox (MSG_CHANNEL ("examine"), format ("Could not find an object that matches %s", params));
988 } 952 }
953
989 return 0; 954 return 0;
990} 955}
991 956
992/* op should be a player. 957/* op should be a player.
993 * we return the object the player has marked with the 'mark' command 958 * we return the object the player has marked with the 'mark' command
… …
1040 dynbuf_text buf (512, 512); 1005 dynbuf_text buf (512, 512);
1041 1006
1042 object *mon = head ? head : this; 1007 object *mon = head ? head : this;
1043 1008
1044 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 1009 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1045 buf << "It is an undead force.\n"; 1010 buf << "It is an undead force.\r";
1046 1011
1047 if (mon->level > who->level) 1012 if (mon->level > who->level)
1048 buf << "It is likely more powerful than you.\n"; 1013 buf << "It is likely more powerful than you.\r";
1049 else if (mon->level < who->level) 1014 else if (mon->level < who->level)
1050 buf << "It is likely less powerful than you.\n"; 1015 buf << "It is likely less powerful than you.\r";
1051 else 1016 else
1052 buf << "It is probably as powerful as you.\n"; 1017 buf << "It is probably as powerful as you.\r";
1053 1018
1054 if (mon->attacktype & AT_ACID) 1019 if (mon->attacktype & AT_ACID)
1055 buf << "You seem to smell an acrid odor.\n"; 1020 buf << "You seem to smell an acrid odor.\r";
1056 1021
1057 /* Anyone know why this used to use the clone value instead of the 1022 /* Anyone know why this used to use the clone value instead of the
1058 * maxhp field? This seems that it should give more accurate results. 1023 * maxhp field? This seems that it should give more accurate results.
1059 */ 1024 */
1060 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 1025 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1061 { /* From 1-4 */ 1026 { /* From 1-4 */
1062 case 1: 1027 case 1:
1063 buf << "It is in a bad shape.\n"; 1028 buf << "It is in a bad shape.\r";
1064 break; 1029 break;
1065 case 2: 1030 case 2:
1066 buf << "It is hurt.\n"; 1031 buf << "It is hurt.\r";
1067 break; 1032 break;
1068 case 3: 1033 case 3:
1069 buf << "It is somewhat hurt.\n"; 1034 buf << "It is somewhat hurt.\r";
1070 break; 1035 break;
1071 case 4: 1036 case 4:
1072 buf << "It is in excellent shape.\n"; 1037 buf << "It is in excellent shape.\r";
1073 break; 1038 break;
1074 } 1039 }
1075 1040
1076 if (present_in_ob (POISONING, mon)) 1041 if (present_in_ob (POISONING, mon))
1077 buf << "It looks very ill.\n"; 1042 buf << "It looks very ill.\r";
1043
1044 buf << '\n';
1078 1045
1079 return buf; 1046 return buf;
1080} 1047}
1081 1048
1082/* tmp is the object being described, pl is who is examing it. */ 1049/* tmp is the object being described, pl is who is examing it. */
… …
1089} 1056}
1090 1057
1091std::string 1058std::string
1092object::long_desc (object *who) 1059object::long_desc (object *who)
1093{ 1060{
1094 std::string buf (query_name (this)); 1061 std::string buf (query_name ());
1095 1062
1096 switch (type) 1063 switch (type)
1097 { 1064 {
1098 case RING: 1065 case RING:
1099 case SKILL: 1066 case SKILL:
… …
1111 case CLOAK: 1078 case CLOAK:
1112 case FOOD: 1079 case FOOD:
1113 case DRINK: 1080 case DRINK:
1114 case FLESH: 1081 case FLESH:
1115 case SKILL_TOOL: 1082 case SKILL_TOOL:
1083 case LAMP:
1116 case POWER_CRYSTAL: 1084 case POWER_CRYSTAL:
1117 { 1085 {
1118 const char *cp = ::describe_item (this, who); 1086 const char *cp = ::describe_item (this, who);
1119 1087
1120 if (*cp) 1088 if (*cp)
… …
1140std::string 1108std::string
1141object::describe (object *who) 1109object::describe (object *who)
1142{ 1110{
1143 dynbuf_text buf (1024, 1024); 1111 dynbuf_text buf (1024, 1024);
1144 1112
1145 buf.printf ("That is: %s.\n", long_desc (who).c_str ()); 1113 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1146 1114
1147 if (custom_name) 1115 if (custom_name)
1148 buf,printf ("You call it %s\n", &custom_name); 1116 buf.printf ("You call it %s.\r", &custom_name);
1149 1117
1150 switch (type) 1118 switch (type)
1151 { 1119 {
1152 case SPELLBOOK: 1120 case SPELLBOOK:
1153 if (flag [FLAG_IDENTIFIED] && inv) 1121 if (flag [FLAG_IDENTIFIED] && inv)
1154 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill); 1122 buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1155 break; 1123 break;
1156 1124
1157 case BOOK: 1125 case BOOK:
1158 if (msg) 1126 if (msg)
1159 buf << "Something is written in it.\n"; 1127 buf << "Something is written in it.\r";
1160 break; 1128 break;
1161 1129
1162 case CONTAINER: 1130 case CONTAINER:
1163 if (race != NULL) 1131 if (race)
1164 { 1132 {
1165 if (weight_limit && stats.Str < 100) 1133 if (weight_limit && stats.Str < 100)
1166 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n", 1134 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1167 &race, weight_limit / (10.0 * (100 - stats.Str))); 1135 &race, weight_limit / (10.0 * (100 - stats.Str)));
1168 else 1136 else
1169 buf.printf ("It can hold only %s.\n", &race); 1137 buf.printf ("It can hold only %s.\r", &race);
1170 } 1138 }
1171 else if (weight_limit && stats.Str < 100) 1139 else if (weight_limit && stats.Str < 100)
1172 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str))); 1140 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1173 break; 1141 break;
1174 1142
1175 case WAND: 1143 case WAND:
1176 if (flag [FLAG_IDENTIFIED]) 1144 if (flag [FLAG_IDENTIFIED])
1177 buf.printf ("It has %d charges left.\n", stats.food); 1145 buf.printf ("It has %d charges left.\r", stats.food);
1178 break; 1146 break;
1179 } 1147 }
1180 1148
1181 if (materialname && !msg) 1149 if (materialname && !msg)
1182 buf.printf ("It is made of: %s.\n", &materialname); 1150 buf.printf ("It is made of: %s.\r", &materialname);
1183 1151
1184 if (who) 1152 if (who)
1185 /* Where to wear this item */ 1153 /* Where to wear this item */
1186 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1154 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1187 if (slot[i].info) 1155 if (slot[i].info)
… …
1189 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name); 1157 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1190 1158
1191 if (slot[i].info < -1 && who->slot[i].info) 1159 if (slot[i].info < -1 && who->slot[i].info)
1192 buf.printf ("(%d)", -slot[i].info); 1160 buf.printf ("(%d)", -slot[i].info);
1193 1161
1194 buf << ".\n"; 1162 buf << ".\r";
1195 } 1163 }
1196 1164
1197 if (weight) 1165 if (weight)
1198 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0); 1166 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1199 1167
1200 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) 1168 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1201 { 1169 {
1202 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX)); 1170 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1203 1171
1204 if (is_in_shop (who)) 1172 if (is_in_shop (who))
1205 { 1173 {
1206 if (flag [FLAG_UNPAID]) 1174 if (flag [FLAG_UNPAID])
1207 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP)); 1175 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1208 else 1176 else
1209 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it"); 1177 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1210 } 1178 }
1211 } 1179 }
1212 1180
1213 if (flag [FLAG_MONSTER]) 1181 if (flag [FLAG_MONSTER])
1214 buf << describe_monster (who); 1182 buf << describe_monster (who);
1215 1183
1216 /* Is this item buildable? */ 1184 /* Is this item buildable? */
1217 if (flag [FLAG_IS_BUILDABLE]) 1185 if (flag [FLAG_IS_BUILDABLE])
1218 buf << "This is a buildable item.\n"; 1186 buf << "This is a buildable item.\r";
1219 1187
1220 /* Does the object have a message? Don't show message for all object 1188 /* Does the object have a message? Don't show message for all object
1221 * types - especially if the first entry is a match 1189 * types - especially if the first entry is a match
1222 */ 1190 */
1223 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && strncasecmp (msg, "@match", 7)) 1191 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1224 { 1192 {
1225 /* This is just a hack so when identifying the items, we print 1193 /* This is just a hack so when identifying the items, we print
1226 * out the extra message 1194 * out the extra message
1227 */ 1195 */
1228 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1196 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1229 buf << "The object has a story:\n"; 1197 buf << "The object has a story:\r";
1230 1198
1231 buf << msg << '\n'; 1199 buf << msg << '\n';
1232 } 1200 }
1233 1201
1234 buf << '\n'; 1202 buf << '\n';
1235 1203
1236 return std::string (buf.linearise (), buf.size ()); 1204 return std::string (buf.linearise (), buf.size ());
1237}
1238
1239void
1240examine (object *op, object *tmp)
1241{
1242 std::string s = tmp->describe (op);
1243
1244 new_draw_info (NDI_UNIQUE, 0, op, s.c_str ());
1245}
1246
1247/*
1248 * inventory prints object's inventory. If inv==NULL then print player's
1249 * inventory.
1250 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1251 */
1252void
1253inventory (object *op, object *inv)
1254{
1255 object *tmp;
1256 const char *in;
1257 int items = 0, length;
1258
1259 if (inv == NULL && op == NULL)
1260 {
1261 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1262 return;
1263 }
1264
1265 tmp = inv ? inv->inv : op->inv;
1266
1267 while (tmp)
1268 {
1269 if ((!tmp->invisible &&
1270 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1271 items++;
1272 tmp = tmp->below;
1273 }
1274
1275 if (inv == NULL)
1276 { /* player's inventory */
1277 if (items == 0)
1278 {
1279 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
1280 return;
1281 }
1282 else
1283 {
1284 length = 28;
1285 in = "";
1286 new_draw_info (NDI_UNIQUE, 0, op, "Inventory:");
1287 }
1288 }
1289 else
1290 {
1291 if (items == 0)
1292 return;
1293 else
1294 {
1295 length = 28;
1296 in = " ";
1297 }
1298 }
1299
1300 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1301 {
1302 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1303 continue;
1304 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1305 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1306 query_name (tmp), tmp->count, query_weight (tmp));
1307 else
1308 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1309 }
1310
1311 if (!inv && op)
1312 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1313} 1205}
1314 1206
1315static void 1207static void
1316display_new_pickup (object *op) 1208display_new_pickup (object *op)
1317{ 1209{
1318 int i = op->contr->mode; 1210 int i = op->contr->mode;
1319 1211
1320 if (!(i & PU_NEWMODE))
1321 return;
1322
1323 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1324 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0); 1212 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1325 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0); 1213 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1326 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0); 1214 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1327 1215
1328 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5); 1216 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
… …
1379 }; 1267 };
1380 1268
1381 if (!params) 1269 if (!params)
1382 { 1270 {
1383 /* if the new mode is used, just print the settings */ 1271 /* if the new mode is used, just print the settings */
1384 if (op->contr->mode & PU_NEWMODE)
1385 {
1386 display_new_pickup (op); 1272 display_new_pickup (op);
1387 return 1;
1388 }
1389 if (1)
1390 LOG (llevDebug, "command_pickup: !params\n");
1391 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1392 return 0; 1273 return 0;
1393 } 1274 }
1394 1275
1395 while (*params == ' ' && *params) 1276 while (*params == ' ' && *params)
1396 params++; 1277 params++;
… …
1402 for (mode = 0; names[mode]; mode++) 1283 for (mode = 0; names[mode]; mode++)
1403 { 1284 {
1404 if (!strcmp (names[mode], params + 1)) 1285 if (!strcmp (names[mode], params + 1))
1405 { 1286 {
1406 i = op->contr->mode; 1287 i = op->contr->mode;
1407 if (!(i & PU_NEWMODE)) 1288
1408 i = PU_NEWMODE;
1409 if (*params == '+') 1289 if (*params == '+')
1410 i = i | modes[mode]; 1290 i = i | modes[mode];
1411 else 1291 else
1412 i = i & ~modes[mode]; 1292 i = i & ~modes[mode];
1293
1413 op->contr->mode = i; 1294 op->contr->mode = i;
1414 display_new_pickup (op); 1295 display_new_pickup (op);
1415 return 1; 1296 return 1;
1416 } 1297 }
1417 } 1298 }
… …
1419 return 1; 1300 return 1;
1420 } 1301 }
1421 1302
1422 if (sscanf (params, "%u", &i) != 1) 1303 if (sscanf (params, "%u", &i) != 1)
1423 { 1304 {
1424 if (1)
1425 LOG (llevDebug, "command_pickup: params==NULL\n");
1426 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> ."); 1305 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1427 return 1; 1306 return 1;
1428 } 1307 }
1429 set_pickup_mode (op, i); 1308
1309 if (i <= PU_RATIO)
1310 i |= op->contr->mode & ~PU_RATIO;
1311
1312 op->contr->mode = i;
1430 1313
1431 return 1; 1314 return 1;
1432}
1433
1434void
1435set_pickup_mode (object *op, int i)
1436{
1437 switch (op->contr->mode = i)
1438 {
1439 case 0:
1440 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1441 break;
1442 case 1:
1443 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1444 break;
1445 case 2:
1446 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1447 break;
1448 case 3:
1449 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1450 break;
1451 case 4:
1452 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1453 break;
1454 case 5:
1455 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1456 break;
1457 case 6:
1458 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1459 break;
1460 case 7:
1461 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1462 break;
1463 }
1464} 1315}
1465 1316
1466int 1317int
1467command_search_items (object *op, char *params) 1318command_search_items (object *op, char *params)
1468{ 1319{
1469 char buf[MAX_BUF]; 1320 char buf[MAX_BUF];
1470 1321
1471 if (settings.search_items == FALSE)
1472 return 1;
1473
1474 if (params == NULL) 1322 if (params == NULL)
1475 { 1323 {
1476 if (op->contr->search_str[0] == '\0') 1324 if (op->contr->search_str[0] == '\0')
1477 { 1325 {
1478 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1326 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1479 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all"); 1327 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1480 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'."); 1328 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1481 return 1; 1329 return 1;
1482 } 1330 }
1483 1331
… …
1485 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1333 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1486 op->update_stats (); 1334 op->update_stats ();
1487 return 1; 1335 return 1;
1488 } 1336 }
1489 1337
1490 if ((int) strlen (params) >= MAX_BUF) 1338 if (strlen (params) >= MAX_BUF)
1491 { 1339 {
1492 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1340 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1493 return 1; 1341 return 1;
1494 } 1342 }
1495 1343
1496 strcpy (op->contr->search_str, params); 1344 strcpy (op->contr->search_str, params);
1497 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1345 sprintf (buf, "Now searching for '%s'.", op->contr->search_str);
1498 new_draw_info (NDI_UNIQUE, 0, op, buf); 1346 new_draw_info (NDI_UNIQUE, 0, op, buf);
1499 op->update_stats (); 1347 op->update_stats ();
1348
1500 return 1; 1349 return 1;
1501} 1350}
1502 1351

Diff Legend

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