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.48 by root, Mon May 7 03:05:58 2007 UTC vs.
Revision 1.80 by elmex, Sun Oct 5 12:40:21 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 *
24 */ 22 */
25 23
26/* 24/*
27 * Object (handling) commands 25 * Object (handling) commands
28 */ 26 */
… …
58 * only unapply applied, or apply unapplied objects 56 * only unapply applied, or apply unapplied objects
59 **/ 57 **/
60static object * 58static object *
61find_best_apply_object_match (object *pl, const char *params, enum apply_flag aflag) 59find_best_apply_object_match (object *pl, const char *params, enum apply_flag aflag)
62{ 60{
63 object *tmp, *best = NULL; 61 object *best = 0;
64 int match_val = 0, tmpmatch; 62 int match_val = 0;
65 63
66 for (tmp = pl->inv; tmp; tmp = tmp->below) 64 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
67 { 65 {
68 if (tmp->invisible) 66 if (tmp->invisible)
69 continue; 67 continue;
68
70 if ((tmpmatch = item_matched_string (pl, tmp, params)) > match_val) 69 int tmpmatch = item_matched_string (pl, tmp, params);
70
71 if (tmpmatch > match_val)
71 { 72 {
72 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED))) 73 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED)))
73 continue; 74 continue;
75
74 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) 76 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED)))
75 continue; 77 continue;
78
76 match_val = tmpmatch; 79 match_val = tmpmatch;
77 best = tmp; 80 best = tmp;
78 } 81 }
79 } 82 }
83
80 return best; 84 return best;
81} 85}
82 86
83/** 87/**
84 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL); 88 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL);
85 **/ 89 **/
86object * 90object *
87find_best_object_match (object *pl, const char *params) 91find_best_object_match (object *pl, const char *params)
88{ 92{
89 return find_best_apply_object_match (pl, params, AP_NULL); 93 return find_best_apply_object_match (pl, params, AP_TOGGLE);
94}
95
96static bool
97can_split (object *pl, object *&op, sint32 nrof)
98{
99 if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
100 {
101 op = tmp;
102 return true;
103 }
104 else
105 {
106 if (op->nrof > 1)
107 new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %s.", op->nrof, &op->name_pl);
108 else
109 new_draw_info_format (NDI_UNIQUE, 0, pl, "There is only one %s.", &op->name);
110
111 return false;
112 }
90} 113}
91 114
92int 115int
93command_uskill (object *pl, char *params) 116command_uskill (object *pl, char *params)
94{ 117{
… …
118 { 141 {
119 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 142 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);
120 return 0; 143 return 0;
121 } 144 }
122 145
123 return change_skill (pl, skill, 0); 146 pl->change_skill (0);
147 apply_special (pl, skill, AP_APPLY);
148 return 1;
124} 149}
125
126 150
127/* These functions (command_search, command_disarm) are really just wrappers for 151/* These functions (command_search, command_disarm) are really just wrappers for
128 * things like 'use_skill ...'). In fact, they should really be obsoleted 152 * things like 'use_skill ...'). In fact, they should really be obsoleted
129 * and replaced with those. 153 * and replaced with those.
130 */ 154 */
… …
138command_disarm (object *op, char *params) 162command_disarm (object *op, char *params)
139{ 163{
140 return use_skill (op, skill_names[SK_DISARM_TRAPS]); 164 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
141} 165}
142 166
143
144/* A little special because we do want to pass the full params along 167/* A little special because we do want to pass the full params along
145 * as it includes the object to throw. 168 * as it includes the object to throw.
146 */ 169 */
147int 170int
148command_throw (object *op, char *params) 171command_throw (object *op, char *params)
149{ 172{
150 object *skop;
151
152 skop = find_skill_by_name (op, skill_names[SK_THROWING]); 173 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))
153 if (skop)
154 return do_skill (op, op, skop, op->facing, params); 174 return do_skill (op, op, skop, op->facing, params);
155 else 175 else
156 {
157 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing."); 176 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing.");
158 } 177
159 return 0; 178 return 0;
160} 179}
161
162 180
163int 181int
164command_apply (object *op, char *params) 182command_apply (object *op, char *params)
165{ 183{
166 if (!params) 184 if (!params)
… …
168 player_apply_below (op); 186 player_apply_below (op);
169 return 0; 187 return 0;
170 } 188 }
171 else 189 else
172 { 190 {
173 apply_flag aflag = (apply_flag) 0; 191 apply_flag aflag = (apply_flag)0;
174 object *inv;
175 192
176 while (*params == ' ') 193 while (*params == ' ')
177 params++; 194 params++;
195
178 if (!strncmp (params, "-a ", 3)) 196 if (!strncmp (params, "-a ", 3))
179 { 197 {
180 aflag = AP_APPLY; 198 aflag = AP_APPLY;
181 params += 3; 199 params += 3;
182 } 200 }
201
183 if (!strncmp (params, "-u ", 3)) 202 if (!strncmp (params, "-u ", 3))
184 { 203 {
185 aflag = AP_UNAPPLY; 204 aflag = AP_UNAPPLY;
186 params += 3; 205 params += 3;
187 } 206 }
207
188 while (*params == ' ') 208 while (*params == ' ')
189 params++; 209 params++;
190 210
191 inv = find_best_apply_object_match (op, params, aflag); 211 if (object *inv = find_best_apply_object_match (op, params, aflag))
192 if (inv)
193 {
194 player_apply (op, inv, aflag, 0); 212 player_apply (op, inv, aflag, 0);
195 }
196 else 213 else
197 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params); 214 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params);
198 } 215 }
216
199 return 0; 217 return 0;
200} 218}
201 219
202/* 220/*
203 * Check if an item op can be put into a sack. If pl exists then tell 221 * Check if an item op can be put into a sack. If pl exists then tell
… …
209 * not need to use split_ob and stuff. 227 * not need to use split_ob and stuff.
210 */ 228 */
211int 229int
212sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 230sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
213{ 231{
214
215 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 232 if (!QUERY_FLAG (sack, FLAG_APPLIED))
216 { 233 {
217 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); 234 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
218 return 0; 235 return 0;
219 } 236 }
237
220 if (sack == op) 238 if (sack == op)
221 { 239 {
222 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack)); 240 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack));
223 return 0; 241 return 0;
224 } 242 }
243
225 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) 244 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
226 { 245 {
227 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); 246 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));
228 return 0; 247 return 0;
229 } 248 }
249
230 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 250 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
231 { 251 {
232 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); 252 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
233 return 0; 253 return 0;
234 } 254 }
255
235 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 256 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
236 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 257 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
237 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 258 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
238 { 259 {
239 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 260 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
240 return 0; 261 return 0;
241 } 262 }
263
242 /* All other checks pass, must be OK */ 264 /* All other checks pass, must be OK */
243 return 1; 265 return 1;
244} 266}
245 267
246/* Pick up commands follow */ 268/* Pick up commands follow */
… …
251 * pick up (0 means all of them) 273 * pick up (0 means all of them)
252 */ 274 */
253static void 275static void
254pick_up_object (object *pl, object *op, object *tmp, int nrof) 276pick_up_object (object *pl, object *op, object *tmp, int nrof)
255{ 277{
256 /* buf needs to be big (more than 256 chars) because you can get
257 * very long item names.
258 */
259 char buf[HUGE_BUF];
260 object *env = tmp->env; 278 object *env = tmp->env;
261 uint32 weight, effective_weight_limit; 279 uint32 weight, effective_weight_limit;
262 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 280 int tmp_nrof = tmp->number_of ();
263 281
264 /* IF the player is flying & trying to take the item out of a container 282 /* IF the player is flying & trying to take the item out of a container
265 * that is in his inventory, let him. tmp->env points to the container 283 * that is in his inventory, let him. tmp->env points to the container
266 * (sack, luggage, etc), tmp->env->env then points to the player (nested 284 * (sack, luggage, etc), tmp->env->env then points to the player (nested
267 * containers not allowed as of now) 285 * containers not allowed as of now)
268 */ 286 */
269 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 287 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
270 { 288 {
271 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); 289 pl->failmsg ("You are levitating, you can't reach the ground! "
290 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
291 "or waiting till the levitation effect wears off.>");
272 return; 292 return;
273 } 293 }
274 294
275 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 295 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
276 return; 296 return;
277 297
278 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
279 {
280 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!");
281 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
282
283 if (pl->contr)
284 esrv_del_item (pl->contr, tmp->count);
285
286 tmp->destroy ();
287 return;
288 }
289
290 if (nrof > tmp_nrof || nrof == 0) 298 if (nrof > tmp_nrof || nrof <= 0)
291 nrof = tmp_nrof; 299 nrof = tmp_nrof;
292 300
293 /* Figure out how much weight this object will add to the player */ 301 /* Figure out how much weight this object will add to the player */
294 weight = tmp->weight * nrof; 302 weight = tmp->weight * nrof;
295 if (tmp->inv) 303 if (tmp->inv)
296 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 304 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
297 305
298 if (pl->stats.Str <= MAX_STAT)
299 effective_weight_limit = weight_limit[pl->stats.Str]; 306 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
300 else
301 effective_weight_limit = weight_limit[MAX_STAT];
302 307
303 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 308 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
304 { 309 {
305 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 310 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
306 return; 311 return;
307 } 312 }
308 313
309 if (nrof != tmp_nrof) 314 if (!can_split (pl, tmp, nrof))
310 {
311 object *tmp2 = tmp;
312
313 tmp = get_split_ob (tmp, nrof);
314 if (!tmp)
315 {
316 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
317 return; 315 return;
318 }
319 316
320 /* Tell the client what happened to the rest of objects */ 317 if (QUERY_FLAG (tmp, FLAG_UNPAID))
321 if (pl->contr) 318 {
322 if (tmp2->destroyed ()) 319 tmp->flag.reset (FLAG_UNPAID);
323 esrv_del_item (pl->contr, tmp2->count); 320 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));
324 else 321 tmp->flag.set (FLAG_UNPAID);
325 esrv_update_item (UPD_NROF, pl, tmp2);
326 } 322 }
327 else 323 else
328 { 324 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
329 /* 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,
331 * so it needs to be deleted.
332 */
333 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
334 {
335 if (tmp->env && pl->type == PLAYER)
336 esrv_del_item (pl->contr, tmp->count);
337 325
338 tmp->remove (); /* Unlink it */ 326 op->insert (tmp);
339 }
340 }
341
342 if (QUERY_FLAG (tmp, FLAG_UNPAID))
343 sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
344 else
345 sprintf (buf, "You pick up the %s.", query_name (tmp));
346
347 new_draw_info (NDI_UNIQUE, 0, pl, buf);
348
349 tmp = insert_ob_in_ob (tmp, op);
350
351 /* All the stuff below deals with client/server code, and is only
352 * usable by players
353 */
354 if (pl->contr)
355 {
356 esrv_send_item (pl, tmp);
357
358 /* These are needed to update the weight for the container we
359 * are putting the object in.
360 */
361 if (op != pl)
362 {
363 esrv_update_item (UPD_WEIGHT, pl, op);
364 esrv_send_item (pl, pl);
365 }
366
367 /* Update the container the object was in */
368 if (env && env != pl && env != op)
369 esrv_update_item (UPD_WEIGHT, pl, env);
370 }
371} 327}
372 328
373/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 329/* modified slightly to allow monsters use this -b.t. 5-31-95 */
374void 330void
375pick_up (object *op, object *alt) 331pick_up (object *op, object *alt)
… …
385 if (!can_pick (op, alt)) 341 if (!can_pick (op, alt))
386 { 342 {
387 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name); 343 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
388 goto leave; 344 goto leave;
389 } 345 }
346
390 tmp = alt; 347 tmp = alt;
391 } 348 }
392 else 349 else
393 { 350 {
394 if (op->below == NULL || !can_pick (op, op->below)) 351 if (op->below == NULL || !can_pick (op, op->below))
… …
403 /* Try to catch it. */ 360 /* Try to catch it. */
404 tmp_map = tmp->map; 361 tmp_map = tmp->map;
405 tmp = stop_item (tmp); 362 tmp = stop_item (tmp);
406 if (tmp == NULL) 363 if (tmp == NULL)
407 goto leave; 364 goto leave;
365
408 need_fix_tmp = 1; 366 need_fix_tmp = 1;
409 if (!can_pick (op, tmp)) 367 if (!can_pick (op, tmp))
410 goto leave; 368 goto leave;
411 369
412 if (op->type == PLAYER) 370 if (op->type == PLAYER)
… …
417 } 375 }
418 else 376 else
419 count = tmp->nrof; 377 count = tmp->nrof;
420 378
421 /* container is open, so use it */ 379 /* container is open, so use it */
380 if (tmp->flag [FLAG_STARTEQUIP])
381 alt = op;
422 if (op->container) 382 else if (op->container)
423 { 383 {
424 alt = op->container; 384 alt = op->container;
425 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 385 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
426 goto leave; 386 goto leave;
427 } 387 }
… …
446 /* here it could be possible to check rent, 406 /* here it could be possible to check rent,
447 * if someone wants to implement it 407 * if someone wants to implement it
448 */ 408 */
449 alt = op; 409 alt = op;
450 } 410 }
411
451#ifdef PICKUP_DEBUG 412#ifdef PICKUP_DEBUG
452 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); 413 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
453#endif 414#endif
454 415
455 /* startequip items are not allowed to be put into containers: */ 416 /* startequip items are not allowed to be put into containers: */
… …
505 466
506 /* Makes processing easier */ 467 /* Makes processing easier */
507 if (params && *params == '\0') 468 if (params && *params == '\0')
508 params = 0; 469 params = 0;
509 470
471 int cnt = MAX_ITEM_PER_DROP;
472
510 while (tmp) 473 while (tmp)
511 { 474 {
512 next = tmp->below; 475 next = tmp->below;
513 476
514 if (tmp->invisible) 477 if (tmp->invisible)
… …
520 /* This following two if and else if could be merged into line 483 /* This following two if and else if could be merged into line
521 * but that probably will make it more difficult to read, and 484 * but that probably will make it more difficult to read, and
522 * not make it any more efficient 485 * not make it any more efficient
523 */ 486 */
524 if (params && item_matched_string (op, tmp, params)) 487 if (params && item_matched_string (op, tmp, params))
488 {
489 if (--cnt < 0) break;
525 pick_up (op, tmp); 490 pick_up (op, tmp);
491 }
526 else if (can_pick (op, tmp) && !params) 492 else if (can_pick (op, tmp) && !params)
527 { 493 {
494 if (--cnt < 0) break;
528 pick_up (op, tmp); 495 pick_up (op, tmp);
529 break; 496 break;
530 } 497 }
531 498
532 tmp = next; 499 tmp = next;
500 }
501
502 if (cnt < 0)
503 {
504 op->failmsg ("Couldn't pick up so many items at once.");
505 return 0;
533 } 506 }
534 507
535 if (!params && !tmp) 508 if (!params && !tmp)
536 { 509 {
537 for (tmp = op->below; tmp; tmp = tmp->below) 510 for (tmp = op->below; tmp; tmp = tmp->below)
538 if (!tmp->invisible) 511 if (!tmp->invisible)
539 { 512 {
540 char buf[MAX_BUF];
541
542 sprintf (buf, "You can't pick up a %s.", &tmp->name); 513 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; 514 break;
545 } 515 }
546 516
547 if (!tmp) 517 if (!tmp)
548 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 518 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
549 } 519 }
550 520
551 return 0; 521 return 0;
552} 522}
553
554 523
555/* 524/*
556 * This function was part of drop, now is own function. 525 * This function was part of drop, now is own function.
557 * Player 'op' tries to put object 'tmp' into sack 'sack', 526 * Player 'op' tries to put object 'tmp' into sack 'sack',
558 * if nrof is non zero, then nrof objects is tried to put into sack. 527 * if nrof is non zero, then nrof objects is tried to put into sack.
… …
574 return; 543 return;
575 } 544 }
576 545
577 if (tmp->type == CONTAINER && tmp->inv) 546 if (tmp->type == CONTAINER && tmp->inv)
578 { 547 {
579
580 /* Eneq(@csd.uu.se): If the object to be dropped is a container 548 /* Eneq(@csd.uu.se): If the object to be dropped is a container
581 * we instead move the contents of that container into the active 549 * we instead move the contents of that container into the active
582 * container, this is only done if the object has something in it. 550 * container, this is only done if the object has something in it.
583 */ 551 */
584 sack2 = tmp; 552 sack2 = tmp;
… …
587 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 555 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
588 { 556 {
589 tmp = tmp2->below; 557 tmp = tmp2->below;
590 558
591 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 559 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))
592 {
593 put_object_in_sack (op, sack, tmp2, 0); 560 put_object_in_sack (op, sack, tmp2, 0);
594 }
595 else 561 else
596 { 562 {
597 sprintf (buf, "Your %s fills up.", query_name (sack)); 563 sprintf (buf, "Your %s fills up.", query_name (sack));
598 new_draw_info (NDI_UNIQUE, 0, op, buf); 564 new_draw_info (NDI_UNIQUE, 0, op, buf);
599 break; 565 break;
600 } 566 }
601 } 567 }
602 568
603 esrv_update_item (UPD_WEIGHT, op, sack2);
604 return; 569 return;
605 } 570 }
606 571
607 /* Don't worry about this for containers - our caller should have 572 /* Don't worry about this for containers - our caller should have
608 * already checked this. 573 * already checked this.
… …
613 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 578 if (QUERY_FLAG (tmp, FLAG_APPLIED))
614 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 579 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
615 return; 580 return;
616 581
617 /* we want to put some portion of the item into the container */ 582 /* we want to put some portion of the item into the container */
618 if (nrof && tmp->nrof != nrof) 583 if (!can_split (op, tmp, nrof))
619 {
620 object *tmp2 = tmp;
621
622 tmp = get_split_ob (tmp, nrof);
623
624 if (!tmp)
625 {
626 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
627 return; 584 return;
628 }
629 /* Tell a client what happened other objects */
630 if (tmp2->destroyed ())
631 esrv_del_item (op->contr, tmp2->count);
632 else /* this can proably be replaced with an update */
633 esrv_send_item (op, tmp2);
634 }
635 else
636 tmp->remove ();
637 585
638 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 586 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
639 tmp2 = insert_ob_in_ob (tmp, sack); 587 sack->insert (tmp);
640 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
641 /* in object.c */
642
643 /* If an object merged (and thus, different object), we need to
644 * delete the original.
645 */
646 if (tmp2 != tmp)
647 esrv_del_item (op->contr, tmp->count);
648
649 esrv_send_item (op, tmp2);
650
651 /* update the sacks weight */
652 esrv_update_item (UPD_WEIGHT, op, sack);
653} 588}
654 589
655/* 590/*
656 * This function was part of drop, now is own function. 591 * This function was part of drop, now is own function.
657 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 592 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
… …
659 * This is used when dropping objects onto the floor. 594 * This is used when dropping objects onto the floor.
660 */ 595 */
661void 596void
662drop_object (object *op, object *tmp, uint32 nrof) 597drop_object (object *op, object *tmp, uint32 nrof)
663{ 598{
664 char buf[MAX_BUF];
665 object *floor;
666
667 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 599 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
668 return; 600 return;
669 601
670 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 602 if (QUERY_FLAG (tmp, FLAG_APPLIED))
671 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 603 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
… …
674 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D 606 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
675 607
676 /* We are only dropping some of the items. We split the current object 608 /* We are only dropping some of the items. We split the current object
677 * off 609 * off
678 */ 610 */
679 if (nrof && tmp->nrof != nrof) 611 if (!can_split (op, tmp, nrof))
680 {
681 object *tmp2 = tmp;
682
683 tmp = get_split_ob (tmp, nrof);
684 if (!tmp)
685 {
686 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
687 return; 612 return;
688 }
689 /* Tell a client what happened rest of objects. tmp2 is now the
690 * original object
691 */
692 if (op->type == PLAYER)
693 {
694 if (tmp2->destroyed ())
695 esrv_del_item (op->contr, tmp2->count);
696 else
697 esrv_send_item (op, tmp2);
698 }
699 }
700 else
701 tmp->remove ();
702 613
703 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) 614 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
704 return; 615 return;
705 616
706 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 617 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
707 { 618 {
708 sprintf (buf, "You drop the %s.", query_name (tmp)); 619 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
709 new_draw_info (NDI_UNIQUE, 0, op, buf); 620 op->statusmsg ("The god who lent it to you retrieves it.");
710 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
711
712 if (op->type == PLAYER)
713 esrv_del_item (op->contr, tmp->count);
714 621
715 tmp->destroy (); 622 tmp->destroy ();
716 op->update_stats (); 623 op->update_stats ();
717 return; 624 return;
718 } 625 }
719 626
720 if (op->type == PLAYER)
721 esrv_del_item (op->contr, tmp->count);
722
723 /* Call this before we update the various windows/players. At least 627 /* Call this before we update the various windows/players. At least
724 * that we, we know the weight is correct. 628 * that we, we know the weight is correct.
725 */ 629 */
726 op->update_stats (); /* This is overkill, fix_player() is called somewhere */ 630 // 2007-11-26: moved op->update_stats away and calling it later after
727 /* in object.c */ 631 // all items of a drop command have been processed.
728 632
729 if (op->type == PLAYER)
730 {
731 /* Need to update the weight for the player */
732 esrv_send_item (op, op);
733 op->contr->ns->floorbox_update ();
734 }
735
736 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above) 633 for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
737 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) 634 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
738 return; 635 return;
739 636
740 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) 637 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
638 {
741 sell_item (tmp, op); 639 if (!sell_item (tmp, op))
640 {
641 // if we can't sell it we don't drop it, so give it back to the seller
642 op->insert (tmp);
643 return;
644 }
645 }
742 646
743 tmp->x = op->x; 647 tmp->x = op->x;
744 tmp->y = op->y; 648 tmp->y = op->y;
745 649
746 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 650 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
… …
760 if (tmp->env && tmp->env->type != PLAYER) 664 if (tmp->env && tmp->env->type != PLAYER)
761 { 665 {
762 /* Just toss the object - probably shouldn't be hanging 666 /* Just toss the object - probably shouldn't be hanging
763 * around anyways 667 * around anyways
764 */ 668 */
765 tmp->remove ();
766 tmp->destroy (); 669 tmp->destroy ();
767 return; 670 return;
768 } 671 }
769 else 672 else
770 { 673 {
771 while (tmp != NULL && tmp->invisible) 674 while (tmp && tmp->invisible)
772 tmp = tmp->below; 675 tmp = tmp->below;
773 } 676 }
774 } 677 }
775 678
776 if (tmp == NULL) 679 if (tmp == NULL)
777 { 680 {
778 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 681 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
779 return; 682 return;
780 } 683 }
684
781 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 685 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
782 { 686 {
783 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 687 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
784 return; 688 return;
785 } 689 }
690
786 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 691 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
787 { 692 {
788#if 0 693#if 0
789 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 694 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
790 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 695 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
… …
814 719
815 if (op->type == PLAYER) 720 if (op->type == PLAYER)
816 op->contr->count = 0; 721 op->contr->count = 0;
817} 722}
818 723
819
820
821/* Command will drop all items that have not been locked */ 724/* Command will drop all items that have not been locked */
822int 725int
823command_dropall (object *op, char *params) 726command_dropall (object *op, char *params)
824{ 727{
825 728
826 object *curinv, *nextinv;
827
828 if (op->inv == NULL) 729 if (op->inv == NULL)
829 { 730 {
830 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 731 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
831 return 0; 732 return 0;
832 } 733 }
833 734
834 curinv = op->inv; 735 object *curinv = op->inv;
736 object *nextinv;
835 737
836 /* 738 /*
837 This is the default. Drops everything not locked or considered 739 This is the default. Drops everything not locked or considered
838 not something that should be dropped. 740 not something that should be dropped.
839 */ 741 */
… …
841 Care must be taken that the next item pointer is not to money as 743 Care must be taken that the next item pointer is not to money as
842 the drop() routine will do unknown things to it when dropping 744 the drop() routine will do unknown things to it when dropping
843 in a shop. --Tero.Pelander@utu.fi 745 in a shop. --Tero.Pelander@utu.fi
844 */ 746 */
845 747
846 if (params == NULL) 748 int cnt = MAX_ITEM_PER_DROP;
749
750 if (!params)
847 { 751 {
848 while (curinv != NULL) 752 while (curinv)
849 { 753 {
850 nextinv = curinv->below; 754 nextinv = curinv->below;
755
851 while (nextinv && nextinv->type == MONEY) 756 while (nextinv && nextinv->type == MONEY)
852 nextinv = nextinv->below; 757 nextinv = nextinv->below;
758
853 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 759 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
854 curinv->type != FOOD && curinv->type != KEY && 760 curinv->type != FOOD && curinv->type != KEY &&
855 curinv->type != SPECIAL_KEY && curinv->type != GEM && 761 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
856 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 762 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
857 { 763 {
858 drop (op, curinv); 764 drop (op, curinv);
765 if (--cnt <= 0) break;
859 } 766 }
767
860 curinv = nextinv; 768 curinv = nextinv;
861 } 769 }
862 } 770 }
863
864 else if (strcmp (params, "weapons") == 0) 771 else if (strcmp (params, "weapons") == 0)
865 { 772 {
866 while (curinv != NULL) 773 while (curinv)
867 { 774 {
868 nextinv = curinv->below; 775 nextinv = curinv->below;
776
869 while (nextinv && nextinv->type == MONEY) 777 while (nextinv && nextinv->type == MONEY)
870 nextinv = nextinv->below; 778 nextinv = nextinv->below;
779
871 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 780 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
872 { 781 {
873 drop (op, curinv); 782 drop (op, curinv);
783 if (--cnt <= 0) break;
874 } 784 }
785
875 curinv = nextinv; 786 curinv = nextinv;
876 } 787 }
877 } 788 }
878
879 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 789 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
880 { 790 {
881 while (curinv != NULL) 791 while (curinv)
882 { 792 {
883 nextinv = curinv->below; 793 nextinv = curinv->below;
794
884 while (nextinv && nextinv->type == MONEY) 795 while (nextinv && nextinv->type == MONEY)
885 nextinv = nextinv->below; 796 nextinv = nextinv->below;
797
886 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 798 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
887 { 799 {
888 drop (op, curinv); 800 drop (op, curinv);
801 if (--cnt <= 0) break;
889 } 802 }
803
890 curinv = nextinv; 804 curinv = nextinv;
891 } 805 }
892 } 806 }
893
894 else if (strcmp (params, "misc") == 0) 807 else if (strcmp (params, "misc") == 0)
895 { 808 {
896 while (curinv != NULL) 809 while (curinv)
897 { 810 {
898 nextinv = curinv->below; 811 nextinv = curinv->below;
812
899 while (nextinv && nextinv->type == MONEY) 813 while (nextinv && nextinv->type == MONEY)
900 nextinv = nextinv->below; 814 nextinv = nextinv->below;
815
901 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 816 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
902 { 817 {
903 switch (curinv->type) 818 switch (curinv->type)
904 { 819 {
905 case HORN: 820 case HORN:
… …
923 break; 838 break;
924 default: 839 default:
925 curinv = nextinv; 840 curinv = nextinv;
926 break; 841 break;
927 } 842 }
843
844 if (--cnt <= 0) break;
928 } 845 }
846
929 curinv = nextinv; 847 curinv = nextinv;
930 } 848 }
931 } 849 }
932 850
933 op->contr->ns->floorbox_update (); 851 if (cnt <= 0)
852 op->failmsg ("Only dropped some items, can't drop that many items at once.");
934 853
935/* draw_look(op);*/ 854/* draw_look(op);*/
936 return 0; 855 return 0;
937} 856}
938 857
939/* Object op wants to drop object(s) params. params can be a 858/* Object op wants to drop object(s) params. params can be a
940 * comma seperated list. 859 * comma seperated list.
941 */ 860 */
942
943int 861int
944command_drop (object *op, char *params) 862command_drop (object *op, char *params)
945{ 863{
946 object *tmp, *next; 864 object *tmp, *next;
947 int did_one = 0; 865 int did_one = 0;
… …
951 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 869 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
952 return 0; 870 return 0;
953 } 871 }
954 else 872 else
955 { 873 {
874 int cnt = MAX_ITEM_PER_DROP;
875
956 for (tmp = op->inv; tmp; tmp = next) 876 for (tmp = op->inv; tmp; tmp = next)
957 { 877 {
958 next = tmp->below; 878 next = tmp->below;
959 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 879 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
960 continue; 880 continue;
881
961 if (item_matched_string (op, tmp, params)) 882 if (item_matched_string (op, tmp, params))
962 { 883 {
963 drop (op, tmp); 884 drop (op, tmp);
885 if (--cnt <= 0) break;
964 did_one = 1; 886 did_one = 1;
965 } 887 }
966 } 888 }
889
967 if (!did_one) 890 if (!did_one)
968 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 891 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
969 } 892
970 if (op->type == PLAYER) 893 if (cnt <= 0)
971 { 894 op->failmsg ("Only dropped some items, can't drop that many items at once.");
972 op->contr->count = 0;
973 op->contr->ns->floorbox_update ();
974 }; 895 }
975 896
976/* draw_look(op);*/
977 return 0; 897 return 0;
978} 898}
979 899
980int 900int
981command_examine (object *op, char *params) 901command_examine (object *op, char *params)
… …
984 { 904 {
985 object *tmp = op->below; 905 object *tmp = op->below;
986 906
987 while (tmp && !tmp->client_visible ()) 907 while (tmp && !tmp->client_visible ())
988 tmp = tmp->below; 908 tmp = tmp->below;
909
989 if (tmp) 910 if (tmp)
990 examine (op, tmp); 911 examine (op, tmp);
991 } 912 }
992 else 913 else
993 { 914 {
994 object *tmp = find_best_object_match (op, params); 915 object *tmp = find_best_object_match (op, params);
995 916
996 if (tmp) 917 if (tmp)
997 examine (op, tmp); 918 examine (op, tmp);
998 else 919 else
999 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params); 920 op->contr->infobox (MSG_CHANNEL ("examine"), format ("Could not find an object that matches %s", params));
1000 } 921 }
922
1001 return 0; 923 return 0;
1002} 924}
1003 925
1004/* op should be a player. 926/* op should be a player.
1005 * we return the object the player has marked with the 'mark' command 927 * we return the object the player has marked with the 'mark' command
… …
1052 dynbuf_text buf (512, 512); 974 dynbuf_text buf (512, 512);
1053 975
1054 object *mon = head ? head : this; 976 object *mon = head ? head : this;
1055 977
1056 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 978 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1057 buf << "It is an undead force.\n"; 979 buf << "It is an undead force.\r";
1058 980
1059 if (mon->level > who->level) 981 if (mon->level > who->level)
1060 buf << "It is likely more powerful than you.\n"; 982 buf << "It is likely more powerful than you.\r";
1061 else if (mon->level < who->level) 983 else if (mon->level < who->level)
1062 buf << "It is likely less powerful than you.\n"; 984 buf << "It is likely less powerful than you.\r";
1063 else 985 else
1064 buf << "It is probably as powerful as you.\n"; 986 buf << "It is probably as powerful as you.\r";
1065 987
1066 if (mon->attacktype & AT_ACID) 988 if (mon->attacktype & AT_ACID)
1067 buf << "You seem to smell an acrid odor.\n"; 989 buf << "You seem to smell an acrid odor.\r";
1068 990
1069 /* Anyone know why this used to use the clone value instead of the 991 /* Anyone know why this used to use the clone value instead of the
1070 * maxhp field? This seems that it should give more accurate results. 992 * maxhp field? This seems that it should give more accurate results.
1071 */ 993 */
1072 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 994 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1073 { /* From 1-4 */ 995 { /* From 1-4 */
1074 case 1: 996 case 1:
1075 buf << "It is in a bad shape.\n"; 997 buf << "It is in a bad shape.\r";
1076 break; 998 break;
1077 case 2: 999 case 2:
1078 buf << "It is hurt.\n"; 1000 buf << "It is hurt.\r";
1079 break; 1001 break;
1080 case 3: 1002 case 3:
1081 buf << "It is somewhat hurt.\n"; 1003 buf << "It is somewhat hurt.\r";
1082 break; 1004 break;
1083 case 4: 1005 case 4:
1084 buf << "It is in excellent shape.\n"; 1006 buf << "It is in excellent shape.\r";
1085 break; 1007 break;
1086 } 1008 }
1087 1009
1088 if (present_in_ob (POISONING, mon)) 1010 if (present_in_ob (POISONING, mon))
1089 buf << "It looks very ill.\n"; 1011 buf << "It looks very ill.\r";
1012
1013 buf << '\n';
1090 1014
1091 return buf; 1015 return buf;
1092} 1016}
1093 1017
1094/* tmp is the object being described, pl is who is examing it. */ 1018/* tmp is the object being described, pl is who is examing it. */
… …
1152std::string 1076std::string
1153object::describe (object *who) 1077object::describe (object *who)
1154{ 1078{
1155 dynbuf_text buf (1024, 1024); 1079 dynbuf_text buf (1024, 1024);
1156 1080
1157 buf.printf ("That is: %s.\n", long_desc (who).c_str ()); 1081 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1158 1082
1159 if (custom_name) 1083 if (custom_name)
1160 buf,printf ("You call it %s\n", &custom_name); 1084 buf.printf ("You call it %s.\r", &custom_name);
1161 1085
1162 switch (type) 1086 switch (type)
1163 { 1087 {
1164 case SPELLBOOK: 1088 case SPELLBOOK:
1165 if (flag [FLAG_IDENTIFIED] && inv) 1089 if (flag [FLAG_IDENTIFIED] && inv)
1166 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill); 1090 buf.printf ("%s is a %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1167 break; 1091 break;
1168 1092
1169 case BOOK: 1093 case BOOK:
1170 if (msg) 1094 if (msg)
1171 buf << "Something is written in it.\n"; 1095 buf << "Something is written in it.\r";
1172 break; 1096 break;
1173 1097
1174 case CONTAINER: 1098 case CONTAINER:
1175 if (race != NULL) 1099 if (race)
1176 { 1100 {
1177 if (weight_limit && stats.Str < 100) 1101 if (weight_limit && stats.Str < 100)
1178 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n", 1102 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1179 &race, weight_limit / (10.0 * (100 - stats.Str))); 1103 &race, weight_limit / (10.0 * (100 - stats.Str)));
1180 else 1104 else
1181 buf.printf ("It can hold only %s.\n", &race); 1105 buf.printf ("It can hold only %s.\r", &race);
1182 } 1106 }
1183 else if (weight_limit && stats.Str < 100) 1107 else if (weight_limit && stats.Str < 100)
1184 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str))); 1108 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1185 break; 1109 break;
1186 1110
1187 case WAND: 1111 case WAND:
1188 if (flag [FLAG_IDENTIFIED]) 1112 if (flag [FLAG_IDENTIFIED])
1189 buf.printf ("It has %d charges left.\n", stats.food); 1113 buf.printf ("It has %d charges left.\r", stats.food);
1190 break; 1114 break;
1191 } 1115 }
1192 1116
1193 if (materialname && !msg) 1117 if (materialname && !msg)
1194 buf.printf ("It is made of: %s.\n", &materialname); 1118 buf.printf ("It is made of: %s.\r", &materialname);
1195 1119
1196 if (who) 1120 if (who)
1197 /* Where to wear this item */ 1121 /* Where to wear this item */
1198 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1122 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1199 if (slot[i].info) 1123 if (slot[i].info)
1200 { 1124 {
1201 buf << "It goes ";
1202 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name); 1125 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1203 1126
1204 if (slot[i].info < -1 && who->slot[i].info) 1127 if (slot[i].info < -1 && who->slot[i].info)
1205 buf.printf ("(%d)", -slot[i].info); 1128 buf.printf ("(%d)", -slot[i].info);
1206 1129
1207 buf << ".\n"; 1130 buf << ".\r";
1208 } 1131 }
1209 1132
1210 if (weight) 1133 if (weight)
1211 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0); 1134 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1212 1135
1213 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) 1136 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1214 { 1137 {
1215 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX)); 1138 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1216 1139
1217 if (is_in_shop (who)) 1140 if (is_in_shop (who))
1218 { 1141 {
1219 if (flag [FLAG_UNPAID]) 1142 if (flag [FLAG_UNPAID])
1220 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP)); 1143 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1221 else 1144 else
1222 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it"); 1145 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1223 } 1146 }
1224 } 1147 }
1225 1148
1226 if (flag [FLAG_MONSTER]) 1149 if (flag [FLAG_MONSTER])
1227 buf << describe_monster (who); 1150 buf << describe_monster (who);
1228 1151
1229 /* Is this item buildable? */ 1152 /* Is this item buildable? */
1230 if (flag [FLAG_IS_BUILDABLE]) 1153 if (flag [FLAG_IS_BUILDABLE])
1231 buf << "This is a buildable item.\n"; 1154 buf << "This is a buildable item.\r";
1232 1155
1233 /* Does the object have a message? Don't show message for all object 1156 /* Does the object have a message? Don't show message for all object
1234 * types - especially if the first entry is a match 1157 * types - especially if the first entry is a match
1235 */ 1158 */
1236 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && strncasecmp (msg, "@match", 7)) 1159 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1237 { 1160 {
1238 /* This is just a hack so when identifying the items, we print 1161 /* This is just a hack so when identifying the items, we print
1239 * out the extra message 1162 * out the extra message
1240 */ 1163 */
1241 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1164 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1242 buf << "The object has a story:\n"; 1165 buf << "The object has a story:\r";
1243 1166
1244 buf << msg << '\n'; 1167 buf << msg << '\n';
1245 } 1168 }
1246 1169
1247 buf << '\n'; 1170 buf << '\n';
1248 1171
1249 return std::string (buf.linearise (), buf.size ()); 1172 return std::string (buf.linearise (), buf.size ());
1250}
1251
1252void
1253examine (object *op, object *tmp)
1254{
1255 std::string s = tmp->describe (op);
1256
1257 new_draw_info (NDI_UNIQUE, 0, op, s.c_str ());
1258}
1259
1260/*
1261 * inventory prints object's inventory. If inv==NULL then print player's
1262 * inventory.
1263 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1264 */
1265void
1266inventory (object *op, object *inv)
1267{
1268 object *tmp;
1269 const char *in;
1270 int items = 0, length;
1271
1272 if (inv == NULL && op == NULL)
1273 {
1274 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1275 return;
1276 }
1277
1278 tmp = inv ? inv->inv : op->inv;
1279
1280 while (tmp)
1281 {
1282 if ((!tmp->invisible &&
1283 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1284 items++;
1285 tmp = tmp->below;
1286 }
1287
1288 if (inv == NULL)
1289 { /* player's inventory */
1290 if (items == 0)
1291 {
1292 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
1293 return;
1294 }
1295 else
1296 {
1297 length = 28;
1298 in = "";
1299 if (op)
1300 clear_win_info (op);
1301 new_draw_info (NDI_UNIQUE, 0, op, "Inventory:");
1302 }
1303 }
1304 else
1305 {
1306 if (items == 0)
1307 return;
1308 else
1309 {
1310 length = 28;
1311 in = " ";
1312 }
1313 }
1314
1315 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1316 {
1317 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1318 continue;
1319 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1320 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1321 query_name (tmp), tmp->count, query_weight (tmp));
1322 else
1323 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1324 }
1325
1326 if (!inv && op)
1327 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1328} 1173}
1329 1174
1330static void 1175static void
1331display_new_pickup (object *op) 1176display_new_pickup (object *op)
1332{ 1177{

Diff Legend

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