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.89 by elmex, Mon Jan 12 00:17:23 2009 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,2009 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{
… …
110 { 133 {
111 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>");
112 return 0; 135 return 0;
113 } 136 }
114 137
115 skill = find_skill_by_name (pl, params); 138 skill = find_skill_by_name_fuzzy (pl, params);
116 139
117 if (!skill) 140 if (!skill)
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
127/* These functions (command_search, command_disarm) are really just wrappers for
128 * things like 'use_skill ...'). In fact, they should really be obsoleted
129 * and replaced with those.
130 */
131int
132command_search (object *op, char *params)
133{
134 return use_skill (op, skill_names[SK_FIND_TRAPS]);
135}
136
137int
138command_disarm (object *op, char *params)
139{
140 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
141}
142
143 150
144/* A little special because we do want to pass the full params along 151/* A little special because we do want to pass the full params along
145 * as it includes the object to throw. 152 * as it includes the object to throw.
146 */ 153 */
147int 154int
148command_throw (object *op, char *params) 155command_throw (object *op, char *params)
149{ 156{
150 object *skop;
151
152 skop = find_skill_by_name (op, skill_names[SK_THROWING]); 157 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); 158 return do_skill (op, op, skop, op->facing, params);
155 else 159 else
156 {
157 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing."); 160 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing.");
158 } 161
159 return 0; 162 return 0;
160} 163}
161
162 164
163int 165int
164command_apply (object *op, char *params) 166command_apply (object *op, char *params)
165{ 167{
166 if (!params) 168 if (!params)
… …
168 player_apply_below (op); 170 player_apply_below (op);
169 return 0; 171 return 0;
170 } 172 }
171 else 173 else
172 { 174 {
173 apply_flag aflag = (apply_flag) 0; 175 apply_flag aflag = (apply_flag)0;
174 object *inv;
175 176
176 while (*params == ' ') 177 while (*params == ' ')
177 params++; 178 params++;
179
178 if (!strncmp (params, "-a ", 3)) 180 if (!strncmp (params, "-a ", 3))
179 { 181 {
180 aflag = AP_APPLY; 182 aflag = AP_APPLY;
181 params += 3; 183 params += 3;
182 } 184 }
185
183 if (!strncmp (params, "-u ", 3)) 186 if (!strncmp (params, "-u ", 3))
184 { 187 {
185 aflag = AP_UNAPPLY; 188 aflag = AP_UNAPPLY;
186 params += 3; 189 params += 3;
187 } 190 }
191
188 while (*params == ' ') 192 while (*params == ' ')
189 params++; 193 params++;
190 194
191 inv = find_best_apply_object_match (op, params, aflag); 195 if (object *inv = find_best_apply_object_match (op, params, aflag))
192 if (inv)
193 {
194 player_apply (op, inv, aflag, 0); 196 player_apply (op, inv, aflag, 0);
195 }
196 else 197 else
197 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params); 198 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params);
198 } 199 }
200
199 return 0; 201 return 0;
200} 202}
201 203
202/* 204/*
203 * Check if an item op can be put into a sack. If pl exists then tell 205 * 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. 211 * not need to use split_ob and stuff.
210 */ 212 */
211int 213int
212sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 214sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
213{ 215{
214
215 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 216 if (!QUERY_FLAG (sack, FLAG_APPLIED))
216 { 217 {
217 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); 218 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
218 return 0; 219 return 0;
219 } 220 }
221
220 if (sack == op) 222 if (sack == op)
221 { 223 {
222 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack)); 224 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack));
223 return 0; 225 return 0;
224 } 226 }
227
225 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) 228 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
226 { 229 {
227 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); 230 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));
228 return 0; 231 return 0;
229 } 232 }
233
230 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 234 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
231 { 235 {
232 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); 236 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
233 return 0; 237 return 0;
234 } 238 }
239
235 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 240 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
236 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 241 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
237 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 242 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
238 { 243 {
239 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 244 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
240 return 0; 245 return 0;
241 } 246 }
247
242 /* All other checks pass, must be OK */ 248 /* All other checks pass, must be OK */
243 return 1; 249 return 1;
244} 250}
245 251
246/* Pick up commands follow */ 252/* Pick up commands follow */
… …
251 * pick up (0 means all of them) 257 * pick up (0 means all of them)
252 */ 258 */
253static void 259static void
254pick_up_object (object *pl, object *op, object *tmp, int nrof) 260pick_up_object (object *pl, object *op, object *tmp, int nrof)
255{ 261{
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; 262 object *env = tmp->env;
261 uint32 weight, effective_weight_limit; 263 uint32 weight, effective_weight_limit;
262 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 264 int tmp_nrof = tmp->number_of ();
263 265
264 /* IF the player is flying & trying to take the item out of a container 266 /* 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 267 * 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 268 * (sack, luggage, etc), tmp->env->env then points to the player (nested
267 * containers not allowed as of now) 269 * containers not allowed as of now)
268 */ 270 */
269 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 271 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
270 { 272 {
271 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); 273 pl->failmsg ("You are levitating, you can't reach the ground! "
274 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
275 "or waiting till the levitation effect wears off.>");
272 return; 276 return;
273 } 277 }
274 278
275 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 279 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
276 return; 280 return;
277 281
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) 282 if (nrof > tmp_nrof || nrof <= 0)
291 nrof = tmp_nrof; 283 nrof = tmp_nrof;
292 284
293 /* Figure out how much weight this object will add to the player */ 285 /* Figure out how much weight this object will add to the player */
294 weight = tmp->weight * nrof; 286 weight = tmp->weight * nrof;
295 if (tmp->inv) 287 if (tmp->inv)
296 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 288 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
297 289
298 if (pl->stats.Str <= MAX_STAT)
299 effective_weight_limit = weight_limit[pl->stats.Str]; 290 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
300 else
301 effective_weight_limit = weight_limit[MAX_STAT];
302 291
303 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 292 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
304 { 293 {
305 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 294 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
306 return; 295 return;
307 } 296 }
308 297
309 if (nrof != tmp_nrof) 298 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; 299 return;
318 }
319 300
320 /* Tell the client what happened to the rest of objects */ 301 if (QUERY_FLAG (tmp, FLAG_UNPAID))
321 if (pl->contr) 302 {
322 if (tmp2->destroyed ()) 303 tmp->flag.reset (FLAG_UNPAID);
323 esrv_del_item (pl->contr, tmp2->count); 304 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 305 tmp->flag.set (FLAG_UNPAID);
325 esrv_update_item (UPD_NROF, pl, tmp2);
326 } 306 }
327 else 307 else
328 { 308 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 309
338 tmp->remove (); /* Unlink it */ 310 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} 311}
372 312
373/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 313/* modified slightly to allow monsters use this -b.t. 5-31-95 */
374void 314void
375pick_up (object *op, object *alt) 315pick_up (object *op, object *alt)
… …
385 if (!can_pick (op, alt)) 325 if (!can_pick (op, alt))
386 { 326 {
387 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name); 327 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
388 goto leave; 328 goto leave;
389 } 329 }
330
390 tmp = alt; 331 tmp = alt;
391 } 332 }
392 else 333 else
393 { 334 {
394 if (op->below == NULL || !can_pick (op, op->below)) 335 if (op->below == NULL || !can_pick (op, op->below))
… …
403 /* Try to catch it. */ 344 /* Try to catch it. */
404 tmp_map = tmp->map; 345 tmp_map = tmp->map;
405 tmp = stop_item (tmp); 346 tmp = stop_item (tmp);
406 if (tmp == NULL) 347 if (tmp == NULL)
407 goto leave; 348 goto leave;
349
408 need_fix_tmp = 1; 350 need_fix_tmp = 1;
409 if (!can_pick (op, tmp)) 351 if (!can_pick (op, tmp))
410 goto leave; 352 goto leave;
411 353
412 if (op->type == PLAYER) 354 if (op->type == PLAYER)
… …
417 } 359 }
418 else 360 else
419 count = tmp->nrof; 361 count = tmp->nrof;
420 362
421 /* container is open, so use it */ 363 /* container is open, so use it */
364 if (tmp->flag [FLAG_STARTEQUIP])
365 alt = op;
422 if (op->container) 366 else if (op->container)
423 { 367 {
424 alt = op->container; 368 alt = op->container;
425 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 369 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
426 goto leave; 370 goto leave;
427 } 371 }
… …
446 /* here it could be possible to check rent, 390 /* here it could be possible to check rent,
447 * if someone wants to implement it 391 * if someone wants to implement it
448 */ 392 */
449 alt = op; 393 alt = op;
450 } 394 }
395
451#ifdef PICKUP_DEBUG 396#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); 397 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
453#endif 398#endif
454 399
455 /* startequip items are not allowed to be put into containers: */ 400 /* startequip items are not allowed to be put into containers: */
… …
505 450
506 /* Makes processing easier */ 451 /* Makes processing easier */
507 if (params && *params == '\0') 452 if (params && *params == '\0')
508 params = 0; 453 params = 0;
509 454
455 int cnt = MAX_ITEM_PER_DROP;
456
510 while (tmp) 457 while (tmp)
511 { 458 {
512 next = tmp->below; 459 next = tmp->below;
513 460
514 if (tmp->invisible) 461 if (tmp->invisible)
… …
520 /* This following two if and else if could be merged into line 467 /* This following two if and else if could be merged into line
521 * but that probably will make it more difficult to read, and 468 * but that probably will make it more difficult to read, and
522 * not make it any more efficient 469 * not make it any more efficient
523 */ 470 */
524 if (params && item_matched_string (op, tmp, params)) 471 if (params && item_matched_string (op, tmp, params))
472 {
473 if (--cnt < 0) break;
525 pick_up (op, tmp); 474 pick_up (op, tmp);
475 }
526 else if (can_pick (op, tmp) && !params) 476 else if (can_pick (op, tmp) && !params)
527 { 477 {
478 if (--cnt < 0) break;
528 pick_up (op, tmp); 479 pick_up (op, tmp);
529 break; 480 break;
530 } 481 }
531 482
532 tmp = next; 483 tmp = next;
484 }
485
486 if (cnt < 0)
487 {
488 op->failmsg ("Couldn't pick up so many items at once.");
489 return 0;
533 } 490 }
534 491
535 if (!params && !tmp) 492 if (!params && !tmp)
536 { 493 {
537 for (tmp = op->below; tmp; tmp = tmp->below) 494 for (tmp = op->below; tmp; tmp = tmp->below)
538 if (!tmp->invisible) 495 if (!tmp->invisible)
539 { 496 {
540 char buf[MAX_BUF];
541
542 sprintf (buf, "You can't pick up a %s.", &tmp->name); 497 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; 498 break;
545 } 499 }
546 500
547 if (!tmp) 501 if (!tmp)
548 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 502 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
549 } 503 }
550 504
551 return 0; 505 return 0;
552} 506}
553 507
554
555/* 508/*
556 * This function was part of drop, now is own function. 509 * This function was part of drop, now is own function.
557 * Player 'op' tries to put object 'tmp' into sack 'sack', 510 * 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. 511 * if nrof is non zero, then nrof objects is tried to put into sack.
512 *
559 * Note that the 'sack' in question can now be a transport, 513 * Note that the 'sack' in question can now be a transport,
560 * so this function isn't named very good anymore. 514 * so this function isn't named very good anymore.
561 */ 515 */
562void 516void
563put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 517put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
… …
574 return; 528 return;
575 } 529 }
576 530
577 if (tmp->type == CONTAINER && tmp->inv) 531 if (tmp->type == CONTAINER && tmp->inv)
578 { 532 {
579
580 /* Eneq(@csd.uu.se): If the object to be dropped is a container 533 /* 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 534 * we instead move the contents of that container into the active
582 * container, this is only done if the object has something in it. 535 * container, this is only done if the object has something in it.
583 */ 536 */
584 sack2 = tmp; 537 sack2 = tmp;
… …
587 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 540 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
588 { 541 {
589 tmp = tmp2->below; 542 tmp = tmp2->below;
590 543
591 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 544 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))
592 {
593 put_object_in_sack (op, sack, tmp2, 0); 545 put_object_in_sack (op, sack, tmp2, 0);
594 }
595 else 546 else
596 { 547 {
597 sprintf (buf, "Your %s fills up.", query_name (sack)); 548 sprintf (buf, "Your %s fills up.", query_name (sack));
598 new_draw_info (NDI_UNIQUE, 0, op, buf); 549 new_draw_info (NDI_UNIQUE, 0, op, buf);
599 break; 550 break;
600 } 551 }
601 } 552 }
602 553
603 esrv_update_item (UPD_WEIGHT, op, sack2);
604 return; 554 return;
605 } 555 }
606 556
607 /* Don't worry about this for containers - our caller should have 557 /* Don't worry about this for containers - our caller should have
608 * already checked this. 558 * already checked this.
… …
613 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 563 if (QUERY_FLAG (tmp, FLAG_APPLIED))
614 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 564 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
615 return; 565 return;
616 566
617 /* we want to put some portion of the item into the container */ 567 /* we want to put some portion of the item into the container */
618 if (nrof && tmp->nrof != nrof) 568 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; 569 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 570
638 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 571 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); 572 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} 573}
654 574
655/* 575/*
656 * This function was part of drop, now is own function. 576 * This function was part of drop, now is own function.
657 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 577 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
… …
659 * This is used when dropping objects onto the floor. 579 * This is used when dropping objects onto the floor.
660 */ 580 */
661void 581void
662drop_object (object *op, object *tmp, uint32 nrof) 582drop_object (object *op, object *tmp, uint32 nrof)
663{ 583{
664 char buf[MAX_BUF];
665 object *floor;
666
667 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 584 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
668 return; 585 return;
669 586
670 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 587 if (QUERY_FLAG (tmp, FLAG_APPLIED))
671 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 588 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
… …
674 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D 591 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
675 592
676 /* We are only dropping some of the items. We split the current object 593 /* We are only dropping some of the items. We split the current object
677 * off 594 * off
678 */ 595 */
679 if (nrof && tmp->nrof != nrof) 596 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;
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
703 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
704 return; 597 return;
705 598
599 drop_object (op, tmp);
600
601 if (!tmp->destroyed () && !tmp->is_inserted ())
602 {
603 // if nothing happened with the object we give it back
604 op->insert (tmp);
605 }
606}
607
608/* In contrast to drop_object (op, tmp, nrof) above this function takes the
609 * already split off object, and feeds it to the event handlers and does
610 * other magic with it.
611 *
612 * <droppper> is the object that dropped this object and <obj> is the
613 * object that was dropped.
614 *
615 * Make sure to check what happened with <obj> after this function returns!
616 * Otherwise you may leak this object.
617 */
618
619void
620drop_object (object *dropper, object *obj)
621{
622 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
623 return;
624
625 if (obj->destroyed () || obj->is_inserted ())
626 return;
627
706 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 628 if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
707 { 629 {
708 sprintf (buf, "You drop the %s.", query_name (tmp)); 630 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
709 new_draw_info (NDI_UNIQUE, 0, op, buf); 631 dropper->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 632
712 if (op->type == PLAYER)
713 esrv_del_item (op->contr, tmp->count);
714
715 tmp->destroy (); 633 obj->destroy ();
716 op->update_stats (); 634 dropper->update_stats ();
717 return; 635 return;
718 } 636 }
719 637
720 if (op->type == PLAYER) 638 for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
721 esrv_del_item (op->contr, tmp->count); 639 floor;
640 floor = floor->above)
641 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
642 return;
722 643
723 /* Call this before we update the various windows/players. At least 644 if (obj->destroyed () || obj->is_inserted ())
724 * that we, we know the weight is correct. 645 return;
646
647 if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
648 if (!sell_item (obj, dropper))
649 return;
650
651 /* If nothing special happened with this object, the default action is to
652 * insert it below the dropper:
725 */ 653 */
726 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
727 /* in object.c */
728 654
729 if (op->type == PLAYER) 655 obj->x = dropper->x;
730 { 656 obj->y = dropper->y;
731 /* Need to update the weight for the player */
732 esrv_send_item (op, op);
733 op->contr->ns->floorbox_update ();
734 }
735 657
736 for (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)))
738 return;
739
740 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
741 sell_item (tmp, op);
742
743 tmp->x = op->x;
744 tmp->y = op->y;
745
746 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 658 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
747} 659}
748 660
749void 661void
750drop (object *op, object *tmp) 662drop (object *op, object *tmp)
751{ 663{
… …
760 if (tmp->env && tmp->env->type != PLAYER) 672 if (tmp->env && tmp->env->type != PLAYER)
761 { 673 {
762 /* Just toss the object - probably shouldn't be hanging 674 /* Just toss the object - probably shouldn't be hanging
763 * around anyways 675 * around anyways
764 */ 676 */
765 tmp->remove ();
766 tmp->destroy (); 677 tmp->destroy ();
767 return; 678 return;
768 } 679 }
769 else 680 else
770 { 681 {
771 while (tmp != NULL && tmp->invisible) 682 while (tmp && tmp->invisible)
772 tmp = tmp->below; 683 tmp = tmp->below;
773 } 684 }
774 } 685 }
775 686
776 if (tmp == NULL) 687 if (tmp == NULL)
777 { 688 {
778 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 689 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
779 return; 690 return;
780 } 691 }
692
781 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 693 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
782 { 694 {
783 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 695 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
784 return; 696 return;
785 } 697 }
698
786 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 699 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
787 { 700 {
788#if 0 701#if 0
789 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 702 /* 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."); 703 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
… …
814 727
815 if (op->type == PLAYER) 728 if (op->type == PLAYER)
816 op->contr->count = 0; 729 op->contr->count = 0;
817} 730}
818 731
819
820
821/* Command will drop all items that have not been locked */ 732/* Command will drop all items that have not been locked */
822int 733int
823command_dropall (object *op, char *params) 734command_dropall (object *op, char *params)
824{ 735{
825 736
826 object *curinv, *nextinv;
827
828 if (op->inv == NULL) 737 if (op->inv == NULL)
829 { 738 {
830 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 739 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
831 return 0; 740 return 0;
832 } 741 }
833 742
834 curinv = op->inv; 743 object *curinv = op->inv;
744 object *nextinv;
835 745
836 /* 746 /*
837 This is the default. Drops everything not locked or considered 747 This is the default. Drops everything not locked or considered
838 not something that should be dropped. 748 not something that should be dropped.
839 */ 749 */
… …
841 Care must be taken that the next item pointer is not to money as 751 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 752 the drop() routine will do unknown things to it when dropping
843 in a shop. --Tero.Pelander@utu.fi 753 in a shop. --Tero.Pelander@utu.fi
844 */ 754 */
845 755
846 if (params == NULL) 756 int cnt = MAX_ITEM_PER_DROP;
757
758 if (!params)
847 { 759 {
848 while (curinv != NULL) 760 while (curinv)
849 { 761 {
850 nextinv = curinv->below; 762 nextinv = curinv->below;
763
851 while (nextinv && nextinv->type == MONEY) 764 while (nextinv && nextinv->type == MONEY)
852 nextinv = nextinv->below; 765 nextinv = nextinv->below;
766
853 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 767 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
854 curinv->type != FOOD && curinv->type != KEY && 768 curinv->type != FOOD && curinv->type != KEY &&
855 curinv->type != SPECIAL_KEY && curinv->type != GEM && 769 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
856 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 770 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
857 { 771 {
858 drop (op, curinv); 772 drop (op, curinv);
773 if (--cnt <= 0) break;
859 } 774 }
775
860 curinv = nextinv; 776 curinv = nextinv;
861 } 777 }
862 } 778 }
863
864 else if (strcmp (params, "weapons") == 0) 779 else if (strcmp (params, "weapons") == 0)
865 { 780 {
866 while (curinv != NULL) 781 while (curinv)
867 { 782 {
868 nextinv = curinv->below; 783 nextinv = curinv->below;
784
869 while (nextinv && nextinv->type == MONEY) 785 while (nextinv && nextinv->type == MONEY)
870 nextinv = nextinv->below; 786 nextinv = nextinv->below;
787
871 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 788 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
872 { 789 {
873 drop (op, curinv); 790 drop (op, curinv);
791 if (--cnt <= 0) break;
874 } 792 }
793
875 curinv = nextinv; 794 curinv = nextinv;
876 } 795 }
877 } 796 }
878
879 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 797 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
880 { 798 {
881 while (curinv != NULL) 799 while (curinv)
882 { 800 {
883 nextinv = curinv->below; 801 nextinv = curinv->below;
802
884 while (nextinv && nextinv->type == MONEY) 803 while (nextinv && nextinv->type == MONEY)
885 nextinv = nextinv->below; 804 nextinv = nextinv->below;
805
886 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 806 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
887 { 807 {
888 drop (op, curinv); 808 drop (op, curinv);
809 if (--cnt <= 0) break;
889 } 810 }
811
890 curinv = nextinv; 812 curinv = nextinv;
891 } 813 }
892 } 814 }
893
894 else if (strcmp (params, "misc") == 0) 815 else if (strcmp (params, "misc") == 0)
895 { 816 {
896 while (curinv != NULL) 817 while (curinv)
897 { 818 {
898 nextinv = curinv->below; 819 nextinv = curinv->below;
820
899 while (nextinv && nextinv->type == MONEY) 821 while (nextinv && nextinv->type == MONEY)
900 nextinv = nextinv->below; 822 nextinv = nextinv->below;
823
901 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 824 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
902 { 825 {
903 switch (curinv->type) 826 switch (curinv->type)
904 { 827 {
905 case HORN: 828 case HORN:
… …
923 break; 846 break;
924 default: 847 default:
925 curinv = nextinv; 848 curinv = nextinv;
926 break; 849 break;
927 } 850 }
851
852 if (--cnt <= 0) break;
928 } 853 }
854
929 curinv = nextinv; 855 curinv = nextinv;
930 } 856 }
931 } 857 }
932 858
933 op->contr->ns->floorbox_update (); 859 if (cnt <= 0)
860 op->failmsg ("Only dropped some items, can't drop that many items at once.");
934 861
935/* draw_look(op);*/ 862/* draw_look(op);*/
936 return 0; 863 return 0;
864}
865
866
867/* This function tries to drop all objects in the <objs> vector.
868 * <dropper> is the object that wants to drop them.
869 * <cnt> can be a 0 pointer or a pointer to the maximum number of
870 * drop operations to perform.
871 *
872 * Returns true if at least one item was dropped.
873 */
874bool
875drop_vector (object *dropper, vector<object *> &objs, int *cnt)
876{
877 vector<object *>::iterator i;
878
879 bool did_one = false;
880
881 for (i = objs.begin (); i != objs.end (); i++)
882 {
883 drop (dropper, *i);
884 if (cnt && --*cnt <= 0) break;
885 did_one = true;
886 }
887
888 return did_one;
937} 889}
938 890
939/* Object op wants to drop object(s) params. params can be a 891/* Object op wants to drop object(s) params. params can be a
940 * comma seperated list. 892 * comma seperated list.
941 */ 893 */
942
943int 894int
944command_drop (object *op, char *params) 895command_drop (object *op, char *params)
945{ 896{
946 object *tmp, *next; 897 object *tmp, *next;
947 int did_one = 0; 898 int did_one = 0;
… …
951 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 902 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
952 return 0; 903 return 0;
953 } 904 }
954 else 905 else
955 { 906 {
907 vector<object *> matched_objs;
908
956 for (tmp = op->inv; tmp; tmp = next) 909 for (tmp = op->inv; tmp; tmp = next)
957 { 910 {
958 next = tmp->below; 911 next = tmp->below;
959 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 912 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
960 continue; 913 continue;
914
961 if (item_matched_string (op, tmp, params)) 915 if (item_matched_string (op, tmp, params))
962 { 916 matched_objs.push_back (tmp);
963 drop (op, tmp);
964 did_one = 1;
965 } 917 }
966 } 918
967 if (!did_one) 919 int cnt = MAX_ITEM_PER_DROP;
920
921 if (!drop_vector (op, matched_objs, &cnt))
968 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 922 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
969 } 923
970 if (op->type == PLAYER) 924 if (cnt <= 0)
971 { 925 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 }; 926 }
975 927
976/* draw_look(op);*/
977 return 0; 928 return 0;
978} 929}
979 930
980int 931int
981command_examine (object *op, char *params) 932command_examine (object *op, char *params)
… …
984 { 935 {
985 object *tmp = op->below; 936 object *tmp = op->below;
986 937
987 while (tmp && !tmp->client_visible ()) 938 while (tmp && !tmp->client_visible ())
988 tmp = tmp->below; 939 tmp = tmp->below;
940
989 if (tmp) 941 if (tmp)
990 examine (op, tmp); 942 examine (op, tmp);
991 } 943 }
992 else 944 else
993 { 945 {
994 object *tmp = find_best_object_match (op, params); 946 object *tmp = find_best_object_match (op, params);
995 947
996 if (tmp) 948 if (tmp)
997 examine (op, tmp); 949 examine (op, tmp);
998 else 950 else
999 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params); 951 op->contr->infobox (MSG_CHANNEL ("examine"), format ("Could not find an object that matches %s", params));
1000 } 952 }
953
1001 return 0; 954 return 0;
1002} 955}
1003 956
1004/* op should be a player. 957/* op should be a player.
1005 * we return the object the player has marked with the 'mark' command 958 * we return the object the player has marked with the 'mark' command
… …
1052 dynbuf_text buf (512, 512); 1005 dynbuf_text buf (512, 512);
1053 1006
1054 object *mon = head ? head : this; 1007 object *mon = head ? head : this;
1055 1008
1056 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 1009 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1057 buf << "It is an undead force.\n"; 1010 buf << "It is an undead force.\r";
1058 1011
1059 if (mon->level > who->level) 1012 if (mon->level > who->level)
1060 buf << "It is likely more powerful than you.\n"; 1013 buf << "It is likely more powerful than you.\r";
1061 else if (mon->level < who->level) 1014 else if (mon->level < who->level)
1062 buf << "It is likely less powerful than you.\n"; 1015 buf << "It is likely less powerful than you.\r";
1063 else 1016 else
1064 buf << "It is probably as powerful as you.\n"; 1017 buf << "It is probably as powerful as you.\r";
1065 1018
1066 if (mon->attacktype & AT_ACID) 1019 if (mon->attacktype & AT_ACID)
1067 buf << "You seem to smell an acrid odor.\n"; 1020 buf << "You seem to smell an acrid odor.\r";
1068 1021
1069 /* Anyone know why this used to use the clone value instead of the 1022 /* 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. 1023 * maxhp field? This seems that it should give more accurate results.
1071 */ 1024 */
1072 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 1025 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1073 { /* From 1-4 */ 1026 { /* From 1-4 */
1074 case 1: 1027 case 1:
1075 buf << "It is in a bad shape.\n"; 1028 buf << "It is in a bad shape.\r";
1076 break; 1029 break;
1077 case 2: 1030 case 2:
1078 buf << "It is hurt.\n"; 1031 buf << "It is hurt.\r";
1079 break; 1032 break;
1080 case 3: 1033 case 3:
1081 buf << "It is somewhat hurt.\n"; 1034 buf << "It is somewhat hurt.\r";
1082 break; 1035 break;
1083 case 4: 1036 case 4:
1084 buf << "It is in excellent shape.\n"; 1037 buf << "It is in excellent shape.\r";
1085 break; 1038 break;
1086 } 1039 }
1087 1040
1088 if (present_in_ob (POISONING, mon)) 1041 if (present_in_ob (POISONING, mon))
1089 buf << "It looks very ill.\n"; 1042 buf << "It looks very ill.\r";
1043
1044 buf << '\n';
1090 1045
1091 return buf; 1046 return buf;
1092} 1047}
1093 1048
1094/* tmp is the object being described, pl is who is examing it. */ 1049/* tmp is the object being described, pl is who is examing it. */
… …
1101} 1056}
1102 1057
1103std::string 1058std::string
1104object::long_desc (object *who) 1059object::long_desc (object *who)
1105{ 1060{
1106 std::string buf (query_name (this)); 1061 std::string buf (query_name ());
1107 1062
1108 switch (type) 1063 switch (type)
1109 { 1064 {
1110 case RING: 1065 case RING:
1111 case SKILL: 1066 case SKILL:
… …
1123 case CLOAK: 1078 case CLOAK:
1124 case FOOD: 1079 case FOOD:
1125 case DRINK: 1080 case DRINK:
1126 case FLESH: 1081 case FLESH:
1127 case SKILL_TOOL: 1082 case SKILL_TOOL:
1083 case LAMP:
1128 case POWER_CRYSTAL: 1084 case POWER_CRYSTAL:
1129 { 1085 {
1130 const char *cp = ::describe_item (this, who); 1086 const char *cp = ::describe_item (this, who);
1131 1087
1132 if (*cp) 1088 if (*cp)
… …
1152std::string 1108std::string
1153object::describe (object *who) 1109object::describe (object *who)
1154{ 1110{
1155 dynbuf_text buf (1024, 1024); 1111 dynbuf_text buf (1024, 1024);
1156 1112
1157 buf.printf ("That is: %s.\n", long_desc (who).c_str ()); 1113 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1158 1114
1159 if (custom_name) 1115 if (custom_name)
1160 buf,printf ("You call it %s\n", &custom_name); 1116 buf.printf ("You call it %s.\r", &custom_name);
1161 1117
1162 switch (type) 1118 switch (type)
1163 { 1119 {
1164 case SPELLBOOK: 1120 case SPELLBOOK:
1165 if (flag [FLAG_IDENTIFIED] && inv) 1121 if (flag [FLAG_IDENTIFIED] && inv)
1166 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill); 1122 buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1167 break; 1123 break;
1168 1124
1169 case BOOK: 1125 case BOOK:
1170 if (msg) 1126 if (msg)
1171 buf << "Something is written in it.\n"; 1127 buf << "Something is written in it.\r";
1172 break; 1128 break;
1173 1129
1174 case CONTAINER: 1130 case CONTAINER:
1175 if (race != NULL) 1131 if (race)
1176 { 1132 {
1177 if (weight_limit && stats.Str < 100) 1133 if (weight_limit && stats.Str < 100)
1178 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n", 1134 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1179 &race, weight_limit / (10.0 * (100 - stats.Str))); 1135 &race, weight_limit / (10.0 * (100 - stats.Str)));
1180 else 1136 else
1181 buf.printf ("It can hold only %s.\n", &race); 1137 buf.printf ("It can hold only %s.\r", &race);
1182 } 1138 }
1183 else if (weight_limit && stats.Str < 100) 1139 else if (weight_limit && stats.Str < 100)
1184 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str))); 1140 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1185 break; 1141 break;
1186 1142
1187 case WAND: 1143 case WAND:
1188 if (flag [FLAG_IDENTIFIED]) 1144 if (flag [FLAG_IDENTIFIED])
1189 buf.printf ("It has %d charges left.\n", stats.food); 1145 buf.printf ("It has %d charges left.\r", stats.food);
1190 break; 1146 break;
1191 } 1147 }
1192 1148
1193 if (materialname && !msg) 1149 if (materialname && !msg)
1194 buf.printf ("It is made of: %s.\n", &materialname); 1150 buf.printf ("It is made of: %s.\r", &materialname);
1195 1151
1196 if (who) 1152 if (who)
1197 /* Where to wear this item */ 1153 /* Where to wear this item */
1198 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1154 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1199 if (slot[i].info) 1155 if (slot[i].info)
1200 { 1156 {
1201 buf << "It goes ";
1202 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name); 1157 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1203 1158
1204 if (slot[i].info < -1 && who->slot[i].info) 1159 if (slot[i].info < -1 && who->slot[i].info)
1205 buf.printf ("(%d)", -slot[i].info); 1160 buf.printf ("(%d)", -slot[i].info);
1206 1161
1207 buf << ".\n"; 1162 buf << ".\r";
1208 } 1163 }
1209 1164
1210 if (weight) 1165 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); 1166 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1212 1167
1213 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) 1168 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1214 { 1169 {
1215 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX)); 1170 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1216 1171
1217 if (is_in_shop (who)) 1172 if (is_in_shop (who))
1218 { 1173 {
1219 if (flag [FLAG_UNPAID]) 1174 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)); 1175 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1221 else 1176 else
1222 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it"); 1177 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1223 } 1178 }
1224 } 1179 }
1225 1180
1226 if (flag [FLAG_MONSTER]) 1181 if (flag [FLAG_MONSTER])
1227 buf << describe_monster (who); 1182 buf << describe_monster (who);
1228 1183
1229 /* Is this item buildable? */ 1184 /* Is this item buildable? */
1230 if (flag [FLAG_IS_BUILDABLE]) 1185 if (flag [FLAG_IS_BUILDABLE])
1231 buf << "This is a buildable item.\n"; 1186 buf << "This is a buildable item.\r";
1232 1187
1233 /* Does the object have a message? Don't show message for all object 1188 /* Does the object have a message? Don't show message for all object
1234 * types - especially if the first entry is a match 1189 * types - especially if the first entry is a match
1235 */ 1190 */
1236 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && strncasecmp (msg, "@match", 7)) 1191 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1237 { 1192 {
1238 /* This is just a hack so when identifying the items, we print 1193 /* This is just a hack so when identifying the items, we print
1239 * out the extra message 1194 * out the extra message
1240 */ 1195 */
1241 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1196 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1242 buf << "The object has a story:\n"; 1197 buf << "The object has a story:\r";
1243 1198
1244 buf << msg << '\n'; 1199 buf << msg << '\n';
1245 } 1200 }
1246 1201
1247 buf << '\n'; 1202 buf << '\n';
1248 1203
1249 return std::string (buf.linearise (), buf.size ()); 1204 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} 1205}
1329 1206
1330static void 1207static void
1331display_new_pickup (object *op) 1208display_new_pickup (object *op)
1332{ 1209{
1333 int i = op->contr->mode; 1210 int i = op->contr->mode;
1334 1211
1335 if (!(i & PU_NEWMODE))
1336 return;
1337
1338 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1339 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0); 1212 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1340 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0); 1213 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1341 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0); 1214 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1342 1215
1343 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5); 1216 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
… …
1394 }; 1267 };
1395 1268
1396 if (!params) 1269 if (!params)
1397 { 1270 {
1398 /* if the new mode is used, just print the settings */ 1271 /* if the new mode is used, just print the settings */
1399 if (op->contr->mode & PU_NEWMODE)
1400 {
1401 display_new_pickup (op); 1272 display_new_pickup (op);
1402 return 1;
1403 }
1404 if (1)
1405 LOG (llevDebug, "command_pickup: !params\n");
1406 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1407 return 0; 1273 return 0;
1408 } 1274 }
1409 1275
1410 while (*params == ' ' && *params) 1276 while (*params == ' ' && *params)
1411 params++; 1277 params++;
… …
1417 for (mode = 0; names[mode]; mode++) 1283 for (mode = 0; names[mode]; mode++)
1418 { 1284 {
1419 if (!strcmp (names[mode], params + 1)) 1285 if (!strcmp (names[mode], params + 1))
1420 { 1286 {
1421 i = op->contr->mode; 1287 i = op->contr->mode;
1422 if (!(i & PU_NEWMODE)) 1288
1423 i = PU_NEWMODE;
1424 if (*params == '+') 1289 if (*params == '+')
1425 i = i | modes[mode]; 1290 i = i | modes[mode];
1426 else 1291 else
1427 i = i & ~modes[mode]; 1292 i = i & ~modes[mode];
1293
1428 op->contr->mode = i; 1294 op->contr->mode = i;
1429 display_new_pickup (op); 1295 display_new_pickup (op);
1430 return 1; 1296 return 1;
1431 } 1297 }
1432 } 1298 }
… …
1434 return 1; 1300 return 1;
1435 } 1301 }
1436 1302
1437 if (sscanf (params, "%u", &i) != 1) 1303 if (sscanf (params, "%u", &i) != 1)
1438 { 1304 {
1439 if (1)
1440 LOG (llevDebug, "command_pickup: params==NULL\n");
1441 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> ."); 1305 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1442 return 1; 1306 return 1;
1443 } 1307 }
1444 set_pickup_mode (op, i); 1308
1309 if (i <= PU_RATIO)
1310 i |= op->contr->mode & ~PU_RATIO;
1311
1312 op->contr->mode = i;
1445 1313
1446 return 1; 1314 return 1;
1447}
1448
1449void
1450set_pickup_mode (object *op, int i)
1451{
1452 switch (op->contr->mode = i)
1453 {
1454 case 0:
1455 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1456 break;
1457 case 1:
1458 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1459 break;
1460 case 2:
1461 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1462 break;
1463 case 3:
1464 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1465 break;
1466 case 4:
1467 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1468 break;
1469 case 5:
1470 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1471 break;
1472 case 6:
1473 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1474 break;
1475 case 7:
1476 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1477 break;
1478 }
1479} 1315}
1480 1316
1481int 1317int
1482command_search_items (object *op, char *params) 1318command_search_items (object *op, char *params)
1483{ 1319{
1484 char buf[MAX_BUF]; 1320 char buf[MAX_BUF];
1485 1321
1486 if (settings.search_items == FALSE)
1487 return 1;
1488
1489 if (params == NULL) 1322 if (params == NULL)
1490 { 1323 {
1491 if (op->contr->search_str[0] == '\0') 1324 if (op->contr->search_str[0] == '\0')
1492 { 1325 {
1493 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1326 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1494 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all"); 1327 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1495 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'."); 1328 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1496 return 1; 1329 return 1;
1497 } 1330 }
1498 1331
… …
1500 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1333 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1501 op->update_stats (); 1334 op->update_stats ();
1502 return 1; 1335 return 1;
1503 } 1336 }
1504 1337
1505 if ((int) strlen (params) >= MAX_BUF) 1338 if (strlen (params) >= MAX_BUF)
1506 { 1339 {
1507 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1340 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1508 return 1; 1341 return 1;
1509 } 1342 }
1510 1343
1511 strcpy (op->contr->search_str, params); 1344 strcpy (op->contr->search_str, params);
1512 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1345 sprintf (buf, "Now searching for '%s'.", op->contr->search_str);
1513 new_draw_info (NDI_UNIQUE, 0, op, buf); 1346 new_draw_info (NDI_UNIQUE, 0, op, buf);
1514 op->update_stats (); 1347 op->update_stats ();
1348
1515 return 1; 1349 return 1;
1516} 1350}
1517 1351

Diff Legend

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