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

Diff Legend

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