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.64 by root, Sun Apr 20 00:44:13 2008 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
… …
246 * pick up (0 means all of them) 250 * pick up (0 means all of them)
247 */ 251 */
248static void 252static void
249pick_up_object (object *pl, object *op, object *tmp, int nrof) 253pick_up_object (object *pl, object *op, object *tmp, int nrof)
250{ 254{
251 /* buf needs to be big (more than 256 chars) because you can get
252 * very long item names.
253 */
254 char buf[HUGE_BUF];
255 object *env = tmp->env; 255 object *env = tmp->env;
256 uint32 weight, effective_weight_limit; 256 uint32 weight, effective_weight_limit;
257 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 257 int tmp_nrof = tmp->nrof ? tmp->nrof : 1;
258 258
259 /* IF the player is flying & trying to take the item out of a container 259 /* 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 260 * 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 261 * (sack, luggage, etc), tmp->env->env then points to the player (nested
262 * containers not allowed as of now) 262 * containers not allowed as of now)
263 */ 263 */
264 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && is_player_inv (tmp) != pl) 264 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
265 { 265 {
266 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); 266 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!");
267 return; 267 return;
268 } 268 }
269 269
270 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 270 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
271 return; 271 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 272
285 if (nrof > tmp_nrof || nrof == 0) 273 if (nrof > tmp_nrof || nrof == 0)
286 nrof = tmp_nrof; 274 nrof = tmp_nrof;
287 275
288 /* Figure out how much weight this object will add to the player */ 276 /* Figure out how much weight this object will add to the player */
289 weight = tmp->weight * nrof; 277 weight = tmp->weight * nrof;
290 if (tmp->inv) 278 if (tmp->inv)
291 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 279 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
292 280
293 if (pl->stats.Str <= MAX_STAT)
294 effective_weight_limit = weight_limit[pl->stats.Str]; 281 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
295 else
296 effective_weight_limit = weight_limit[MAX_STAT];
297 282
298 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 283 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
299 { 284 {
300 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 285 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
301 return; 286 return;
302 } 287 }
303 288
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) 289 if (nrof != tmp_nrof)
308 { 290 {
309 object *tmp2 = tmp; 291 object *tmp2 = tmp;
310 292
311 tmp = get_split_ob (tmp, nrof); 293 tmp = get_split_ob (tmp, nrof);
… …
313 { 295 {
314 new_draw_info (NDI_UNIQUE, 0, pl, errmsg); 296 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
315 return; 297 return;
316 } 298 }
317 299
318 /* Tell a client what happened rest of objects */ 300 /* Tell the client what happened to the rest of objects */
319 if (pl->type == PLAYER) 301 if (pl->contr)
320 {
321 if (tmp2->destroyed ()) 302 if (tmp2->destroyed ())
322 esrv_del_item (pl->contr, tmp2->count); 303 esrv_del_item (pl->contr, tmp2->count);
323 else 304 else
324 esrv_send_item (pl, tmp2); 305 esrv_update_item (UPD_NROF, pl, tmp2);
325 }
326 } 306 }
327 else 307 else
328 { 308 {
329 /* If the object is in a container, send a delete to the client. 309 /* 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, 310 * - we are moving all the items from the container to elsewhere,
… …
332 */ 312 */
333 if (!QUERY_FLAG (tmp, FLAG_REMOVED)) 313 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
334 { 314 {
335 if (tmp->env && pl->type == PLAYER) 315 if (tmp->env && pl->type == PLAYER)
336 esrv_del_item (pl->contr, tmp->count); 316 esrv_del_item (pl->contr, tmp->count);
317
337 tmp->remove (); /* Unlink it */ 318 tmp->remove (); /* Unlink it */
338 } 319 }
339 } 320 }
321
340 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 322 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)); 323 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));
342 else 324 else
343 (void) sprintf (buf, "You pick up the %s.", query_name (tmp)); 325 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
344 new_draw_info (NDI_UNIQUE, 0, pl, buf);
345 326
346 tmp = insert_ob_in_ob (tmp, op); 327 tmp = insert_ob_in_ob (tmp, op);
347 328
348 /* All the stuff below deals with client/server code, and is only 329 /* All the stuff below deals with client/server code, and is only
349 * usable by players 330 * usable by players
350 */ 331 */
351 if (pl->type != PLAYER) 332 if (pl->contr)
352 return; 333 {
353
354 esrv_send_item (pl, tmp); 334 esrv_send_item (pl, tmp);
335
355 /* These are needed to update the weight for the container we 336 /* These are needed to update the weight for the container we
356 * are putting the object in. 337 * are putting the object in.
357 */ 338 */
358 if (op != pl) 339 if (op != pl)
359 { 340 {
360 esrv_update_item (UPD_WEIGHT, pl, op); 341 esrv_update_item (UPD_WEIGHT, pl, op);
361 esrv_send_item (pl, pl); 342 esrv_send_item (pl, pl);
362 } 343 }
363 344
364 /* Update the container the object was in */ 345 /* Update the container the object was in */
365 if (env && env != pl && env != op) 346 if (env && env != pl && env != op)
366 esrv_update_item (UPD_WEIGHT, pl, env); 347 esrv_update_item (UPD_WEIGHT, pl, env);
348 }
367} 349}
368 350
369/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 351/* modified slightly to allow monsters use this -b.t. 5-31-95 */
370void 352void
371pick_up (object *op, object *alt) 353pick_up (object *op, object *alt)
… …
381 if (!can_pick (op, alt)) 363 if (!can_pick (op, alt))
382 { 364 {
383 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name); 365 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
384 goto leave; 366 goto leave;
385 } 367 }
368
386 tmp = alt; 369 tmp = alt;
387 } 370 }
388 else 371 else
389 { 372 {
390 if (op->below == NULL || !can_pick (op, op->below)) 373 if (op->below == NULL || !can_pick (op, op->below))
… …
399 /* Try to catch it. */ 382 /* Try to catch it. */
400 tmp_map = tmp->map; 383 tmp_map = tmp->map;
401 tmp = stop_item (tmp); 384 tmp = stop_item (tmp);
402 if (tmp == NULL) 385 if (tmp == NULL)
403 goto leave; 386 goto leave;
387
404 need_fix_tmp = 1; 388 need_fix_tmp = 1;
405 if (!can_pick (op, tmp)) 389 if (!can_pick (op, tmp))
406 goto leave; 390 goto leave;
407 391
408 if (op->type == PLAYER) 392 if (op->type == PLAYER)
… …
413 } 397 }
414 else 398 else
415 count = tmp->nrof; 399 count = tmp->nrof;
416 400
417 /* container is open, so use it */ 401 /* container is open, so use it */
402 if (tmp->flag [FLAG_STARTEQUIP])
403 alt = op;
418 if (op->container) 404 else if (op->container)
419 { 405 {
420 alt = op->container; 406 alt = op->container;
421 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 407 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
422 goto leave; 408 goto leave;
423 } 409 }
… …
430 416
431 if (!alt) 417 if (!alt)
432 for (alt = op->inv; alt; alt = alt->below) 418 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)) 419 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count))
434 break; /* General container comes next */ 420 break; /* General container comes next */
421
435 if (!alt) 422 if (!alt)
436 alt = op; /* No free containers */ 423 alt = op; /* No free containers */
437 } 424 }
438 425
439 if (tmp->env == alt) 426 if (tmp->env == alt)
… …
441 /* here it could be possible to check rent, 428 /* here it could be possible to check rent,
442 * if someone wants to implement it 429 * if someone wants to implement it
443 */ 430 */
444 alt = op; 431 alt = op;
445 } 432 }
433
446#ifdef PICKUP_DEBUG 434#ifdef PICKUP_DEBUG
447 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); 435 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
448#endif 436#endif
449 437
450 /* startequip items are not allowed to be put into containers: */ 438 /* startequip items are not allowed to be put into containers: */
… …
466 454
467leave: 455leave:
468 if (need_fix_tmp) 456 if (need_fix_tmp)
469 fix_stopped_item (tmp, tmp_map, op); 457 fix_stopped_item (tmp, tmp_map, op);
470} 458}
471
472 459
473/* This takes (picks up) and item. op is the player 460/* This takes (picks up) and item. op is the player
474 * who issued the command. params is a string to 461 * who issued the command. params is a string to
475 * match against the item name. Basically, always 462 * match against the item name. Basically, always
476 * returns zero, but that should be improved. 463 * returns zero, but that should be improved.
… …
491 478
492 if (!tmp) 479 if (!tmp)
493 tmp = op->below; 480 tmp = op->below;
494 } 481 }
495 482
496 if (tmp == NULL) 483 if (!tmp)
497 { 484 {
498 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!"); 485 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!");
499 return 0; 486 return 0;
500 } 487 }
501 488
502 /* Makes processing easier */ 489 /* Makes processing easier */
503 if (params && *params == '\0') 490 if (params && *params == '\0')
504 params = NULL; 491 params = 0;
492
493 int cnt = MAX_ITEM_PER_DROP;
505 494
506 while (tmp) 495 while (tmp)
507 { 496 {
508 next = tmp->below; 497 next = tmp->below;
509 498
510 if (tmp->invisible) 499 if (tmp->invisible)
511 { 500 {
512 tmp = next; 501 tmp = next;
513 continue; 502 continue;
514 } 503 }
504
515 /* This following two if and else if could be merged into line 505 /* This following two if and else if could be merged into line
516 * but that probably will make it more difficult to read, and 506 * but that probably will make it more difficult to read, and
517 * not make it any more efficient 507 * not make it any more efficient
518 */ 508 */
519 if (params && item_matched_string (op, tmp, params)) 509 if (params && item_matched_string (op, tmp, params))
520 { 510 {
521 pick_up (op, tmp); 511 pick_up (op, tmp);
512 if (--cnt <= 0) break;
522 } 513 }
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 - 521 }
530 * we know it can't be picked up 522
531 */ 523 if (cnt <= 0)
532 if (tmp == op)
533 tmp = tmp->below;
534 } 524 {
525 op->failmsg ("Couldn't pick up so many items at once.");
526 return 0;
527 }
528
535 if (!params && !tmp) 529 if (!params && !tmp)
536 { 530 {
537 for (tmp = op->below; tmp != NULL; tmp = tmp->next) 531 for (tmp = op->below; tmp; tmp = tmp->below)
538 if (!tmp->invisible) 532 if (!tmp->invisible)
539 { 533 {
540 char buf[MAX_BUF];
541
542 sprintf (buf, "You can't pick up a %s.", &tmp->name); 534 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up a %s.", &tmp->name);
543 new_draw_info (NDI_UNIQUE, 0, op, buf);
544 break; 535 break;
545 } 536 }
537
546 if (!tmp) 538 if (!tmp)
547 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 539 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
548 } 540 }
541
549 return 0; 542 return 0;
550} 543}
551 544
552 545
553/* 546/*
… …
633 else 626 else
634 tmp->remove (); 627 tmp->remove ();
635 628
636 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 629 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); 630 tmp2 = insert_ob_in_ob (tmp, sack);
638 fix_player (op); /* This is overkill, fix_player() is called somewhere */ 631
639 /* in object.c */ 632 // elmex: 2007-11-26: removed update_stats and replaced
633 // it by update_after_inventory_change () in the caller
634 // of this function
640 635
641 /* If an object merged (and thus, different object), we need to 636 /* If an object merged (and thus, different object), we need to
642 * delete the original. 637 * delete the original.
643 */ 638 */
644 if (tmp2 != tmp) 639 if (tmp2 != tmp)
… …
657 * This is used when dropping objects onto the floor. 652 * This is used when dropping objects onto the floor.
658 */ 653 */
659void 654void
660drop_object (object *op, object *tmp, uint32 nrof) 655drop_object (object *op, object *tmp, uint32 nrof)
661{ 656{
662 char buf[MAX_BUF];
663 object *floor; 657 object *floor;
664 658
665 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 659 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
666 return; 660 return;
667 661
668 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 662 if (QUERY_FLAG (tmp, FLAG_APPLIED))
669 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 663 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
670 return; /* can't unapply it */ 664 return; /* can't unapply it */
665
666 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
671 667
672 /* We are only dropping some of the items. We split the current object 668 /* We are only dropping some of the items. We split the current object
673 * off 669 * off
674 */ 670 */
675 if (nrof && tmp->nrof != nrof) 671 if (nrof && tmp->nrof != nrof)
… …
699 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) 695 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
700 return; 696 return;
701 697
702 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 698 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
703 { 699 {
704 sprintf (buf, "You drop the %s.", query_name (tmp)); 700 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
705 new_draw_info (NDI_UNIQUE, 0, op, buf); 701 op->statusmsg ("The gods who lent it to you retrieves it.");
706 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it."); 702
707 if (op->type == PLAYER) 703 if (op->type == PLAYER)
708 esrv_del_item (op->contr, tmp->count); 704 esrv_del_item (op->contr, tmp->count);
705
709 tmp->destroy (); 706 tmp->destroy ();
710 fix_player (op); 707 op->update_stats ();
711 return; 708 return;
712 } 709 }
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 710
730 if (op->type == PLAYER) 711 if (op->type == PLAYER)
731 esrv_del_item (op->contr, tmp->count); 712 esrv_del_item (op->contr, tmp->count);
732 713
733 /* Call this before we update the various windows/players. At least 714 /* Call this before we update the various windows/players. At least
734 * that we, we know the weight is correct. 715 * that we, we know the weight is correct.
735 */ 716 */
736 fix_player (op); /* This is overkill, fix_player() is called somewhere */ 717 // 2007-11-26: moved op->update_stats away and calling it later after
737 /* in object.c */ 718 // all items of a drop command have been processed.
738 719
720 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
721 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
722 return;
723
724 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
725 sell_item (tmp, op);
726
727 tmp->x = op->x;
728 tmp->y = op->y;
729
730 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
731}
732
733void update_after_inventory_change (object *op)
734{
735 /* Call this before we update the various windows/players. At least
736 * that we, we know the weight is correct.
737 */
738 op->update_stats ();
739
740 // elmex: kept this for now, i have no idea what happens when i remove it:
739 if (op->type == PLAYER) 741 if (op->type == PLAYER)
740 { 742 {
741 op->contr->socket.update_look = 1;
742 /* Need to update the weight for the player */ 743 /* Need to update the weight for the player */
743 esrv_send_item (op, op); 744 esrv_send_item (op, op);
745 op->contr->ns->floorbox_update ();
744 } 746 }
745
746 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)))
748 return;
749
750 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
751 sell_item (tmp, op);
752
753 tmp->x = op->x;
754 tmp->y = op->y;
755
756 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
757} 747}
758 748
759void 749void
760drop (object *op, object *tmp) 750drop (object *op, object *tmp)
761{ 751{
… …
800 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 790 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
801#endif 791#endif
802 return; 792 return;
803 } 793 }
804 794
805 if (op->type == PLAYER) 795 if (op->type == PLAYER && op->contr->last_used == tmp)
806 { 796 op->contr->last_used = tmp->below ? tmp->below
807 if (op->contr->last_used == tmp && op->contr->last_used_id == tmp->count) 797 : tmp->above ? tmp->above
808 { 798 : 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 799
823 if (op->container) 800 if (op->container)
824 { 801 {
825 if (op->type == PLAYER) 802 if (op->type == PLAYER)
826 {
827 put_object_in_sack (op, op->container, tmp, op->contr->count); 803 put_object_in_sack (op, op->container, tmp, op->contr->count);
828 }
829 else 804 else
830 {
831 put_object_in_sack (op, op->container, tmp, 0); 805 put_object_in_sack (op, op->container, tmp, 0);
832 };
833 } 806 }
834 else 807 else
835 { 808 {
836 if (op->type == PLAYER) 809 if (op->type == PLAYER)
837 {
838 drop_object (op, tmp, op->contr->count); 810 drop_object (op, tmp, op->contr->count);
839 }
840 else 811 else
841 {
842 drop_object (op, tmp, 0); 812 drop_object (op, tmp, 0);
843 };
844 } 813 }
814
845 if (op->type == PLAYER) 815 if (op->type == PLAYER)
846 op->contr->count = 0; 816 op->contr->count = 0;
847} 817}
848 818
849 819
… …
871 Care must be taken that the next item pointer is not to money as 841 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 842 the drop() routine will do unknown things to it when dropping
873 in a shop. --Tero.Pelander@utu.fi 843 in a shop. --Tero.Pelander@utu.fi
874 */ 844 */
875 845
846 int cnt = MAX_ITEM_PER_DROP;
847
876 if (params == NULL) 848 if (params == NULL)
877 { 849 {
878 while (curinv != NULL) 850 while (curinv != NULL)
879 { 851 {
880 nextinv = curinv->below; 852 nextinv = curinv->below;
… …
884 curinv->type != FOOD && curinv->type != KEY && 856 curinv->type != FOOD && curinv->type != KEY &&
885 curinv->type != SPECIAL_KEY && curinv->type != GEM && 857 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
886 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 858 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
887 { 859 {
888 drop (op, curinv); 860 drop (op, curinv);
861 if (--cnt <= 0) break;
889 } 862 }
890 curinv = nextinv; 863 curinv = nextinv;
891 } 864 }
892 } 865 }
893 866
… …
899 while (nextinv && nextinv->type == MONEY) 872 while (nextinv && nextinv->type == MONEY)
900 nextinv = nextinv->below; 873 nextinv = nextinv->below;
901 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 874 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
902 { 875 {
903 drop (op, curinv); 876 drop (op, curinv);
877 if (--cnt <= 0) break;
904 } 878 }
905 curinv = nextinv; 879 curinv = nextinv;
906 } 880 }
907 } 881 }
908 882
… …
914 while (nextinv && nextinv->type == MONEY) 888 while (nextinv && nextinv->type == MONEY)
915 nextinv = nextinv->below; 889 nextinv = nextinv->below;
916 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 890 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
917 { 891 {
918 drop (op, curinv); 892 drop (op, curinv);
893 if (--cnt <= 0) break;
919 } 894 }
920 curinv = nextinv; 895 curinv = nextinv;
921 } 896 }
922 } 897 }
923 898
… …
953 break; 928 break;
954 default: 929 default:
955 curinv = nextinv; 930 curinv = nextinv;
956 break; 931 break;
957 } 932 }
933 if (--cnt <= 0) break;
958 } 934 }
959 curinv = nextinv; 935 curinv = nextinv;
960 } 936 }
961 } 937 }
962 op->contr->socket.update_look = 1; 938
939 if (cnt <= 0)
940 op->failmsg ("Only dropped some items, can't drop that many items at once.");
941
942 update_after_inventory_change (op);
963 943
964/* draw_look(op);*/ 944/* draw_look(op);*/
965 return 0; 945 return 0;
966} 946}
967 947
… …
980 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 960 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
981 return 0; 961 return 0;
982 } 962 }
983 else 963 else
984 { 964 {
965 int cnt = MAX_ITEM_PER_DROP;
966
985 for (tmp = op->inv; tmp; tmp = next) 967 for (tmp = op->inv; tmp; tmp = next)
986 { 968 {
987 next = tmp->below; 969 next = tmp->below;
988 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 970 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
989 continue; 971 continue;
972
990 if (item_matched_string (op, tmp, params)) 973 if (item_matched_string (op, tmp, params))
991 { 974 {
992 drop (op, tmp); 975 drop (op, tmp);
976 if (--cnt <= 0) break;
993 did_one = 1; 977 did_one = 1;
994 } 978 }
995 } 979 }
980
996 if (!did_one) 981 if (!did_one)
997 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 982 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
998 } 983
999 if (op->type == PLAYER) 984 if (cnt <= 0)
1000 { 985 op->failmsg ("Only dropped some items, can't drop that many items at once.");
1001 op->contr->count = 0; 986
1002 op->contr->socket.update_look = 1; 987 update_after_inventory_change (op);
1003 }; 988 }
1004 989
1005/* draw_look(op);*/
1006 return 0; 990 return 0;
1007} 991}
1008 992
1009int 993int
1010command_examine (object *op, char *params) 994command_examine (object *op, char *params)
1011{ 995{
1012 if (!params) 996 if (!params)
1013 { 997 {
1014 object *tmp = op->below; 998 object *tmp = op->below;
1015 999
1016 while (tmp && !LOOK_OBJ (tmp)) 1000 while (tmp && !tmp->client_visible ())
1017 tmp = tmp->below; 1001 tmp = tmp->below;
1018 if (tmp) 1002 if (tmp)
1019 examine (op, tmp); 1003 examine (op, tmp);
1020 } 1004 }
1021 else 1005 else
… …
1073 } 1057 }
1074 1058
1075 return 0; 1059 return 0;
1076} 1060}
1077 1061
1078 1062std::string
1079/* op should be a player, params is any params. 1063object::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{ 1064{
1086 if (!op->contr) 1065 dynbuf_text buf (512, 512);
1087 return 1;
1088 1066
1089 if (!params) 1067 object *mon = head ? head : this;
1090 {
1091 object *mark = find_marked_object (op);
1092 1068
1093 if (!mark) 1069 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1094 new_draw_info (NDI_UNIQUE, 0, op, "You have no marked object."); 1070 buf << "It is an undead force.\n";
1095 else 1071
1096 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is marked.", query_name (mark)); 1072 if (mon->level > who->level)
1097 } 1073 buf << "It is likely more powerful than you.\n";
1074 else if (mon->level < who->level)
1075 buf << "It is likely less powerful than you.\n";
1098 else 1076 else
1099 { 1077 buf << "It is probably as powerful as you.\n";
1100 object *mark1 = find_best_object_match (op, params);
1101 1078
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) 1079 if (mon->attacktype & AT_ACID)
1136 new_draw_info (NDI_UNIQUE, 0, op, "You seem to smell an acrid odor."); 1080 buf << "You seem to smell an acrid odor.\n";
1137 1081
1138 /* Anyone know why this used to use the clone value instead of the 1082 /* 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. 1083 * maxhp field? This seems that it should give more accurate results.
1140 */ 1084 */
1141 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 1085 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1142 { /* From 1-4 */ 1086 { /* From 1-4 */
1143 case 1: 1087 case 1:
1144 new_draw_info (NDI_UNIQUE, 0, op, "It is in a bad shape."); 1088 buf << "It is in a bad shape.\n";
1145 break; 1089 break;
1146 case 2: 1090 case 2:
1147 new_draw_info (NDI_UNIQUE, 0, op, "It is hurt."); 1091 buf << "It is hurt.\n";
1148 break; 1092 break;
1149 case 3: 1093 case 3:
1150 new_draw_info (NDI_UNIQUE, 0, op, "It is somewhat hurt."); 1094 buf << "It is somewhat hurt.\n";
1151 break; 1095 break;
1152 case 4: 1096 case 4:
1153 new_draw_info (NDI_UNIQUE, 0, op, "It is in excellent shape."); 1097 buf << "It is in excellent shape.\n";
1154 break; 1098 break;
1155 } 1099 }
1100
1156 if (present_in_ob (POISONING, mon) != NULL) 1101 if (present_in_ob (POISONING, mon))
1157 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill."); 1102 buf << "It looks very ill.\n";
1158}
1159 1103
1104 return buf;
1105}
1160 1106
1161/* tmp is the object being described, pl is who is examing it. */ 1107/* tmp is the object being described, pl is who is examing it. */
1162char * 1108const char *
1163long_desc (object *tmp, object *pl) 1109long_desc (object *tmp, object *pl)
1164{ 1110{
1165 static char buf[VERY_BIG_BUF]; 1111 static std::string s;
1166 char *cp;
1167 1112
1168 if (tmp == NULL) 1113 return (s = tmp->long_desc (pl)).c_str ();
1169 return ""; 1114}
1170 1115
1171 buf[0] = '\0'; 1116std::string
1117object::long_desc (object *who)
1118{
1119 std::string buf (query_name (this));
1120
1172 switch (tmp->type) 1121 switch (type)
1173 { 1122 {
1174 case RING: 1123 case RING:
1175 case SKILL: 1124 case SKILL:
1176 case WEAPON: 1125 case WEAPON:
1177 case ARMOUR: 1126 case ARMOUR:
… …
1188 case FOOD: 1137 case FOOD:
1189 case DRINK: 1138 case DRINK:
1190 case FLESH: 1139 case FLESH:
1191 case SKILL_TOOL: 1140 case SKILL_TOOL:
1192 case POWER_CRYSTAL: 1141 case POWER_CRYSTAL:
1193 if (*(cp = describe_item (tmp, pl)) != '\0') 1142 {
1143 const char *cp = ::describe_item (this, who);
1144
1145 if (*cp)
1146 {
1147 buf.append (" ");
1148 buf.append (cp);
1149 }
1150 }
1151 }
1152
1153 return buf;
1154}
1155
1156/* op is the player
1157 * tmp is the monster being examined.
1158 */
1159void
1160examine_monster (object *op, object *tmp)
1161{
1162 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1163}
1164
1165std::string
1166object::describe (object *who)
1167{
1168 dynbuf_text buf (1024, 1024);
1169
1170 buf.printf ("That is: %s.\n", long_desc (who).c_str ());
1171
1172 if (custom_name)
1173 buf.printf ("You call it %s\n", &custom_name);
1174
1175 switch (type)
1176 {
1177 case SPELLBOOK:
1178 if (flag [FLAG_IDENTIFIED] && inv)
1179 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1180 break;
1181
1182 case BOOK:
1183 if (msg)
1184 buf << "Something is written in it.\n";
1185 break;
1186
1187 case CONTAINER:
1188 if (race != NULL)
1194 { 1189 {
1190 if (weight_limit && stats.Str < 100)
1191 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1192 &race, weight_limit / (10.0 * (100 - stats.Str)));
1195 int len; 1193 else
1196 1194 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 } 1195 }
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) 1196 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))); 1197 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1266 break; 1198 break;
1267 1199
1268 case WAND: 1200 case WAND:
1269 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1201 if (flag [FLAG_IDENTIFIED])
1270 sprintf (buf, "It has %d charges left.", tmp->stats.food); 1202 buf.printf ("It has %d charges left.\n", stats.food);
1271 break; 1203 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 { 1204 }
1205
1206 if (materialname && !msg)
1279 sprintf (buf, "It is made of: %s.", &tmp->materialname); 1207 buf.printf ("It is made of: %s.\n", &materialname);
1280 new_draw_info (NDI_UNIQUE, 0, op, buf); 1208
1281 } 1209 if (who)
1282 /* Where to wear this item */ 1210 /* Where to wear this item */
1283 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1211 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1284 { 1212 if (slot[i].info)
1285 if (tmp->body_info[i] < -1) 1213 {
1214 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1215
1216 if (slot[i].info < -1 && who->slot[i].info)
1217 buf.printf ("(%d)", -slot[i].info);
1218
1219 buf << ".\n";
1286 { 1220 }
1287 if (op->body_info[i]) 1221
1288 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]); 1222 if (weight)
1223 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1224
1225 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1226 {
1227 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1228
1229 if (is_in_shop (who))
1230 {
1231 if (flag [FLAG_UNPAID])
1232 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1289 else 1233 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"); 1234 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 } 1235 }
1319 } 1236 }
1320 1237
1321 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1238 if (flag [FLAG_MONSTER])
1322 examine_monster (op, tmp); 1239 buf << describe_monster (who);
1323 1240
1324 /* Is this item buildable? */ 1241 /* Is this item buildable? */
1325 if (QUERY_FLAG (tmp, FLAG_IS_BUILDABLE)) 1242 if (flag [FLAG_IS_BUILDABLE])
1326 new_draw_info (NDI_UNIQUE, 0, op, "This is a buildable item."); 1243 buf << "This is a buildable item.\n";
1327 1244
1328 /* Does the object have a message? Don't show message for all object 1245 /* Does the object have a message? Don't show message for all object
1329 * types - especially if the first entry is a match 1246 * types - especially if the first entry is a match
1330 */ 1247 */
1331 if (tmp->msg && tmp->type != EXIT && tmp->type != BOOK && tmp->type != CORPSE && !tmp->move_on && strncasecmp (tmp->msg, "@match", 7)) 1248 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && *msg != '@')
1332 { 1249 {
1333
1334 /* This is just a hack so when identifying the items, we print 1250 /* This is just a hack so when identifying the items, we print
1335 * out the extra message 1251 * out the extra message
1336 */ 1252 */
1337 if (need_identify (tmp) && QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1253 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1338 new_draw_info (NDI_UNIQUE, 0, op, "The object has a story:"); 1254 buf << "The object has a story:\n";
1339 1255
1340 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1256 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 { 1257 }
1359 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1360 return;
1361 }
1362 tmp = inv ? inv->inv : op->inv;
1363 1258
1364 while (tmp) 1259 buf << '\n';
1365 { 1260
1366 if ((!tmp->invisible && 1261 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} 1262}
1412 1263
1413static void 1264static void
1414display_new_pickup (object *op) 1265display_new_pickup (object *op)
1415{ 1266{
… …
1576 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1427 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");
1577 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all"); 1428 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'."); 1429 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1579 return 1; 1430 return 1;
1580 } 1431 }
1432
1581 op->contr->search_str[0] = '\0'; 1433 op->contr->search_str[0] = '\0';
1582 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1434 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1583 fix_player (op); 1435 op->update_stats ();
1584 return 1; 1436 return 1;
1585 } 1437 }
1438
1586 if ((int) strlen (params) >= MAX_BUF) 1439 if ((int) strlen (params) >= MAX_BUF)
1587 { 1440 {
1588 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1441 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1589 return 1; 1442 return 1;
1590 } 1443 }
1444
1591 strcpy (op->contr->search_str, params); 1445 strcpy (op->contr->search_str, params);
1592 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1446 sprintf (buf, "Searching for '%s'.", op->contr->search_str);
1593 new_draw_info (NDI_UNIQUE, 0, op, buf); 1447 new_draw_info (NDI_UNIQUE, 0, op, buf);
1594 fix_player (op); 1448 op->update_stats ();
1595 return 1; 1449 return 1;
1596} 1450}
1597 1451

Diff Legend

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