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.25 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.61 by elmex, Mon Nov 26 11:41:02 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */
20 23
21 The author can be reached via e-mail to <crossfire@schmorp.de> 24/*
22
23 Object (handling) commands 25 * Object (handling) commands
24*/ 26 */
25 27
26#include <global.h> 28#include <global.h>
27#include <loader.h> 29#include <loader.h>
28#include <skills.h> 30#include <skills.h>
29#ifndef __CEXTRACT__
30# include <sproto.h> 31#include <sproto.h>
31#endif
32#include <living.h> 32#include <living.h>
33#include <math.h> 33#include <math.h>
34 34
35/* 35/*
36 * Object id parsing functions 36 * Object id parsing functions
… …
56 * only unapply applied, or apply unapplied objects 56 * only unapply applied, or apply unapplied objects
57 **/ 57 **/
58static object * 58static object *
59find_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)
60{ 60{
61 object *tmp, *best = NULL; 61 object *best = 0;
62 int match_val = 0, tmpmatch; 62 int match_val = 0;
63 63
64 for (tmp = pl->inv; tmp; tmp = tmp->below) 64 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
65 { 65 {
66 if (tmp->invisible) 66 if (tmp->invisible)
67 continue; 67 continue;
68
68 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)
69 { 72 {
70 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED))) 73 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED)))
71 continue; 74 continue;
75
72 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) 76 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED)))
73 continue; 77 continue;
78
74 match_val = tmpmatch; 79 match_val = tmpmatch;
75 best = tmp; 80 best = tmp;
76 } 81 }
77 } 82 }
83
78 return best; 84 return best;
79} 85}
80 86
81/** 87/**
82 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL); 88 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL);
83 **/ 89 **/
84object * 90object *
85find_best_object_match (object *pl, const char *params) 91find_best_object_match (object *pl, const char *params)
86{ 92{
87 return find_best_apply_object_match (pl, params, AP_NULL); 93 return find_best_apply_object_match (pl, params, AP_TOGGLE);
88} 94}
89 95
90int 96int
91command_uskill (object *pl, char *params) 97command_uskill (object *pl, char *params)
92{ 98{
93 if (!params) 99 if (!params)
94 { 100 {
95 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: use_skill <skill name>"); 101 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: use_skill <skill name>");
96 return 0; 102 return 0;
97 } 103 }
104
98 return use_skill (pl, params); 105 return use_skill (pl, params);
99} 106}
100 107
101int 108int
102command_rskill (object *pl, char *params) 109command_rskill (object *pl, char *params)
… …
106 if (!params) 113 if (!params)
107 { 114 {
108 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); 115 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
109 return 0; 116 return 0;
110 } 117 }
118
111 skill = find_skill_by_name (pl, params); 119 skill = find_skill_by_name (pl, params);
112 120
113 if (!skill) 121 if (!skill)
114 { 122 {
115 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 123 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);
116 return 0; 124 return 0;
117 } 125 }
118 return change_skill (pl, skill, 0);
119}
120 126
127 pl->change_skill (0);
128 apply_special (pl, skill, AP_APPLY);
129 return 1;
130}
121 131
122/* These functions (command_search, command_disarm) are really just wrappers for 132/* These functions (command_search, command_disarm) are really just wrappers for
123 * things like 'use_skill ...'). In fact, they should really be obsoleted 133 * things like 'use_skill ...'). In fact, they should really be obsoleted
124 * and replaced with those. 134 * and replaced with those.
125 */ 135 */
… …
133command_disarm (object *op, char *params) 143command_disarm (object *op, char *params)
134{ 144{
135 return use_skill (op, skill_names[SK_DISARM_TRAPS]); 145 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
136} 146}
137 147
138
139/* A little special because we do want to pass the full params along 148/* A little special because we do want to pass the full params along
140 * as it includes the object to throw. 149 * as it includes the object to throw.
141 */ 150 */
142int 151int
143command_throw (object *op, char *params) 152command_throw (object *op, char *params)
144{ 153{
145 object *skop;
146
147 skop = find_skill_by_name (op, skill_names[SK_THROWING]); 154 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))
148 if (skop)
149 return do_skill (op, op, skop, op->facing, params); 155 return do_skill (op, op, skop, op->facing, params);
150 else 156 else
151 {
152 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing."); 157 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing.");
153 } 158
154 return 0; 159 return 0;
155} 160}
156
157 161
158int 162int
159command_apply (object *op, char *params) 163command_apply (object *op, char *params)
160{ 164{
161 if (!params) 165 if (!params)
… …
163 player_apply_below (op); 167 player_apply_below (op);
164 return 0; 168 return 0;
165 } 169 }
166 else 170 else
167 { 171 {
168 apply_flag aflag = (apply_flag) 0; 172 apply_flag aflag = (apply_flag)0;
169 object *inv;
170 173
171 while (*params == ' ') 174 while (*params == ' ')
172 params++; 175 params++;
176
173 if (!strncmp (params, "-a ", 3)) 177 if (!strncmp (params, "-a ", 3))
174 { 178 {
175 aflag = AP_APPLY; 179 aflag = AP_APPLY;
176 params += 3; 180 params += 3;
177 } 181 }
182
178 if (!strncmp (params, "-u ", 3)) 183 if (!strncmp (params, "-u ", 3))
179 { 184 {
180 aflag = AP_UNAPPLY; 185 aflag = AP_UNAPPLY;
181 params += 3; 186 params += 3;
182 } 187 }
188
183 while (*params == ' ') 189 while (*params == ' ')
184 params++; 190 params++;
185 191
186 inv = find_best_apply_object_match (op, params, aflag); 192 if (object *inv = find_best_apply_object_match (op, params, aflag))
187 if (inv)
188 {
189 player_apply (op, inv, aflag, 0); 193 player_apply (op, inv, aflag, 0);
190 }
191 else 194 else
192 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params); 195 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params);
193 } 196 }
197
194 return 0; 198 return 0;
195} 199}
196 200
197/* 201/*
198 * Check if an item op can be put into a sack. If pl exists then tell 202 * Check if an item op can be put into a sack. If pl exists then tell
… …
259 /* IF the player is flying & trying to take the item out of a container 263 /* IF the player is flying & trying to take the item out of a container
260 * that is in his inventory, let him. tmp->env points to the container 264 * that is in his inventory, let him. tmp->env points to the container
261 * (sack, luggage, etc), tmp->env->env then points to the player (nested 265 * (sack, luggage, etc), tmp->env->env then points to the player (nested
262 * containers not allowed as of now) 266 * containers not allowed as of now)
263 */ 267 */
264 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && is_player_inv (tmp) != pl) 268 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
265 { 269 {
266 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); 270 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!");
267 return; 271 return;
268 } 272 }
269 273
270 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 274 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
271 return; 275 return;
272
273 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
274 {
275 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!");
276 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
277
278 if (pl->type == PLAYER)
279 esrv_del_item (pl->contr, tmp->count);
280
281 tmp->destroy ();
282 return;
283 }
284 276
285 if (nrof > tmp_nrof || nrof == 0) 277 if (nrof > tmp_nrof || nrof == 0)
286 nrof = tmp_nrof; 278 nrof = tmp_nrof;
287 279
288 /* Figure out how much weight this object will add to the player */ 280 /* Figure out how much weight this object will add to the player */
… …
299 { 291 {
300 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 292 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
301 return; 293 return;
302 } 294 }
303 295
304 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ))
305 SET_FLAG (tmp, FLAG_WAS_WIZ);
306
307 if (nrof != tmp_nrof) 296 if (nrof != tmp_nrof)
308 { 297 {
309 object *tmp2 = tmp; 298 object *tmp2 = tmp;
310 299
311 tmp = get_split_ob (tmp, nrof); 300 tmp = get_split_ob (tmp, nrof);
… …
313 { 302 {
314 new_draw_info (NDI_UNIQUE, 0, pl, errmsg); 303 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
315 return; 304 return;
316 } 305 }
317 306
318 /* Tell a client what happened rest of objects */ 307 /* Tell the client what happened to the rest of objects */
319 if (pl->type == PLAYER) 308 if (pl->contr)
320 {
321 if (tmp2->destroyed ()) 309 if (tmp2->destroyed ())
322 esrv_del_item (pl->contr, tmp2->count); 310 esrv_del_item (pl->contr, tmp2->count);
323 else 311 else
324 esrv_send_item (pl, tmp2); 312 esrv_update_item (UPD_NROF, pl, tmp2);
325 }
326 } 313 }
327 else 314 else
328 { 315 {
329 /* If the object is in a container, send a delete to the client. 316 /* If the object is in a container, send a delete to the client.
330 * - we are moving all the items from the container to elsewhere, 317 * - we are moving all the items from the container to elsewhere,
… …
332 */ 319 */
333 if (!QUERY_FLAG (tmp, FLAG_REMOVED)) 320 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
334 { 321 {
335 if (tmp->env && pl->type == PLAYER) 322 if (tmp->env && pl->type == PLAYER)
336 esrv_del_item (pl->contr, tmp->count); 323 esrv_del_item (pl->contr, tmp->count);
324
337 tmp->remove (); /* Unlink it */ 325 tmp->remove (); /* Unlink it */
338 } 326 }
339 } 327 }
328
340 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 329 if (QUERY_FLAG (tmp, FLAG_UNPAID))
341 (void) sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP)); 330 sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
342 else 331 else
343 (void) sprintf (buf, "You pick up the %s.", query_name (tmp)); 332 sprintf (buf, "You pick up the %s.", query_name (tmp));
333
344 new_draw_info (NDI_UNIQUE, 0, pl, buf); 334 new_draw_info (NDI_UNIQUE, 0, pl, buf);
345 335
346 tmp = insert_ob_in_ob (tmp, op); 336 tmp = insert_ob_in_ob (tmp, op);
347 337
348 /* All the stuff below deals with client/server code, and is only 338 /* All the stuff below deals with client/server code, and is only
349 * usable by players 339 * usable by players
350 */ 340 */
351 if (pl->type != PLAYER) 341 if (pl->contr)
352 return; 342 {
353
354 esrv_send_item (pl, tmp); 343 esrv_send_item (pl, tmp);
344
355 /* These are needed to update the weight for the container we 345 /* These are needed to update the weight for the container we
356 * are putting the object in. 346 * are putting the object in.
357 */ 347 */
358 if (op != pl) 348 if (op != pl)
359 { 349 {
360 esrv_update_item (UPD_WEIGHT, pl, op); 350 esrv_update_item (UPD_WEIGHT, pl, op);
361 esrv_send_item (pl, pl); 351 esrv_send_item (pl, pl);
362 } 352 }
363 353
364 /* Update the container the object was in */ 354 /* Update the container the object was in */
365 if (env && env != pl && env != op) 355 if (env && env != pl && env != op)
366 esrv_update_item (UPD_WEIGHT, pl, env); 356 esrv_update_item (UPD_WEIGHT, pl, env);
357 }
367} 358}
368 359
369/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 360/* modified slightly to allow monsters use this -b.t. 5-31-95 */
370void 361void
371pick_up (object *op, object *alt) 362pick_up (object *op, object *alt)
… …
430 421
431 if (!alt) 422 if (!alt)
432 for (alt = op->inv; alt; alt = alt->below) 423 for (alt = op->inv; alt; alt = alt->below)
433 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count)) 424 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count))
434 break; /* General container comes next */ 425 break; /* General container comes next */
426
435 if (!alt) 427 if (!alt)
436 alt = op; /* No free containers */ 428 alt = op; /* No free containers */
437 } 429 }
438 430
439 if (tmp->env == alt) 431 if (tmp->env == alt)
… …
466 458
467leave: 459leave:
468 if (need_fix_tmp) 460 if (need_fix_tmp)
469 fix_stopped_item (tmp, tmp_map, op); 461 fix_stopped_item (tmp, tmp_map, op);
470} 462}
471
472 463
473/* This takes (picks up) and item. op is the player 464/* This takes (picks up) and item. op is the player
474 * who issued the command. params is a string to 465 * who issued the command. params is a string to
475 * match against the item name. Basically, always 466 * match against the item name. Basically, always
476 * returns zero, but that should be improved. 467 * returns zero, but that should be improved.
… …
491 482
492 if (!tmp) 483 if (!tmp)
493 tmp = op->below; 484 tmp = op->below;
494 } 485 }
495 486
496 if (tmp == NULL) 487 if (!tmp)
497 { 488 {
498 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!"); 489 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!");
499 return 0; 490 return 0;
500 } 491 }
501 492
502 /* Makes processing easier */ 493 /* Makes processing easier */
503 if (params && *params == '\0') 494 if (params && *params == '\0')
504 params = NULL; 495 params = 0;
505 496
506 while (tmp) 497 while (tmp)
507 { 498 {
508 next = tmp->below; 499 next = tmp->below;
509 500
510 if (tmp->invisible) 501 if (tmp->invisible)
511 { 502 {
512 tmp = next; 503 tmp = next;
513 continue; 504 continue;
514 } 505 }
506
515 /* This following two if and else if could be merged into line 507 /* This following two if and else if could be merged into line
516 * but that probably will make it more difficult to read, and 508 * but that probably will make it more difficult to read, and
517 * not make it any more efficient 509 * not make it any more efficient
518 */ 510 */
519 if (params && item_matched_string (op, tmp, params)) 511 if (params && item_matched_string (op, tmp, params))
520 {
521 pick_up (op, tmp); 512 pick_up (op, tmp);
522 }
523 else if (can_pick (op, tmp) && !params) 513 else if (can_pick (op, tmp) && !params)
524 { 514 {
525 pick_up (op, tmp); 515 pick_up (op, tmp);
526 break; 516 break;
527 } 517 }
518
528 tmp = next; 519 tmp = next;
529 /* Might as well just skip over the player immediately -
530 * we know it can't be picked up
531 */
532 if (tmp == op)
533 tmp = tmp->below;
534 } 520 }
521
535 if (!params && !tmp) 522 if (!params && !tmp)
536 { 523 {
537 for (tmp = op->below; tmp != NULL; tmp = tmp->next) 524 for (tmp = op->below; tmp; tmp = tmp->below)
538 if (!tmp->invisible) 525 if (!tmp->invisible)
539 { 526 {
540 char buf[MAX_BUF]; 527 char buf[MAX_BUF];
541 528
542 sprintf (buf, "You can't pick up a %s.", &tmp->name); 529 sprintf (buf, "You can't pick up a %s.", &tmp->name);
543 new_draw_info (NDI_UNIQUE, 0, op, buf); 530 new_draw_info (NDI_UNIQUE, 0, op, buf);
544 break; 531 break;
545 } 532 }
533
546 if (!tmp) 534 if (!tmp)
547 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 535 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
548 } 536 }
537
549 return 0; 538 return 0;
550} 539}
551 540
552 541
553/* 542/*
… …
633 else 622 else
634 tmp->remove (); 623 tmp->remove ();
635 624
636 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 625 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
637 tmp2 = insert_ob_in_ob (tmp, sack); 626 tmp2 = insert_ob_in_ob (tmp, sack);
638 fix_player (op); /* This is overkill, fix_player() is called somewhere */ 627 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
639 /* in object.c */ 628 /* in object.c */
640 629
641 /* If an object merged (and thus, different object), we need to 630 /* If an object merged (and thus, different object), we need to
642 * delete the original. 631 * delete the original.
643 */ 632 */
… …
667 656
668 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 657 if (QUERY_FLAG (tmp, FLAG_APPLIED))
669 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 658 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
670 return; /* can't unapply it */ 659 return; /* can't unapply it */
671 660
661 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
662
672 /* We are only dropping some of the items. We split the current object 663 /* We are only dropping some of the items. We split the current object
673 * off 664 * off
674 */ 665 */
675 if (nrof && tmp->nrof != nrof) 666 if (nrof && tmp->nrof != nrof)
676 { 667 {
… …
702 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 693 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
703 { 694 {
704 sprintf (buf, "You drop the %s.", query_name (tmp)); 695 sprintf (buf, "You drop the %s.", query_name (tmp));
705 new_draw_info (NDI_UNIQUE, 0, op, buf); 696 new_draw_info (NDI_UNIQUE, 0, op, buf);
706 new_draw_info (NDI_UNIQUE, 0, op, "The gods 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
707 if (op->type == PLAYER) 699 if (op->type == PLAYER)
708 esrv_del_item (op->contr, tmp->count); 700 esrv_del_item (op->contr, tmp->count);
701
709 tmp->destroy (); 702 tmp->destroy ();
710 fix_player (op); 703 op->update_stats ();
711 return; 704 return;
712 } 705 }
713
714/* If SAVE_INTERVAL is commented out, we never want to save
715 * the player here.
716 */
717#ifdef SAVE_INTERVAL
718 /* I'm not sure why there is a value check - since the save
719 * is done every SAVE_INTERVAL seconds, why care the value
720 * of what he is dropping?
721 */
722 if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) &&
723 (tmp->nrof ? tmp->value * tmp->nrof : tmp->value > 2000) && (op->contr->last_save_time + SAVE_INTERVAL) <= time (NULL))
724 {
725 save_player (op, 1);
726 op->contr->last_save_time = time (NULL);
727 }
728#endif /* SAVE_INTERVAL */
729 706
730 if (op->type == PLAYER) 707 if (op->type == PLAYER)
731 esrv_del_item (op->contr, tmp->count); 708 esrv_del_item (op->contr, tmp->count);
732 709
733 /* Call this before we update the various windows/players. At least 710 /* Call this before we update the various windows/players. At least
734 * that we, we know the weight is correct. 711 * that we, we know the weight is correct.
735 */ 712 */
736 fix_player (op); /* This is overkill, fix_player() is called somewhere */ 713 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
737 /* in object.c */ 714 /* in object.c */
738 715
739 if (op->type == PLAYER) 716 if (op->type == PLAYER)
740 { 717 {
741 op->contr->socket.update_look = 1;
742 /* Need to update the weight for the player */ 718 /* Need to update the weight for the player */
743 esrv_send_item (op, op); 719 esrv_send_item (op, op);
720 op->contr->ns->floorbox_update ();
744 } 721 }
745 722
746 for (floor = get_map_ob (op->map, op->x, op->y); floor; floor = floor->above) 723 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
747 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) 724 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
748 return; 725 return;
749 726
750 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) 727 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
751 sell_item (tmp, op); 728 sell_item (tmp, op);
… …
800 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 777 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
801#endif 778#endif
802 return; 779 return;
803 } 780 }
804 781
805 if (op->type == PLAYER) 782 if (op->type == PLAYER && op->contr->last_used == tmp)
806 { 783 op->contr->last_used = tmp->below ? tmp->below
807 if (op->contr->last_used == tmp && op->contr->last_used_id == tmp->count) 784 : tmp->above ? tmp->above
808 { 785 : 0;
809 object *n = NULL;
810
811 if (tmp->below != NULL)
812 n = tmp->below;
813 else if (tmp->above != NULL)
814 n = tmp->above;
815 op->contr->last_used = n;
816 if (n != NULL)
817 op->contr->last_used_id = n->count;
818 else
819 op->contr->last_used_id = 0;
820 }
821 };
822 786
823 if (op->container) 787 if (op->container)
824 { 788 {
825 if (op->type == PLAYER) 789 if (op->type == PLAYER)
826 {
827 put_object_in_sack (op, op->container, tmp, op->contr->count); 790 put_object_in_sack (op, op->container, tmp, op->contr->count);
828 }
829 else 791 else
830 {
831 put_object_in_sack (op, op->container, tmp, 0); 792 put_object_in_sack (op, op->container, tmp, 0);
832 };
833 } 793 }
834 else 794 else
835 { 795 {
836 if (op->type == PLAYER) 796 if (op->type == PLAYER)
837 {
838 drop_object (op, tmp, op->contr->count); 797 drop_object (op, tmp, op->contr->count);
839 }
840 else 798 else
841 {
842 drop_object (op, tmp, 0); 799 drop_object (op, tmp, 0);
843 };
844 } 800 }
801
845 if (op->type == PLAYER) 802 if (op->type == PLAYER)
846 op->contr->count = 0; 803 op->contr->count = 0;
847} 804}
848 805
849 806
… …
871 Care must be taken that the next item pointer is not to money as 828 Care must be taken that the next item pointer is not to money as
872 the drop() routine will do unknown things to it when dropping 829 the drop() routine will do unknown things to it when dropping
873 in a shop. --Tero.Pelander@utu.fi 830 in a shop. --Tero.Pelander@utu.fi
874 */ 831 */
875 832
833 int cnt = MAX_ITEM_PER_DROP;
834
876 if (params == NULL) 835 if (params == NULL)
877 { 836 {
878 while (curinv != NULL) 837 while (curinv != NULL)
879 { 838 {
880 nextinv = curinv->below; 839 nextinv = curinv->below;
… …
884 curinv->type != FOOD && curinv->type != KEY && 843 curinv->type != FOOD && curinv->type != KEY &&
885 curinv->type != SPECIAL_KEY && curinv->type != GEM && 844 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
886 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 845 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
887 { 846 {
888 drop (op, curinv); 847 drop (op, curinv);
848 if (--cnt <= 0) break;
889 } 849 }
890 curinv = nextinv; 850 curinv = nextinv;
891 } 851 }
892 } 852 }
893 853
… …
899 while (nextinv && nextinv->type == MONEY) 859 while (nextinv && nextinv->type == MONEY)
900 nextinv = nextinv->below; 860 nextinv = nextinv->below;
901 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 861 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
902 { 862 {
903 drop (op, curinv); 863 drop (op, curinv);
864 if (--cnt <= 0) break;
904 } 865 }
905 curinv = nextinv; 866 curinv = nextinv;
906 } 867 }
907 } 868 }
908 869
… …
914 while (nextinv && nextinv->type == MONEY) 875 while (nextinv && nextinv->type == MONEY)
915 nextinv = nextinv->below; 876 nextinv = nextinv->below;
916 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 877 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
917 { 878 {
918 drop (op, curinv); 879 drop (op, curinv);
880 if (--cnt <= 0) break;
919 } 881 }
920 curinv = nextinv; 882 curinv = nextinv;
921 } 883 }
922 } 884 }
923 885
… …
953 break; 915 break;
954 default: 916 default:
955 curinv = nextinv; 917 curinv = nextinv;
956 break; 918 break;
957 } 919 }
920 if (--cnt <= 0) break;
958 } 921 }
959 curinv = nextinv; 922 curinv = nextinv;
960 } 923 }
961 } 924 }
962 op->contr->socket.update_look = 1; 925
926 if (cnt <= 0)
927 op->failmsg (format (
928 "Droppped only %d items, you can't drop more than that at once.",
929 MAX_ITEM_PER_DROP
930 ));
931
932 op->contr->ns->floorbox_update ();
963 933
964/* draw_look(op);*/ 934/* draw_look(op);*/
965 return 0; 935 return 0;
966} 936}
967 937
… …
980 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 950 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
981 return 0; 951 return 0;
982 } 952 }
983 else 953 else
984 { 954 {
955 int cnt = MAX_ITEM_PER_DROP;
956
985 for (tmp = op->inv; tmp; tmp = next) 957 for (tmp = op->inv; tmp; tmp = next)
986 { 958 {
987 next = tmp->below; 959 next = tmp->below;
988 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 960 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
989 continue; 961 continue;
962
990 if (item_matched_string (op, tmp, params)) 963 if (item_matched_string (op, tmp, params))
991 { 964 {
992 drop (op, tmp); 965 drop (op, tmp);
966 if (--cnt <= 0) break;
993 did_one = 1; 967 did_one = 1;
994 } 968 }
995 } 969 }
970
996 if (!did_one) 971 if (!did_one)
997 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 972 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
973
974 if (cnt <= 0)
975 op->failmsg (format (
976 "Droppped only %d items, you can't drop more than that at once.",
977 MAX_ITEM_PER_DROP
978 ));
998 } 979 }
999 if (op->type == PLAYER) 980 if (op->type == PLAYER)
1000 { 981 {
1001 op->contr->count = 0; 982 op->contr->count = 0;
1002 op->contr->socket.update_look = 1; 983 op->contr->ns->floorbox_update ();
1003 }; 984 };
1004 985
1005/* draw_look(op);*/ 986/* draw_look(op);*/
1006 return 0; 987 return 0;
1007} 988}
… …
1011{ 992{
1012 if (!params) 993 if (!params)
1013 { 994 {
1014 object *tmp = op->below; 995 object *tmp = op->below;
1015 996
1016 while (tmp && !LOOK_OBJ (tmp)) 997 while (tmp && !tmp->client_visible ())
1017 tmp = tmp->below; 998 tmp = tmp->below;
1018 if (tmp) 999 if (tmp)
1019 examine (op, tmp); 1000 examine (op, tmp);
1020 } 1001 }
1021 else 1002 else
… …
1073 } 1054 }
1074 1055
1075 return 0; 1056 return 0;
1076} 1057}
1077 1058
1078 1059std::string
1079/* op should be a player, params is any params. 1060object::describe_monster (object *who)
1080 * If no params given, we print out the currently marked object.
1081 * otherwise, try to find a matching object - try best match first.
1082 */
1083int
1084command_mark (object *op, char *params)
1085{ 1061{
1086 if (!op->contr) 1062 dynbuf_text buf (512, 512);
1087 return 1;
1088 1063
1089 if (!params) 1064 object *mon = head ? head : this;
1090 {
1091 object *mark = find_marked_object (op);
1092 1065
1093 if (!mark) 1066 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1094 new_draw_info (NDI_UNIQUE, 0, op, "You have no marked object."); 1067 buf << "It is an undead force.\n";
1095 else 1068
1096 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is marked.", query_name (mark)); 1069 if (mon->level > who->level)
1097 } 1070 buf << "It is likely more powerful than you.\n";
1071 else if (mon->level < who->level)
1072 buf << "It is likely less powerful than you.\n";
1098 else 1073 else
1099 { 1074 buf << "It is probably as powerful as you.\n";
1100 object *mark1 = find_best_object_match (op, params);
1101 1075
1102 if (!mark1)
1103 {
1104 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params);
1105 return 1;
1106 }
1107 else
1108 {
1109 op->contr->mark = mark1;
1110 new_draw_info_format (NDI_UNIQUE, 0, op, "Marked item %s", query_name (mark1));
1111 return 0;
1112 }
1113 }
1114
1115 return 0; /*shouldnt get here */
1116}
1117
1118
1119/* op is the player
1120 * tmp is the monster being examined.
1121 */
1122void
1123examine_monster (object *op, object *tmp)
1124{
1125 object *mon = tmp->head ? tmp->head : tmp;
1126
1127 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1128 new_draw_info (NDI_UNIQUE, 0, op, "It is an undead force.");
1129 if (mon->level > op->level)
1130 new_draw_info (NDI_UNIQUE, 0, op, "It is likely more powerful than you.");
1131 else if (mon->level < op->level)
1132 new_draw_info (NDI_UNIQUE, 0, op, "It is likely less powerful than you.");
1133 else
1134 new_draw_info (NDI_UNIQUE, 0, op, "It is probably as powerful as you.");
1135 if (mon->attacktype & AT_ACID) 1076 if (mon->attacktype & AT_ACID)
1136 new_draw_info (NDI_UNIQUE, 0, op, "You seem to smell an acrid odor."); 1077 buf << "You seem to smell an acrid odor.\n";
1137 1078
1138 /* Anyone know why this used to use the clone value instead of the 1079 /* Anyone know why this used to use the clone value instead of the
1139 * maxhp field? This seems that it should give more accurate results. 1080 * maxhp field? This seems that it should give more accurate results.
1140 */ 1081 */
1141 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 1082 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1142 { /* From 1-4 */ 1083 { /* From 1-4 */
1143 case 1: 1084 case 1:
1144 new_draw_info (NDI_UNIQUE, 0, op, "It is in a bad shape."); 1085 buf << "It is in a bad shape.\n";
1145 break; 1086 break;
1146 case 2: 1087 case 2:
1147 new_draw_info (NDI_UNIQUE, 0, op, "It is hurt."); 1088 buf << "It is hurt.\n";
1148 break; 1089 break;
1149 case 3: 1090 case 3:
1150 new_draw_info (NDI_UNIQUE, 0, op, "It is somewhat hurt."); 1091 buf << "It is somewhat hurt.\n";
1151 break; 1092 break;
1152 case 4: 1093 case 4:
1153 new_draw_info (NDI_UNIQUE, 0, op, "It is in excellent shape."); 1094 buf << "It is in excellent shape.\n";
1154 break; 1095 break;
1155 } 1096 }
1097
1156 if (present_in_ob (POISONING, mon) != NULL) 1098 if (present_in_ob (POISONING, mon))
1157 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill."); 1099 buf << "It looks very ill.\n";
1158}
1159 1100
1101 return buf;
1102}
1160 1103
1161/* tmp is the object being described, pl is who is examing it. */ 1104/* tmp is the object being described, pl is who is examing it. */
1162char * 1105const char *
1163long_desc (object *tmp, object *pl) 1106long_desc (object *tmp, object *pl)
1164{ 1107{
1165 static char buf[VERY_BIG_BUF]; 1108 static std::string s;
1166 char *cp;
1167 1109
1168 if (tmp == NULL) 1110 return (s = tmp->long_desc (pl)).c_str ();
1169 return ""; 1111}
1170 1112
1171 buf[0] = '\0'; 1113std::string
1114object::long_desc (object *who)
1115{
1116 std::string buf (query_name (this));
1117
1172 switch (tmp->type) 1118 switch (type)
1173 { 1119 {
1174 case RING: 1120 case RING:
1175 case SKILL: 1121 case SKILL:
1176 case WEAPON: 1122 case WEAPON:
1177 case ARMOUR: 1123 case ARMOUR:
… …
1188 case FOOD: 1134 case FOOD:
1189 case DRINK: 1135 case DRINK:
1190 case FLESH: 1136 case FLESH:
1191 case SKILL_TOOL: 1137 case SKILL_TOOL:
1192 case POWER_CRYSTAL: 1138 case POWER_CRYSTAL:
1193 if (*(cp = describe_item (tmp, pl)) != '\0') 1139 {
1140 const char *cp = ::describe_item (this, who);
1141
1142 if (*cp)
1143 {
1144 buf.append (" ");
1145 buf.append (cp);
1146 }
1147 }
1148 }
1149
1150 return buf;
1151}
1152
1153/* op is the player
1154 * tmp is the monster being examined.
1155 */
1156void
1157examine_monster (object *op, object *tmp)
1158{
1159 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1160}
1161
1162std::string
1163object::describe (object *who)
1164{
1165 dynbuf_text buf (1024, 1024);
1166
1167 buf.printf ("That is: %s.\n", long_desc (who).c_str ());
1168
1169 if (custom_name)
1170 buf.printf ("You call it %s\n", &custom_name);
1171
1172 switch (type)
1173 {
1174 case SPELLBOOK:
1175 if (flag [FLAG_IDENTIFIED] && inv)
1176 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1177 break;
1178
1179 case BOOK:
1180 if (msg)
1181 buf << "Something is written in it.\n";
1182 break;
1183
1184 case CONTAINER:
1185 if (race != NULL)
1194 { 1186 {
1187 if (weight_limit && stats.Str < 100)
1188 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1189 &race, weight_limit / (10.0 * (100 - stats.Str)));
1195 int len; 1190 else
1196 1191 buf.printf ("It can hold only %s.\n", &race);
1197 assign (buf, query_name (tmp));
1198 len = strlen (buf);
1199 if (len < VERY_BIG_BUF - 5)
1200 {
1201 /* Since we know the length, we save a few cpu cycles by using
1202 * it instead of calling strcat */
1203 strcpy (buf + len, " ");
1204 len++;
1205 assign (buf + len, cp, VERY_BIG_BUF - len - 1);
1206 }
1207 } 1192 }
1208 }
1209
1210 if (buf[0] == '\0')
1211 assign (buf, query_name (tmp));
1212
1213 return buf;
1214}
1215
1216void
1217examine (object *op, object *tmp)
1218{
1219 char buf[VERY_BIG_BUF];
1220 int i;
1221
1222 if (tmp == NULL || tmp->type == CLOSE_CON)
1223 return;
1224
1225 strcpy (buf, "That is ");
1226 strncat (buf, long_desc (tmp, op), VERY_BIG_BUF - strlen (buf) - 1);
1227 buf[VERY_BIG_BUF - 1] = 0;
1228
1229 new_draw_info (NDI_UNIQUE, 0, op, buf);
1230 buf[0] = '\0';
1231
1232 if (tmp->custom_name)
1233 {
1234 strcpy (buf, "You call it ");
1235 strncat (buf, tmp->custom_name, VERY_BIG_BUF - strlen (buf) - 1);
1236 buf[VERY_BIG_BUF - 1] = 0;
1237 new_draw_info (NDI_UNIQUE, 0, op, buf);
1238 buf[0] = '\0';
1239 }
1240
1241 switch (tmp->type)
1242 {
1243 case SPELLBOOK:
1244 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) && tmp->inv)
1245 {
1246 sprintf (buf, "%s is a %s level %s spell", &tmp->inv->name, get_levelnumber (tmp->inv->level), &tmp->inv->skill);
1247 }
1248 break;
1249
1250 case BOOK:
1251 if (tmp->msg != NULL)
1252 strcpy (buf, "Something is written in it.");
1253 break;
1254
1255 case CONTAINER:
1256 if (tmp->race != NULL)
1257 {
1258 if (tmp->weight_limit && tmp->stats.Str < 100)
1259 sprintf (buf, "It can hold only %s and its weight limit is %.1f kg.",
1260 &tmp->race, tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1261 else
1262 sprintf (buf, "It can hold only %s.", &tmp->race);
1263 }
1264 else if (tmp->weight_limit && tmp->stats.Str < 100) 1193 else if (weight_limit && stats.Str < 100)
1265 sprintf (buf, "Its weight limit is %.1f kg.", tmp->weight_limit / (10.0 * (100 - tmp->stats.Str))); 1194 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1266 break; 1195 break;
1267 1196
1268 case WAND: 1197 case WAND:
1269 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1198 if (flag [FLAG_IDENTIFIED])
1270 sprintf (buf, "It has %d charges left.", tmp->stats.food); 1199 buf.printf ("It has %d charges left.\n", stats.food);
1271 break; 1200 break;
1272 }
1273
1274 if (buf[0] != '\0')
1275 new_draw_info (NDI_UNIQUE, 0, op, buf);
1276
1277 if (tmp->materialname != NULL && !tmp->msg)
1278 { 1201 }
1202
1203 if (materialname && !msg)
1279 sprintf (buf, "It is made of: %s.", &tmp->materialname); 1204 buf.printf ("It is made of: %s.\n", &materialname);
1280 new_draw_info (NDI_UNIQUE, 0, op, buf); 1205
1281 } 1206 if (who)
1282 /* Where to wear this item */ 1207 /* Where to wear this item */
1283 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1208 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1284 { 1209 if (slot[i].info)
1285 if (tmp->body_info[i] < -1) 1210 {
1211 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1212
1213 if (slot[i].info < -1 && who->slot[i].info)
1214 buf.printf ("(%d)", -slot[i].info);
1215
1216 buf << ".\n";
1286 { 1217 }
1287 if (op->body_info[i]) 1218
1288 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]); 1219 if (weight)
1220 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1221
1222 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1223 {
1224 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1225
1226 if (is_in_shop (who))
1227 {
1228 if (flag [FLAG_UNPAID])
1229 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1289 else 1230 else
1290 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1291 }
1292 else if (tmp->body_info[i])
1293 {
1294 if (op->body_info[i])
1295 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].use_name);
1296 else
1297 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1298 }
1299 }
1300
1301 if (tmp->weight)
1302 {
1303 sprintf (buf, tmp->nrof > 1 ? "They weigh %3.3f kg." : "It weighs %3.3f kg.", tmp->weight * (tmp->nrof ? tmp->nrof : 1) / 1000.0);
1304 new_draw_info (NDI_UNIQUE, 0, op, buf);
1305 }
1306
1307 if (tmp->value && !QUERY_FLAG (tmp, FLAG_STARTEQUIP) && !QUERY_FLAG (tmp, FLAG_NO_PICK))
1308 {
1309 sprintf (buf, "You reckon %s worth %s.", tmp->nrof > 1 ? "they are" : "it is", query_cost_string (tmp, op, F_TRUE | F_APPROX));
1310 new_draw_info (NDI_UNIQUE, 0, op, buf);
1311 if (is_in_shop (op))
1312 {
1313 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1314 sprintf (buf, "%s would cost you %s.", tmp->nrof > 1 ? "They" : "It", query_cost_string (tmp, op, F_BUY | F_SHOP));
1315 else
1316 sprintf (buf, "You are offered %s for %s.", query_cost_string (tmp, op, F_SELL + F_SHOP), tmp->nrof > 1 ? "them" : "it"); 1231 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1317 new_draw_info (NDI_UNIQUE, 0, op, buf);
1318 } 1232 }
1319 } 1233 }
1320 1234
1321 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1235 if (flag [FLAG_MONSTER])
1322 examine_monster (op, tmp); 1236 buf << describe_monster (who);
1323 1237
1324 /* Is this item buildable? */ 1238 /* Is this item buildable? */
1325 if (QUERY_FLAG (tmp, FLAG_IS_BUILDABLE)) 1239 if (flag [FLAG_IS_BUILDABLE])
1326 new_draw_info (NDI_UNIQUE, 0, op, "This is a buildable item."); 1240 buf << "This is a buildable item.\n";
1327 1241
1328 /* Does the object have a message? Don't show message for all object 1242 /* Does the object have a message? Don't show message for all object
1329 * types - especially if the first entry is a match 1243 * types - especially if the first entry is a match
1330 */ 1244 */
1331 if (tmp->msg && tmp->type != EXIT && tmp->type != BOOK && tmp->type != CORPSE && !tmp->move_on && strncasecmp (tmp->msg, "@match", 7)) 1245 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && strncasecmp (msg, "@match", 7))
1332 { 1246 {
1333
1334 /* This is just a hack so when identifying the items, we print 1247 /* This is just a hack so when identifying the items, we print
1335 * out the extra message 1248 * out the extra message
1336 */ 1249 */
1337 if (need_identify (tmp) && QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1250 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1338 new_draw_info (NDI_UNIQUE, 0, op, "The object has a story:"); 1251 buf << "The object has a story:\n";
1339 1252
1340 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1253 buf << msg << '\n';
1341 }
1342 new_draw_info (NDI_UNIQUE, 0, op, " "); /* Blank line */
1343}
1344
1345/*
1346 * inventory prints object's inventory. If inv==NULL then print player's
1347 * inventory.
1348 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1349 */
1350void
1351inventory (object *op, object *inv)
1352{
1353 object *tmp;
1354 char *in;
1355 int items = 0, length;
1356
1357 if (inv == NULL && op == NULL)
1358 { 1254 }
1359 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1360 return;
1361 }
1362 tmp = inv ? inv->inv : op->inv;
1363 1255
1364 while (tmp) 1256 buf << '\n';
1365 { 1257
1366 if ((!tmp->invisible && 1258 return std::string (buf.linearise (), buf.size ());
1367 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1368 items++;
1369 tmp = tmp->below;
1370 }
1371 if (inv == NULL)
1372 { /* player's inventory */
1373 if (items == 0)
1374 {
1375 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
1376 return;
1377 }
1378 else
1379 {
1380 length = 28;
1381 in = "";
1382 if (op)
1383 clear_win_info (op);
1384 new_draw_info (NDI_UNIQUE, 0, op, "Inventory:");
1385 }
1386 }
1387 else
1388 {
1389 if (items == 0)
1390 return;
1391 else
1392 {
1393 length = 28;
1394 in = " ";
1395 }
1396 }
1397 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1398 {
1399 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1400 continue;
1401 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1402 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1403 query_name (tmp), tmp->count, query_weight (tmp));
1404 else
1405 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1406 }
1407 if (!inv && op)
1408 {
1409 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1410 }
1411} 1259}
1412 1260
1413static void 1261static void
1414display_new_pickup (object *op) 1262display_new_pickup (object *op)
1415{ 1263{
… …
1576 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1424 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");
1577 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all"); 1425 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1578 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'."); 1426 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1579 return 1; 1427 return 1;
1580 } 1428 }
1429
1581 op->contr->search_str[0] = '\0'; 1430 op->contr->search_str[0] = '\0';
1582 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1431 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1583 fix_player (op); 1432 op->update_stats ();
1584 return 1; 1433 return 1;
1585 } 1434 }
1435
1586 if ((int) strlen (params) >= MAX_BUF) 1436 if ((int) strlen (params) >= MAX_BUF)
1587 { 1437 {
1588 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1438 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1589 return 1; 1439 return 1;
1590 } 1440 }
1441
1591 strcpy (op->contr->search_str, params); 1442 strcpy (op->contr->search_str, params);
1592 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1443 sprintf (buf, "Searching for '%s'.", op->contr->search_str);
1593 new_draw_info (NDI_UNIQUE, 0, op, buf); 1444 new_draw_info (NDI_UNIQUE, 0, op, buf);
1594 fix_player (op); 1445 op->update_stats ();
1595 return 1; 1446 return 1;
1596} 1447}
1597 1448

Diff Legend

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