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.59 by root, Sun Sep 30 20:22:21 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 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) 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, 13 * This program is distributed in the hope that it will be useful,
… …
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 GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * 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>
22 */ 22 */
23 23
24/* 24/*
25 * Object (handling) commands 25 * Object (handling) commands
26 */ 26 */
… …
91find_best_object_match (object *pl, const char *params) 91find_best_object_match (object *pl, const char *params)
92{ 92{
93 return find_best_apply_object_match (pl, params, AP_TOGGLE); 93 return find_best_apply_object_match (pl, params, AP_TOGGLE);
94} 94}
95 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
96int 115int
97command_uskill (object *pl, char *params) 116command_uskill (object *pl, char *params)
98{ 117{
99 if (!params) 118 if (!params)
100 { 119 {
… …
114 { 133 {
115 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>");
116 return 0; 135 return 0;
117 } 136 }
118 137
119 skill = find_skill_by_name (pl, params); 138 skill = find_skill_by_name_fuzzy (pl, params);
120 139
121 if (!skill) 140 if (!skill)
122 { 141 {
123 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);
124 return 0; 143 return 0;
125 } 144 }
126 145
127 pl->change_skill (0); 146 pl->change_skill (0);
128 apply_special (pl, skill, AP_APPLY); 147 apply_special (pl, skill, AP_APPLY);
129 return 1; 148 return 1;
130}
131
132/* These functions (command_search, command_disarm) are really just wrappers for
133 * things like 'use_skill ...'). In fact, they should really be obsoleted
134 * and replaced with those.
135 */
136int
137command_search (object *op, char *params)
138{
139 return use_skill (op, skill_names[SK_FIND_TRAPS]);
140}
141
142int
143command_disarm (object *op, char *params)
144{
145 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
146} 149}
147 150
148/* 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
149 * as it includes the object to throw. 152 * as it includes the object to throw.
150 */ 153 */
… …
208 * not need to use split_ob and stuff. 211 * not need to use split_ob and stuff.
209 */ 212 */
210int 213int
211sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 214sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
212{ 215{
213
214 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 216 if (!QUERY_FLAG (sack, FLAG_APPLIED))
215 { 217 {
216 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));
217 return 0; 219 return 0;
218 } 220 }
221
219 if (sack == op) 222 if (sack == op)
220 { 223 {
221 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));
222 return 0; 225 return 0;
223 } 226 }
227
224 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)))
225 { 229 {
226 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));
227 return 0; 231 return 0;
228 } 232 }
233
229 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 234 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
230 { 235 {
231 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));
232 return 0; 237 return 0;
233 } 238 }
239
234 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 240 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
235 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 241 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
236 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 242 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
237 { 243 {
238 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));
239 return 0; 245 return 0;
240 } 246 }
247
241 /* All other checks pass, must be OK */ 248 /* All other checks pass, must be OK */
242 return 1; 249 return 1;
243} 250}
244 251
245/* Pick up commands follow */ 252/* Pick up commands follow */
… …
250 * pick up (0 means all of them) 257 * pick up (0 means all of them)
251 */ 258 */
252static void 259static void
253pick_up_object (object *pl, object *op, object *tmp, int nrof) 260pick_up_object (object *pl, object *op, object *tmp, int nrof)
254{ 261{
255 /* buf needs to be big (more than 256 chars) because you can get
256 * very long item names.
257 */
258 char buf[HUGE_BUF];
259 object *env = tmp->env; 262 object *env = tmp->env;
260 uint32 weight, effective_weight_limit; 263 uint32 weight, effective_weight_limit;
261 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 264 int tmp_nrof = tmp->number_of ();
262 265
263 /* 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
264 * 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
265 * (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
266 * containers not allowed as of now) 269 * containers not allowed as of now)
267 */ 270 */
268 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)
269 { 272 {
270 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.>");
271 return; 276 return;
272 } 277 }
273 278
274 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 279 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
275 return; 280 return;
276 281
277 if (nrof > tmp_nrof || nrof == 0) 282 if (nrof > tmp_nrof || nrof <= 0)
278 nrof = tmp_nrof; 283 nrof = tmp_nrof;
279 284
280 /* 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 */
281 weight = tmp->weight * nrof; 286 weight = tmp->weight * nrof;
282 if (tmp->inv) 287 if (tmp->inv)
283 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 288 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
284 289
285 if (pl->stats.Str <= MAX_STAT)
286 effective_weight_limit = weight_limit[pl->stats.Str]; 290 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
287 else
288 effective_weight_limit = weight_limit[MAX_STAT];
289 291
290 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 292 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
291 { 293 {
292 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.");
293 return; 295 return;
294 } 296 }
295 297
296 if (nrof != tmp_nrof) 298 if (!can_split (pl, tmp, nrof))
297 {
298 object *tmp2 = tmp;
299
300 tmp = get_split_ob (tmp, nrof);
301 if (!tmp)
302 {
303 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
304 return; 299 return;
305 }
306 300
307 /* Tell the client what happened to the rest of objects */ 301 if (QUERY_FLAG (tmp, FLAG_UNPAID))
308 if (pl->contr) 302 {
309 if (tmp2->destroyed ()) 303 tmp->flag.reset (FLAG_UNPAID);
310 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));
311 else 305 tmp->flag.set (FLAG_UNPAID);
312 esrv_update_item (UPD_NROF, pl, tmp2);
313 } 306 }
314 else 307 else
315 { 308 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
316 /* If the object is in a container, send a delete to the client.
317 * - we are moving all the items from the container to elsewhere,
318 * so it needs to be deleted.
319 */
320 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
321 {
322 if (tmp->env && pl->type == PLAYER)
323 esrv_del_item (pl->contr, tmp->count);
324 309
325 tmp->remove (); /* Unlink it */ 310 op->insert (tmp);
326 }
327 }
328
329 if (QUERY_FLAG (tmp, FLAG_UNPAID))
330 sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
331 else
332 sprintf (buf, "You pick up the %s.", query_name (tmp));
333
334 new_draw_info (NDI_UNIQUE, 0, pl, buf);
335
336 tmp = insert_ob_in_ob (tmp, op);
337
338 /* All the stuff below deals with client/server code, and is only
339 * usable by players
340 */
341 if (pl->contr)
342 {
343 esrv_send_item (pl, tmp);
344
345 /* These are needed to update the weight for the container we
346 * are putting the object in.
347 */
348 if (op != pl)
349 {
350 esrv_update_item (UPD_WEIGHT, pl, op);
351 esrv_send_item (pl, pl);
352 }
353
354 /* Update the container the object was in */
355 if (env && env != pl && env != op)
356 esrv_update_item (UPD_WEIGHT, pl, env);
357 }
358} 311}
359 312
360/* 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 */
361void 314void
362pick_up (object *op, object *alt) 315pick_up (object *op, object *alt)
… …
372 if (!can_pick (op, alt)) 325 if (!can_pick (op, alt))
373 { 326 {
374 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);
375 goto leave; 328 goto leave;
376 } 329 }
330
377 tmp = alt; 331 tmp = alt;
378 } 332 }
379 else 333 else
380 { 334 {
381 if (op->below == NULL || !can_pick (op, op->below)) 335 if (op->below == NULL || !can_pick (op, op->below))
… …
390 /* Try to catch it. */ 344 /* Try to catch it. */
391 tmp_map = tmp->map; 345 tmp_map = tmp->map;
392 tmp = stop_item (tmp); 346 tmp = stop_item (tmp);
393 if (tmp == NULL) 347 if (tmp == NULL)
394 goto leave; 348 goto leave;
349
395 need_fix_tmp = 1; 350 need_fix_tmp = 1;
396 if (!can_pick (op, tmp)) 351 if (!can_pick (op, tmp))
397 goto leave; 352 goto leave;
398 353
399 if (op->type == PLAYER) 354 if (op->type == PLAYER)
… …
404 } 359 }
405 else 360 else
406 count = tmp->nrof; 361 count = tmp->nrof;
407 362
408 /* container is open, so use it */ 363 /* container is open, so use it */
364 if (tmp->flag [FLAG_STARTEQUIP])
365 alt = op;
409 if (op->container) 366 else if (op->container)
410 { 367 {
411 alt = op->container; 368 alt = op->container;
412 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 369 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
413 goto leave; 370 goto leave;
414 } 371 }
… …
433 /* here it could be possible to check rent, 390 /* here it could be possible to check rent,
434 * if someone wants to implement it 391 * if someone wants to implement it
435 */ 392 */
436 alt = op; 393 alt = op;
437 } 394 }
395
438#ifdef PICKUP_DEBUG 396#ifdef PICKUP_DEBUG
439 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);
440#endif 398#endif
441 399
442 /* startequip items are not allowed to be put into containers: */ 400 /* startequip items are not allowed to be put into containers: */
… …
492 450
493 /* Makes processing easier */ 451 /* Makes processing easier */
494 if (params && *params == '\0') 452 if (params && *params == '\0')
495 params = 0; 453 params = 0;
496 454
455 int cnt = MAX_ITEM_PER_DROP;
456
497 while (tmp) 457 while (tmp)
498 { 458 {
499 next = tmp->below; 459 next = tmp->below;
500 460
501 if (tmp->invisible) 461 if (tmp->invisible)
… …
507 /* 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
508 * but that probably will make it more difficult to read, and 468 * but that probably will make it more difficult to read, and
509 * not make it any more efficient 469 * not make it any more efficient
510 */ 470 */
511 if (params && item_matched_string (op, tmp, params)) 471 if (params && item_matched_string (op, tmp, params))
472 {
473 if (--cnt < 0) break;
512 pick_up (op, tmp); 474 pick_up (op, tmp);
475 }
513 else if (can_pick (op, tmp) && !params) 476 else if (can_pick (op, tmp) && !params)
514 { 477 {
478 if (--cnt < 0) break;
515 pick_up (op, tmp); 479 pick_up (op, tmp);
516 break; 480 break;
517 } 481 }
518 482
519 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;
520 } 490 }
521 491
522 if (!params && !tmp) 492 if (!params && !tmp)
523 { 493 {
524 for (tmp = op->below; tmp; tmp = tmp->below) 494 for (tmp = op->below; tmp; tmp = tmp->below)
525 if (!tmp->invisible) 495 if (!tmp->invisible)
526 { 496 {
527 char buf[MAX_BUF];
528
529 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);
530 new_draw_info (NDI_UNIQUE, 0, op, buf);
531 break; 498 break;
532 } 499 }
533 500
534 if (!tmp) 501 if (!tmp)
535 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.");
536 } 503 }
537 504
538 return 0; 505 return 0;
539} 506}
540 507
541
542/* 508/*
543 * This function was part of drop, now is own function. 509 * This function was part of drop, now is own function.
544 * Player 'op' tries to put object 'tmp' into sack 'sack', 510 * Player 'op' tries to put object 'tmp' into sack 'sack',
545 * 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 *
546 * Note that the 'sack' in question can now be a transport, 513 * Note that the 'sack' in question can now be a transport,
547 * so this function isn't named very good anymore. 514 * so this function isn't named very good anymore.
548 */ 515 */
549void 516void
550put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 517put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
… …
561 return; 528 return;
562 } 529 }
563 530
564 if (tmp->type == CONTAINER && tmp->inv) 531 if (tmp->type == CONTAINER && tmp->inv)
565 { 532 {
566
567 /* 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
568 * we instead move the contents of that container into the active 534 * we instead move the contents of that container into the active
569 * 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.
570 */ 536 */
571 sack2 = tmp; 537 sack2 = tmp;
… …
574 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 540 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
575 { 541 {
576 tmp = tmp2->below; 542 tmp = tmp2->below;
577 543
578 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)))
579 {
580 put_object_in_sack (op, sack, tmp2, 0); 545 put_object_in_sack (op, sack, tmp2, 0);
581 }
582 else 546 else
583 { 547 {
584 sprintf (buf, "Your %s fills up.", query_name (sack)); 548 sprintf (buf, "Your %s fills up.", query_name (sack));
585 new_draw_info (NDI_UNIQUE, 0, op, buf); 549 new_draw_info (NDI_UNIQUE, 0, op, buf);
586 break; 550 break;
587 } 551 }
588 } 552 }
589 553
590 esrv_update_item (UPD_WEIGHT, op, sack2);
591 return; 554 return;
592 } 555 }
593 556
594 /* Don't worry about this for containers - our caller should have 557 /* Don't worry about this for containers - our caller should have
595 * already checked this. 558 * already checked this.
… …
600 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 563 if (QUERY_FLAG (tmp, FLAG_APPLIED))
601 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 564 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
602 return; 565 return;
603 566
604 /* 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 */
605 if (nrof && tmp->nrof != nrof) 568 if (!can_split (op, tmp, nrof))
606 {
607 object *tmp2 = tmp;
608
609 tmp = get_split_ob (tmp, nrof);
610
611 if (!tmp)
612 {
613 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
614 return; 569 return;
615 }
616 /* Tell a client what happened other objects */
617 if (tmp2->destroyed ())
618 esrv_del_item (op->contr, tmp2->count);
619 else /* this can proably be replaced with an update */
620 esrv_send_item (op, tmp2);
621 }
622 else
623 tmp->remove ();
624 570
625 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));
626 tmp2 = insert_ob_in_ob (tmp, sack); 572 sack->insert (tmp);
627 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
628 /* in object.c */
629
630 /* If an object merged (and thus, different object), we need to
631 * delete the original.
632 */
633 if (tmp2 != tmp)
634 esrv_del_item (op->contr, tmp->count);
635
636 esrv_send_item (op, tmp2);
637
638 /* update the sacks weight */
639 esrv_update_item (UPD_WEIGHT, op, sack);
640} 573}
641 574
642/* 575/*
643 * This function was part of drop, now is own function. 576 * This function was part of drop, now is own function.
644 * 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
… …
646 * This is used when dropping objects onto the floor. 579 * This is used when dropping objects onto the floor.
647 */ 580 */
648void 581void
649drop_object (object *op, object *tmp, uint32 nrof) 582drop_object (object *op, object *tmp, uint32 nrof)
650{ 583{
651 char buf[MAX_BUF];
652 object *floor;
653
654 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 584 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
655 return; 585 return;
656 586
657 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 587 if (QUERY_FLAG (tmp, FLAG_APPLIED))
658 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 588 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
… …
661 //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
662 592
663 /* 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
664 * off 594 * off
665 */ 595 */
666 if (nrof && tmp->nrof != nrof) 596 if (!can_split (op, tmp, nrof))
667 {
668 object *tmp2 = tmp;
669
670 tmp = get_split_ob (tmp, nrof);
671 if (!tmp)
672 {
673 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
674 return;
675 }
676 /* Tell a client what happened rest of objects. tmp2 is now the
677 * original object
678 */
679 if (op->type == PLAYER)
680 {
681 if (tmp2->destroyed ())
682 esrv_del_item (op->contr, tmp2->count);
683 else
684 esrv_send_item (op, tmp2);
685 }
686 }
687 else
688 tmp->remove ();
689
690 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
691 return; 597 return;
692 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
693 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 628 if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
694 { 629 {
695 sprintf (buf, "You drop the %s.", query_name (tmp)); 630 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
696 new_draw_info (NDI_UNIQUE, 0, op, buf); 631 dropper->statusmsg ("The god who lent it to you retrieves it.");
697 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
698 632
699 if (op->type == PLAYER)
700 esrv_del_item (op->contr, tmp->count);
701
702 tmp->destroy (); 633 obj->destroy ();
703 op->update_stats (); 634 dropper->update_stats ();
704 return; 635 return;
705 } 636 }
706 637
707 if (op->type == PLAYER) 638 for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
708 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;
709 643
710 /* Call this before we update the various windows/players. At least 644 if (obj->destroyed () || obj->is_inserted ())
711 * 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:
712 */ 653 */
713 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
714 /* in object.c */
715 654
716 if (op->type == PLAYER) 655 obj->x = dropper->x;
717 { 656 obj->y = dropper->y;
718 /* Need to update the weight for the player */
719 esrv_send_item (op, op);
720 op->contr->ns->floorbox_update ();
721 }
722 657
723 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
724 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
725 return;
726
727 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
728 sell_item (tmp, op);
729
730 tmp->x = op->x;
731 tmp->y = op->y;
732
733 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 658 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
734} 659}
735 660
736void 661void
737drop (object *op, object *tmp) 662drop (object *op, object *tmp)
738{ 663{
… …
747 if (tmp->env && tmp->env->type != PLAYER) 672 if (tmp->env && tmp->env->type != PLAYER)
748 { 673 {
749 /* Just toss the object - probably shouldn't be hanging 674 /* Just toss the object - probably shouldn't be hanging
750 * around anyways 675 * around anyways
751 */ 676 */
752 tmp->remove ();
753 tmp->destroy (); 677 tmp->destroy ();
754 return; 678 return;
755 } 679 }
756 else 680 else
757 { 681 {
758 while (tmp != NULL && tmp->invisible) 682 while (tmp && tmp->invisible)
759 tmp = tmp->below; 683 tmp = tmp->below;
760 } 684 }
761 } 685 }
762 686
763 if (tmp == NULL) 687 if (tmp == NULL)
764 { 688 {
765 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.");
766 return; 690 return;
767 } 691 }
692
768 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 693 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
769 { 694 {
770 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 695 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
771 return; 696 return;
772 } 697 }
698
773 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 699 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
774 { 700 {
775#if 0 701#if 0
776 /* 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. */
777 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.");
… …
801 727
802 if (op->type == PLAYER) 728 if (op->type == PLAYER)
803 op->contr->count = 0; 729 op->contr->count = 0;
804} 730}
805 731
806
807
808/* Command will drop all items that have not been locked */ 732/* Command will drop all items that have not been locked */
809int 733int
810command_dropall (object *op, char *params) 734command_dropall (object *op, char *params)
811{ 735{
812 736
813 object *curinv, *nextinv;
814
815 if (op->inv == NULL) 737 if (op->inv == NULL)
816 { 738 {
817 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 739 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
818 return 0; 740 return 0;
819 } 741 }
820 742
821 curinv = op->inv; 743 object *curinv = op->inv;
744 object *nextinv;
822 745
823 /* 746 /*
824 This is the default. Drops everything not locked or considered 747 This is the default. Drops everything not locked or considered
825 not something that should be dropped. 748 not something that should be dropped.
826 */ 749 */
… …
828 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
829 the drop() routine will do unknown things to it when dropping 752 the drop() routine will do unknown things to it when dropping
830 in a shop. --Tero.Pelander@utu.fi 753 in a shop. --Tero.Pelander@utu.fi
831 */ 754 */
832 755
833 if (params == NULL) 756 int cnt = MAX_ITEM_PER_DROP;
757
758 if (!params)
834 { 759 {
835 while (curinv != NULL) 760 while (curinv)
836 { 761 {
837 nextinv = curinv->below; 762 nextinv = curinv->below;
763
838 while (nextinv && nextinv->type == MONEY) 764 while (nextinv && nextinv->type == MONEY)
839 nextinv = nextinv->below; 765 nextinv = nextinv->below;
766
840 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 767 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
841 curinv->type != FOOD && curinv->type != KEY && 768 curinv->type != FOOD && curinv->type != KEY &&
842 curinv->type != SPECIAL_KEY && curinv->type != GEM && 769 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
843 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 770 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
844 { 771 {
845 drop (op, curinv); 772 drop (op, curinv);
773 if (--cnt <= 0) break;
846 } 774 }
775
847 curinv = nextinv; 776 curinv = nextinv;
848 } 777 }
849 } 778 }
850
851 else if (strcmp (params, "weapons") == 0) 779 else if (strcmp (params, "weapons") == 0)
852 { 780 {
853 while (curinv != NULL) 781 while (curinv)
854 { 782 {
855 nextinv = curinv->below; 783 nextinv = curinv->below;
784
856 while (nextinv && nextinv->type == MONEY) 785 while (nextinv && nextinv->type == MONEY)
857 nextinv = nextinv->below; 786 nextinv = nextinv->below;
787
858 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)))
859 { 789 {
860 drop (op, curinv); 790 drop (op, curinv);
791 if (--cnt <= 0) break;
861 } 792 }
793
862 curinv = nextinv; 794 curinv = nextinv;
863 } 795 }
864 } 796 }
865
866 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 797 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
867 { 798 {
868 while (curinv != NULL) 799 while (curinv)
869 { 800 {
870 nextinv = curinv->below; 801 nextinv = curinv->below;
802
871 while (nextinv && nextinv->type == MONEY) 803 while (nextinv && nextinv->type == MONEY)
872 nextinv = nextinv->below; 804 nextinv = nextinv->below;
805
873 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))
874 { 807 {
875 drop (op, curinv); 808 drop (op, curinv);
809 if (--cnt <= 0) break;
876 } 810 }
811
877 curinv = nextinv; 812 curinv = nextinv;
878 } 813 }
879 } 814 }
880
881 else if (strcmp (params, "misc") == 0) 815 else if (strcmp (params, "misc") == 0)
882 { 816 {
883 while (curinv != NULL) 817 while (curinv)
884 { 818 {
885 nextinv = curinv->below; 819 nextinv = curinv->below;
820
886 while (nextinv && nextinv->type == MONEY) 821 while (nextinv && nextinv->type == MONEY)
887 nextinv = nextinv->below; 822 nextinv = nextinv->below;
823
888 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))
889 { 825 {
890 switch (curinv->type) 826 switch (curinv->type)
891 { 827 {
892 case HORN: 828 case HORN:
… …
910 break; 846 break;
911 default: 847 default:
912 curinv = nextinv; 848 curinv = nextinv;
913 break; 849 break;
914 } 850 }
851
852 if (--cnt <= 0) break;
915 } 853 }
854
916 curinv = nextinv; 855 curinv = nextinv;
917 } 856 }
918 } 857 }
919 858
920 op->contr->ns->floorbox_update (); 859 if (cnt <= 0)
860 op->failmsg ("Only dropped some items, can't drop that many items at once.");
921 861
922/* draw_look(op);*/ 862/* draw_look(op);*/
923 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;
924} 889}
925 890
926/* 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
927 * comma seperated list. 892 * comma seperated list.
928 */ 893 */
929
930int 894int
931command_drop (object *op, char *params) 895command_drop (object *op, char *params)
932{ 896{
933 object *tmp, *next; 897 object *tmp, *next;
934 int did_one = 0; 898 int did_one = 0;
… …
938 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 902 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
939 return 0; 903 return 0;
940 } 904 }
941 else 905 else
942 { 906 {
907 vector<object *> matched_objs;
908
943 for (tmp = op->inv; tmp; tmp = next) 909 for (tmp = op->inv; tmp; tmp = next)
944 { 910 {
945 next = tmp->below; 911 next = tmp->below;
946 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 912 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
947 continue; 913 continue;
914
948 if (item_matched_string (op, tmp, params)) 915 if (item_matched_string (op, tmp, params))
949 { 916 matched_objs.push_back (tmp);
950 drop (op, tmp);
951 did_one = 1;
952 } 917 }
953 } 918
954 if (!did_one) 919 int cnt = MAX_ITEM_PER_DROP;
920
921 if (!drop_vector (op, matched_objs, &cnt))
955 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 922 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
956 } 923
957 if (op->type == PLAYER) 924 if (cnt <= 0)
958 { 925 op->failmsg ("Only dropped some items, can't drop that many items at once.");
959 op->contr->count = 0;
960 op->contr->ns->floorbox_update ();
961 }; 926 }
962 927
963/* draw_look(op);*/
964 return 0; 928 return 0;
965} 929}
966 930
967int 931int
968command_examine (object *op, char *params) 932command_examine (object *op, char *params)
… …
971 { 935 {
972 object *tmp = op->below; 936 object *tmp = op->below;
973 937
974 while (tmp && !tmp->client_visible ()) 938 while (tmp && !tmp->client_visible ())
975 tmp = tmp->below; 939 tmp = tmp->below;
940
976 if (tmp) 941 if (tmp)
977 examine (op, tmp); 942 examine (op, tmp);
978 } 943 }
979 else 944 else
980 { 945 {
981 object *tmp = find_best_object_match (op, params); 946 object *tmp = find_best_object_match (op, params);
982 947
983 if (tmp) 948 if (tmp)
984 examine (op, tmp); 949 examine (op, tmp);
985 else 950 else
986 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));
987 } 952 }
953
988 return 0; 954 return 0;
989} 955}
990 956
991/* op should be a player. 957/* op should be a player.
992 * 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
… …
1039 dynbuf_text buf (512, 512); 1005 dynbuf_text buf (512, 512);
1040 1006
1041 object *mon = head ? head : this; 1007 object *mon = head ? head : this;
1042 1008
1043 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 1009 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1044 buf << "It is an undead force.\n"; 1010 buf << "It is an undead force.\r";
1045 1011
1046 if (mon->level > who->level) 1012 if (mon->level > who->level)
1047 buf << "It is likely more powerful than you.\n"; 1013 buf << "It is likely more powerful than you.\r";
1048 else if (mon->level < who->level) 1014 else if (mon->level < who->level)
1049 buf << "It is likely less powerful than you.\n"; 1015 buf << "It is likely less powerful than you.\r";
1050 else 1016 else
1051 buf << "It is probably as powerful as you.\n"; 1017 buf << "It is probably as powerful as you.\r";
1052 1018
1053 if (mon->attacktype & AT_ACID) 1019 if (mon->attacktype & AT_ACID)
1054 buf << "You seem to smell an acrid odor.\n"; 1020 buf << "You seem to smell an acrid odor.\r";
1055 1021
1056 /* 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
1057 * maxhp field? This seems that it should give more accurate results. 1023 * maxhp field? This seems that it should give more accurate results.
1058 */ 1024 */
1059 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 1025 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1060 { /* From 1-4 */ 1026 { /* From 1-4 */
1061 case 1: 1027 case 1:
1062 buf << "It is in a bad shape.\n"; 1028 buf << "It is in a bad shape.\r";
1063 break; 1029 break;
1064 case 2: 1030 case 2:
1065 buf << "It is hurt.\n"; 1031 buf << "It is hurt.\r";
1066 break; 1032 break;
1067 case 3: 1033 case 3:
1068 buf << "It is somewhat hurt.\n"; 1034 buf << "It is somewhat hurt.\r";
1069 break; 1035 break;
1070 case 4: 1036 case 4:
1071 buf << "It is in excellent shape.\n"; 1037 buf << "It is in excellent shape.\r";
1072 break; 1038 break;
1073 } 1039 }
1074 1040
1075 if (present_in_ob (POISONING, mon)) 1041 if (present_in_ob (POISONING, mon))
1076 buf << "It looks very ill.\n"; 1042 buf << "It looks very ill.\r";
1043
1044 buf << '\n';
1077 1045
1078 return buf; 1046 return buf;
1079} 1047}
1080 1048
1081/* 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. */
… …
1088} 1056}
1089 1057
1090std::string 1058std::string
1091object::long_desc (object *who) 1059object::long_desc (object *who)
1092{ 1060{
1093 std::string buf (query_name (this)); 1061 std::string buf (query_name ());
1094 1062
1095 switch (type) 1063 switch (type)
1096 { 1064 {
1097 case RING: 1065 case RING:
1098 case SKILL: 1066 case SKILL:
… …
1110 case CLOAK: 1078 case CLOAK:
1111 case FOOD: 1079 case FOOD:
1112 case DRINK: 1080 case DRINK:
1113 case FLESH: 1081 case FLESH:
1114 case SKILL_TOOL: 1082 case SKILL_TOOL:
1083 case LAMP:
1115 case POWER_CRYSTAL: 1084 case POWER_CRYSTAL:
1116 { 1085 {
1117 const char *cp = ::describe_item (this, who); 1086 const char *cp = ::describe_item (this, who);
1118 1087
1119 if (*cp) 1088 if (*cp)
… …
1139std::string 1108std::string
1140object::describe (object *who) 1109object::describe (object *who)
1141{ 1110{
1142 dynbuf_text buf (1024, 1024); 1111 dynbuf_text buf (1024, 1024);
1143 1112
1144 buf.printf ("That is: %s.\n", long_desc (who).c_str ()); 1113 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1145 1114
1146 if (custom_name) 1115 if (custom_name)
1147 buf.printf ("You call it %s\n", &custom_name); 1116 buf.printf ("You call it %s.\r", &custom_name);
1148 1117
1149 switch (type) 1118 switch (type)
1150 { 1119 {
1151 case SPELLBOOK: 1120 case SPELLBOOK:
1152 if (flag [FLAG_IDENTIFIED] && inv) 1121 if (flag [FLAG_IDENTIFIED] && inv)
1153 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);
1154 break; 1123 break;
1155 1124
1156 case BOOK: 1125 case BOOK:
1157 if (msg) 1126 if (msg)
1158 buf << "Something is written in it.\n"; 1127 buf << "Something is written in it.\r";
1159 break; 1128 break;
1160 1129
1161 case CONTAINER: 1130 case CONTAINER:
1162 if (race != NULL) 1131 if (race)
1163 { 1132 {
1164 if (weight_limit && stats.Str < 100) 1133 if (weight_limit && stats.Str < 100)
1165 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",
1166 &race, weight_limit / (10.0 * (100 - stats.Str))); 1135 &race, weight_limit / (10.0 * (100 - stats.Str)));
1167 else 1136 else
1168 buf.printf ("It can hold only %s.\n", &race); 1137 buf.printf ("It can hold only %s.\r", &race);
1169 } 1138 }
1170 else if (weight_limit && stats.Str < 100) 1139 else if (weight_limit && stats.Str < 100)
1171 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)));
1172 break; 1141 break;
1173 1142
1174 case WAND: 1143 case WAND:
1175 if (flag [FLAG_IDENTIFIED]) 1144 if (flag [FLAG_IDENTIFIED])
1176 buf.printf ("It has %d charges left.\n", stats.food); 1145 buf.printf ("It has %d charges left.\r", stats.food);
1177 break; 1146 break;
1178 } 1147 }
1179 1148
1180 if (materialname && !msg) 1149 if (materialname && !msg)
1181 buf.printf ("It is made of: %s.\n", &materialname); 1150 buf.printf ("It is made of: %s.\r", &materialname);
1182 1151
1183 if (who) 1152 if (who)
1184 /* Where to wear this item */ 1153 /* Where to wear this item */
1185 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1154 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1186 if (slot[i].info) 1155 if (slot[i].info)
… …
1188 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);
1189 1158
1190 if (slot[i].info < -1 && who->slot[i].info) 1159 if (slot[i].info < -1 && who->slot[i].info)
1191 buf.printf ("(%d)", -slot[i].info); 1160 buf.printf ("(%d)", -slot[i].info);
1192 1161
1193 buf << ".\n"; 1162 buf << ".\r";
1194 } 1163 }
1195 1164
1196 if (weight) 1165 if (weight)
1197 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);
1198 1167
1199 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) 1168 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1200 { 1169 {
1201 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));
1202 1171
1203 if (is_in_shop (who)) 1172 if (is_in_shop (who))
1204 { 1173 {
1205 if (flag [FLAG_UNPAID]) 1174 if (flag [FLAG_UNPAID])
1206 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));
1207 else 1176 else
1208 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");
1209 } 1178 }
1210 } 1179 }
1211 1180
1212 if (flag [FLAG_MONSTER]) 1181 if (flag [FLAG_MONSTER])
1213 buf << describe_monster (who); 1182 buf << describe_monster (who);
1214 1183
1215 /* Is this item buildable? */ 1184 /* Is this item buildable? */
1216 if (flag [FLAG_IS_BUILDABLE]) 1185 if (flag [FLAG_IS_BUILDABLE])
1217 buf << "This is a buildable item.\n"; 1186 buf << "This is a buildable item.\r";
1218 1187
1219 /* 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
1220 * types - especially if the first entry is a match 1189 * types - especially if the first entry is a match
1221 */ 1190 */
1222 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 ())
1223 { 1192 {
1224 /* 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
1225 * out the extra message 1194 * out the extra message
1226 */ 1195 */
1227 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1196 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1228 buf << "The object has a story:\n"; 1197 buf << "The object has a story:\r";
1229 1198
1230 buf << msg << '\n'; 1199 buf << msg << '\n';
1231 } 1200 }
1232 1201
1233 buf << '\n'; 1202 buf << '\n';
… …
1238static void 1207static void
1239display_new_pickup (object *op) 1208display_new_pickup (object *op)
1240{ 1209{
1241 int i = op->contr->mode; 1210 int i = op->contr->mode;
1242 1211
1243 if (!(i & PU_NEWMODE))
1244 return;
1245
1246 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1247 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);
1248 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);
1249 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);
1250 1215
1251 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);
… …
1302 }; 1267 };
1303 1268
1304 if (!params) 1269 if (!params)
1305 { 1270 {
1306 /* if the new mode is used, just print the settings */ 1271 /* if the new mode is used, just print the settings */
1307 if (op->contr->mode & PU_NEWMODE)
1308 {
1309 display_new_pickup (op); 1272 display_new_pickup (op);
1310 return 1;
1311 }
1312 if (1)
1313 LOG (llevDebug, "command_pickup: !params\n");
1314 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1315 return 0; 1273 return 0;
1316 } 1274 }
1317 1275
1318 while (*params == ' ' && *params) 1276 while (*params == ' ' && *params)
1319 params++; 1277 params++;
… …
1325 for (mode = 0; names[mode]; mode++) 1283 for (mode = 0; names[mode]; mode++)
1326 { 1284 {
1327 if (!strcmp (names[mode], params + 1)) 1285 if (!strcmp (names[mode], params + 1))
1328 { 1286 {
1329 i = op->contr->mode; 1287 i = op->contr->mode;
1330 if (!(i & PU_NEWMODE)) 1288
1331 i = PU_NEWMODE;
1332 if (*params == '+') 1289 if (*params == '+')
1333 i = i | modes[mode]; 1290 i = i | modes[mode];
1334 else 1291 else
1335 i = i & ~modes[mode]; 1292 i = i & ~modes[mode];
1293
1336 op->contr->mode = i; 1294 op->contr->mode = i;
1337 display_new_pickup (op); 1295 display_new_pickup (op);
1338 return 1; 1296 return 1;
1339 } 1297 }
1340 } 1298 }
… …
1342 return 1; 1300 return 1;
1343 } 1301 }
1344 1302
1345 if (sscanf (params, "%u", &i) != 1) 1303 if (sscanf (params, "%u", &i) != 1)
1346 { 1304 {
1347 if (1)
1348 LOG (llevDebug, "command_pickup: params==NULL\n");
1349 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.");
1350 return 1; 1306 return 1;
1351 } 1307 }
1352 set_pickup_mode (op, i); 1308
1309 if (i <= PU_RATIO)
1310 i |= op->contr->mode & ~PU_RATIO;
1311
1312 op->contr->mode = i;
1353 1313
1354 return 1; 1314 return 1;
1355}
1356
1357void
1358set_pickup_mode (object *op, int i)
1359{
1360 switch (op->contr->mode = i)
1361 {
1362 case 0:
1363 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1364 break;
1365 case 1:
1366 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1367 break;
1368 case 2:
1369 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1370 break;
1371 case 3:
1372 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1373 break;
1374 case 4:
1375 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1376 break;
1377 case 5:
1378 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1379 break;
1380 case 6:
1381 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1382 break;
1383 case 7:
1384 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1385 break;
1386 }
1387} 1315}
1388 1316
1389int 1317int
1390command_search_items (object *op, char *params) 1318command_search_items (object *op, char *params)
1391{ 1319{
1392 char buf[MAX_BUF]; 1320 char buf[MAX_BUF];
1393 1321
1394 if (settings.search_items == FALSE)
1395 return 1;
1396
1397 if (params == NULL) 1322 if (params == NULL)
1398 { 1323 {
1399 if (op->contr->search_str[0] == '\0') 1324 if (op->contr->search_str[0] == '\0')
1400 { 1325 {
1401 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1326 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1402 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");
1403 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'.");
1404 return 1; 1329 return 1;
1405 } 1330 }
1406 1331
… …
1408 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1333 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1409 op->update_stats (); 1334 op->update_stats ();
1410 return 1; 1335 return 1;
1411 } 1336 }
1412 1337
1413 if ((int) strlen (params) >= MAX_BUF) 1338 if (strlen (params) >= MAX_BUF)
1414 { 1339 {
1415 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1340 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1416 return 1; 1341 return 1;
1417 } 1342 }
1418 1343
1419 strcpy (op->contr->search_str, params); 1344 strcpy (op->contr->search_str, params);
1420 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1345 sprintf (buf, "Now searching for '%s'.", op->contr->search_str);
1421 new_draw_info (NDI_UNIQUE, 0, op, buf); 1346 new_draw_info (NDI_UNIQUE, 0, op, buf);
1422 op->update_stats (); 1347 op->update_stats ();
1348
1423 return 1; 1349 return 1;
1424} 1350}
1425 1351

Diff Legend

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