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.51 by root, Sat May 12 16:06:42 2007 UTC vs.
Revision 1.89 by elmex, Mon Jan 12 00:17:23 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines