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.55 by root, Mon May 28 21:28:35 2007 UTC

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

Diff Legend

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