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.61 by elmex, Mon Nov 26 11:41:02 2007 UTC vs.
Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* 25/*
25 * Object (handling) commands 26 * Object (handling) commands
26 */ 27 */
27 28
28#include <global.h> 29#include <global.h>
29#include <loader.h>
30#include <skills.h> 30#include <skills.h>
31#include <sproto.h> 31#include <sproto.h>
32#include <living.h> 32#include <living.h>
33#include <math.h>
34 33
35/* 34/*
36 * Object id parsing functions 35 * Object id parsing functions
37 */ 36 */
38 37
… …
91find_best_object_match (object *pl, const char *params) 90find_best_object_match (object *pl, const char *params)
92{ 91{
93 return find_best_apply_object_match (pl, params, AP_TOGGLE); 92 return find_best_apply_object_match (pl, params, AP_TOGGLE);
94} 93}
95 94
95static bool
96can_split (object *pl, object *&op, sint32 nrof)
97{
98 if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
99 {
100 op = tmp;
101 return true;
102 }
103 else
104 {
105 if (op->nrof > 1)
106 new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %s.", op->nrof, &op->name_pl);
107 else
108 new_draw_info_format (NDI_UNIQUE, 0, pl, "There is only one %s.", &op->name);
109
110 return false;
111 }
112}
113
96int 114int
97command_uskill (object *pl, char *params) 115command_uskill (object *pl, char *params)
98{ 116{
99 if (!params) 117 if (!params)
100 { 118 {
… …
114 { 132 {
115 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); 133 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
116 return 0; 134 return 0;
117 } 135 }
118 136
119 skill = find_skill_by_name (pl, params); 137 skill = find_skill_by_name_fuzzy (pl, params);
120 138
121 if (!skill) 139 if (!skill)
122 { 140 {
123 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 141 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the %s skill.", params);
124 return 0; 142 return 0;
125 } 143 }
126 144
127 pl->change_skill (0); 145 pl->apply (skill);
128 apply_special (pl, skill, AP_APPLY);
129 return 1; 146 return 1;
130}
131
132/* These functions (command_search, command_disarm) are really just wrappers for
133 * things like 'use_skill ...'). In fact, they should really be obsoleted
134 * and replaced with those.
135 */
136int
137command_search (object *op, char *params)
138{
139 return use_skill (op, skill_names[SK_FIND_TRAPS]);
140}
141
142int
143command_disarm (object *op, char *params)
144{
145 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
146} 147}
147 148
148/* A little special because we do want to pass the full params along 149/* A little special because we do want to pass the full params along
149 * as it includes the object to throw. 150 * as it includes the object to throw.
150 */ 151 */
… …
152command_throw (object *op, char *params) 153command_throw (object *op, char *params)
153{ 154{
154 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING])) 155 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))
155 return do_skill (op, op, skop, op->facing, params); 156 return do_skill (op, op, skop, op->facing, params);
156 else 157 else
157 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing."); 158 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the throwing skill.");
158 159
159 return 0; 160 return 0;
160} 161}
161 162
162int 163int
… …
188 189
189 while (*params == ' ') 190 while (*params == ' ')
190 params++; 191 params++;
191 192
192 if (object *inv = find_best_apply_object_match (op, params, aflag)) 193 if (object *inv = find_best_apply_object_match (op, params, aflag))
193 player_apply (op, inv, aflag, 0); 194 op->apply (inv, aflag);
194 else 195 else
195 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params); 196 op->failmsgf ("Could not find any match to the %s.", params);
196 } 197 }
197 198
198 return 0; 199 return 0;
199} 200}
200 201
… …
208 * not need to use split_ob and stuff. 209 * not need to use split_ob and stuff.
209 */ 210 */
210int 211int
211sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 212sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
212{ 213{
213
214 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 214 if (!QUERY_FLAG (sack, FLAG_APPLIED))
215 { 215 {
216 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); 216 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
217 return 0; 217 return 0;
218 } 218 }
219
219 if (sack == op) 220 if (sack == op)
220 { 221 {
221 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack)); 222 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack));
222 return 0; 223 return 0;
223 } 224 }
225
224 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) 226 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
225 { 227 {
226 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); 228 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can only put objects of type '%s' into the %s.", &sack->race, query_name (sack));
227 return 0; 229 return 0;
228 } 230 }
231
229 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 232 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
230 { 233 {
231 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); 234 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
232 return 0; 235 return 0;
233 } 236 }
237
234 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 238 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
235 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 239 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
236 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 240 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
237 { 241 {
238 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 242 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
239 return 0; 243 return 0;
240 } 244 }
245
241 /* All other checks pass, must be OK */ 246 /* All other checks pass, must be OK */
242 return 1; 247 return 1;
243} 248}
244 249
245/* Pick up commands follow */ 250/* Pick up commands follow */
… …
250 * pick up (0 means all of them) 255 * pick up (0 means all of them)
251 */ 256 */
252static void 257static void
253pick_up_object (object *pl, object *op, object *tmp, int nrof) 258pick_up_object (object *pl, object *op, object *tmp, int nrof)
254{ 259{
255 /* buf needs to be big (more than 256 chars) because you can get
256 * very long item names.
257 */
258 char buf[HUGE_BUF];
259 object *env = tmp->env; 260 object *env = tmp->env;
260 uint32 weight, effective_weight_limit; 261 uint32 weight, effective_weight_limit;
261 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 262 int tmp_nrof = tmp->number_of ();
262 263
263 /* IF the player is flying & trying to take the item out of a container 264 /* IF the player is flying & trying to take the item out of a container
264 * that is in his inventory, let him. tmp->env points to the container 265 * that is in his inventory, let him. tmp->env points to the container
265 * (sack, luggage, etc), tmp->env->env then points to the player (nested 266 * (sack, luggage, etc), tmp->env->env then points to the player (nested
266 * containers not allowed as of now) 267 * containers not allowed as of now)
267 */ 268 */
268 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 269 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
269 { 270 {
270 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); 271 pl->failmsg ("You are levitating, you can't reach the ground! "
272 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
273 "or waiting till the levitation effect wears off.>");
271 return; 274 return;
272 } 275 }
273 276
274 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 277 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
275 return; 278 return;
276 279
277 if (nrof > tmp_nrof || nrof == 0) 280 if (nrof > tmp_nrof || nrof <= 0)
278 nrof = tmp_nrof; 281 nrof = tmp_nrof;
279 282
280 /* Figure out how much weight this object will add to the player */ 283 /* Figure out how much weight this object will add to the player */
281 weight = tmp->weight * nrof; 284 weight = tmp->weight * nrof;
282 if (tmp->inv) 285 if (tmp->inv)
283 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 286 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
284 287
285 if (pl->stats.Str <= MAX_STAT)
286 effective_weight_limit = weight_limit[pl->stats.Str]; 288 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
287 else
288 effective_weight_limit = weight_limit[MAX_STAT];
289 289
290 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 290 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
291 { 291 {
292 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 292 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
293 return; 293 return;
294 } 294 }
295 295
296 if (nrof != tmp_nrof) 296 if (!can_split (pl, tmp, nrof))
297 {
298 object *tmp2 = tmp;
299
300 tmp = get_split_ob (tmp, nrof);
301 if (!tmp)
302 {
303 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
304 return; 297 return;
305 }
306 298
307 /* Tell the client what happened to the rest of objects */ 299 if (QUERY_FLAG (tmp, FLAG_UNPAID))
308 if (pl->contr) 300 {
309 if (tmp2->destroyed ()) 301 tmp->flag.reset (FLAG_UNPAID);
310 esrv_del_item (pl->contr, tmp2->count); 302 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));
311 else 303 tmp->flag.set (FLAG_UNPAID);
312 esrv_update_item (UPD_NROF, pl, tmp2);
313 } 304 }
314 else 305 else
315 { 306 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
316 /* If the object is in a container, send a delete to the client.
317 * - we are moving all the items from the container to elsewhere,
318 * so it needs to be deleted.
319 */
320 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
321 {
322 if (tmp->env && pl->type == PLAYER)
323 esrv_del_item (pl->contr, tmp->count);
324 307
325 tmp->remove (); /* Unlink it */ 308 op->insert (tmp);
326 }
327 }
328
329 if (QUERY_FLAG (tmp, FLAG_UNPAID))
330 sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
331 else
332 sprintf (buf, "You pick up the %s.", query_name (tmp));
333
334 new_draw_info (NDI_UNIQUE, 0, pl, buf);
335
336 tmp = insert_ob_in_ob (tmp, op);
337
338 /* All the stuff below deals with client/server code, and is only
339 * usable by players
340 */
341 if (pl->contr)
342 {
343 esrv_send_item (pl, tmp);
344
345 /* These are needed to update the weight for the container we
346 * are putting the object in.
347 */
348 if (op != pl)
349 {
350 esrv_update_item (UPD_WEIGHT, pl, op);
351 esrv_send_item (pl, pl);
352 }
353
354 /* Update the container the object was in */
355 if (env && env != pl && env != op)
356 esrv_update_item (UPD_WEIGHT, pl, env);
357 }
358} 309}
359 310
360/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 311/* modified slightly to allow monsters use this -b.t. 5-31-95 */
361void 312void
362pick_up (object *op, object *alt) 313pick_up (object *op, object *alt)
… …
372 if (!can_pick (op, alt)) 323 if (!can_pick (op, alt))
373 { 324 {
374 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name); 325 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
375 goto leave; 326 goto leave;
376 } 327 }
328
377 tmp = alt; 329 tmp = alt;
378 } 330 }
379 else 331 else
380 { 332 {
381 if (op->below == NULL || !can_pick (op, op->below)) 333 if (op->below == NULL || !can_pick (op, op->below))
… …
390 /* Try to catch it. */ 342 /* Try to catch it. */
391 tmp_map = tmp->map; 343 tmp_map = tmp->map;
392 tmp = stop_item (tmp); 344 tmp = stop_item (tmp);
393 if (tmp == NULL) 345 if (tmp == NULL)
394 goto leave; 346 goto leave;
347
395 need_fix_tmp = 1; 348 need_fix_tmp = 1;
396 if (!can_pick (op, tmp)) 349 if (!can_pick (op, tmp))
397 goto leave; 350 goto leave;
398 351
399 if (op->type == PLAYER) 352 if (op->type == PLAYER)
… …
404 } 357 }
405 else 358 else
406 count = tmp->nrof; 359 count = tmp->nrof;
407 360
408 /* container is open, so use it */ 361 /* container is open, so use it */
409 if (op->container) 362 if (tmp->flag [FLAG_STARTEQUIP])
363 alt = op;
364 else if ((alt = op->container_ ()))
410 { 365 {
411 alt = op->container;
412 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 366 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
413 goto leave; 367 goto leave;
414 } 368 }
415 else 369 else
416 { /* non container pickup */ 370 { /* non container pickup */
… …
433 /* here it could be possible to check rent, 387 /* here it could be possible to check rent,
434 * if someone wants to implement it 388 * if someone wants to implement it
435 */ 389 */
436 alt = op; 390 alt = op;
437 } 391 }
392
438#ifdef PICKUP_DEBUG 393#ifdef PICKUP_DEBUG
439 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); 394 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
440#endif 395#endif
441 396
442 /* startequip items are not allowed to be put into containers: */ 397 /* startequip items are not allowed to be put into containers: */
… …
469int 424int
470command_take (object *op, char *params) 425command_take (object *op, char *params)
471{ 426{
472 object *tmp, *next; 427 object *tmp, *next;
473 428
474 if (op->container) 429 if (op->container_ ())
475 tmp = op->container->inv; 430 tmp = op->container_ ()->inv;
476 else 431 else
477 { 432 {
478 tmp = op->above; 433 tmp = op->above;
479 if (tmp) 434 if (tmp)
480 while (tmp->above) 435 while (tmp->above)
… …
491 } 446 }
492 447
493 /* Makes processing easier */ 448 /* Makes processing easier */
494 if (params && *params == '\0') 449 if (params && *params == '\0')
495 params = 0; 450 params = 0;
451
452 int cnt = MAX_ITEM_PER_ACTION;
496 453
497 while (tmp) 454 while (tmp)
498 { 455 {
499 next = tmp->below; 456 next = tmp->below;
500 457
… …
507 /* This following two if and else if could be merged into line 464 /* This following two if and else if could be merged into line
508 * but that probably will make it more difficult to read, and 465 * but that probably will make it more difficult to read, and
509 * not make it any more efficient 466 * not make it any more efficient
510 */ 467 */
511 if (params && item_matched_string (op, tmp, params)) 468 if (params && item_matched_string (op, tmp, params))
469 {
470 if (--cnt < 0) break;
512 pick_up (op, tmp); 471 pick_up (op, tmp);
472 }
513 else if (can_pick (op, tmp) && !params) 473 else if (can_pick (op, tmp) && !params)
514 { 474 {
475 if (--cnt < 0) break;
515 pick_up (op, tmp); 476 pick_up (op, tmp);
516 break; 477 break;
517 } 478 }
518 479
519 tmp = next; 480 tmp = next;
481 }
482
483 if (cnt < 0)
484 {
485 op->failmsg ("Couldn't pick up so many items at once.");
486 return 0;
520 } 487 }
521 488
522 if (!params && !tmp) 489 if (!params && !tmp)
523 { 490 {
524 for (tmp = op->below; tmp; tmp = tmp->below) 491 for (tmp = op->below; tmp; tmp = tmp->below)
525 if (!tmp->invisible) 492 if (!tmp->invisible)
526 { 493 {
527 char buf[MAX_BUF];
528
529 sprintf (buf, "You can't pick up a %s.", &tmp->name); 494 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up a %s.", &tmp->name);
530 new_draw_info (NDI_UNIQUE, 0, op, buf);
531 break; 495 break;
532 } 496 }
533 497
534 if (!tmp) 498 if (!tmp)
535 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 499 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
536 } 500 }
537 501
538 return 0; 502 return 0;
539} 503}
540 504
541
542/* 505/*
543 * This function was part of drop, now is own function. 506 * This function was part of drop, now is own function.
544 * Player 'op' tries to put object 'tmp' into sack 'sack', 507 * Player 'op' tries to put object 'tmp' into sack 'sack',
545 * if nrof is non zero, then nrof objects is tried to put into sack. 508 * if nrof is non zero, then nrof objects is tried to put into sack.
509 *
546 * Note that the 'sack' in question can now be a transport, 510 * Note that the 'sack' in question can now be a transport,
547 * so this function isn't named very good anymore. 511 * so this function isn't named very good anymore.
548 */ 512 */
549void 513void
550put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 514put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
… …
553 char buf[MAX_BUF]; 517 char buf[MAX_BUF];
554 518
555 if (sack == tmp) 519 if (sack == tmp)
556 return; /* Can't put an object in itself */ 520 return; /* Can't put an object in itself */
557 521
558 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 522 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP))
559 { 523 {
560 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack)); 524 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
561 return; 525 return;
562 } 526 }
563 527
564 if (tmp->type == CONTAINER && tmp->inv) 528 if (tmp->type == CONTAINER && tmp->inv)
565 { 529 {
566
567 /* Eneq(@csd.uu.se): If the object to be dropped is a container 530 /* Eneq(@csd.uu.se): If the object to be dropped is a container
568 * we instead move the contents of that container into the active 531 * we instead move the contents of that container into the active
569 * container, this is only done if the object has something in it. 532 * container, this is only done if the object has something in it.
570 */ 533 */
571 sack2 = tmp; 534 sack2 = tmp;
… …
573 536
574 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 537 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
575 { 538 {
576 tmp = tmp2->below; 539 tmp = tmp2->below;
577 540
578 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 541 if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
579 {
580 put_object_in_sack (op, sack, tmp2, 0); 542 put_object_in_sack (op, sack, tmp2, 0);
581 }
582 else 543 else
583 { 544 {
584 sprintf (buf, "Your %s fills up.", query_name (sack)); 545 sprintf (buf, "Your %s fills up.", query_name (sack));
585 new_draw_info (NDI_UNIQUE, 0, op, buf); 546 new_draw_info (NDI_UNIQUE, 0, op, buf);
586 break; 547 break;
587 } 548 }
588 } 549 }
589 550
590 esrv_update_item (UPD_WEIGHT, op, sack2);
591 return; 551 return;
592 } 552 }
593 553
594 /* Don't worry about this for containers - our caller should have 554 /* Don't worry about this for containers - our caller should have
595 * already checked this. 555 * already checked this.
596 */ 556 */
597 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof))) 557 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
598 return; 558 return;
599 559
600 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 560 if (QUERY_FLAG (tmp, FLAG_APPLIED))
601 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 561 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
602 return; 562 return;
603 563
604 /* we want to put some portion of the item into the container */ 564 /* we want to put some portion of the item into the container */
605 if (nrof && tmp->nrof != nrof) 565 if (!can_split (op, tmp, nrof))
606 {
607 object *tmp2 = tmp;
608
609 tmp = get_split_ob (tmp, nrof);
610
611 if (!tmp)
612 {
613 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
614 return; 566 return;
615 }
616 /* Tell a client what happened other objects */
617 if (tmp2->destroyed ())
618 esrv_del_item (op->contr, tmp2->count);
619 else /* this can proably be replaced with an update */
620 esrv_send_item (op, tmp2);
621 }
622 else
623 tmp->remove ();
624 567
625 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 568 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
626 tmp2 = insert_ob_in_ob (tmp, sack); 569 sack->insert (tmp);
627 op->update_stats (); /* This is overkill, fix_player() is called somewhere */ 570}
628 /* in object.c */
629 571
630 /* If an object merged (and thus, different object), we need to 572/* In contrast to drop_object (op, tmp, nrof) above this function takes the
631 * delete the original. 573 * already split off object, and feeds it to the event handlers and does
574 * other magic with it.
575 *
576 * <droppper> is the object that dropped this object and <obj> is the
577 * object that was dropped.
578 *
579 * Make sure to check what happened with <obj> after this function returns!
580 * Otherwise you may leak this object.
581 */
582void
583drop_object (object *dropper, object *obj)
584{
585 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
586 return;
587
588 if (obj->destroyed () || obj->is_inserted ())
589 return;
590
591 if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
592 {
593 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
594 dropper->statusmsg ("The god who lent it to you retrieves it.");
595
596 obj->destroy ();
597 dropper->update_stats ();
598 return;
599 }
600
601 for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
602 floor;
603 floor = floor->above)
604 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
605 return;
606
607 if (obj->destroyed () || obj->is_inserted ())
608 return;
609
610 if (dropper->is_in_shop () && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
611 if (!sell_item (obj, dropper))
612 return;
613
614 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
615 return;
616
617 /* If nothing special happened with this object, the default action is to
618 * insert it below the dropper:
632 */ 619 */
633 if (tmp2 != tmp)
634 esrv_del_item (op->contr, tmp->count);
635 620
636 esrv_send_item (op, tmp2); 621 obj->x = dropper->x;
622 obj->y = dropper->y;
637 623
638 /* update the sacks weight */ 624 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
639 esrv_update_item (UPD_WEIGHT, op, sack);
640} 625}
641 626
642/* 627/*
643 * This function was part of drop, now is own function. 628 * This function was part of drop, now is own function.
644 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 629 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
645 * nrof objects is tried to dropped. 630 * nrof objects are tried to drop.
646 * This is used when dropping objects onto the floor. 631 * This is used when dropping objects onto the floor.
647 */ 632 */
648void 633void
649drop_object (object *op, object *tmp, uint32 nrof) 634drop_object (object *op, object *tmp, uint32 nrof)
650{ 635{
651 char buf[MAX_BUF];
652 object *floor;
653
654 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 636 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
655 return; 637 return;
656 638
657 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 639 if (QUERY_FLAG (tmp, FLAG_APPLIED))
658 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 640 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
659 return; /* can't unapply it */ 641 return; /* can't unapply it */
660
661 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
662 642
663 /* We are only dropping some of the items. We split the current object 643 /* We are only dropping some of the items. We split the current object
664 * off 644 * off
665 */ 645 */
666 if (nrof && tmp->nrof != nrof) 646 if (!can_split (op, tmp, nrof))
667 {
668 object *tmp2 = tmp;
669
670 tmp = get_split_ob (tmp, nrof);
671 if (!tmp)
672 {
673 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
674 return;
675 }
676 /* Tell a client what happened rest of objects. tmp2 is now the
677 * original object
678 */
679 if (op->type == PLAYER)
680 {
681 if (tmp2->destroyed ())
682 esrv_del_item (op->contr, tmp2->count);
683 else
684 esrv_send_item (op, tmp2);
685 }
686 }
687 else
688 tmp->remove ();
689
690 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
691 return; 647 return;
692 648
693 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 649 drop_object (op, tmp);
694 {
695 sprintf (buf, "You drop the %s.", query_name (tmp));
696 new_draw_info (NDI_UNIQUE, 0, op, buf);
697 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
698 650
699 if (op->type == PLAYER) 651 if (!tmp->destroyed () && !tmp->is_inserted ())
700 esrv_del_item (op->contr, tmp->count);
701
702 tmp->destroy ();
703 op->update_stats ();
704 return;
705 } 652 {
706 653 // if nothing happened with the object we give it back
707 if (op->type == PLAYER) 654 op->insert (tmp);
708 esrv_del_item (op->contr, tmp->count);
709
710 /* Call this before we update the various windows/players. At least
711 * that we, we know the weight is correct.
712 */
713 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
714 /* in object.c */
715
716 if (op->type == PLAYER)
717 { 655 }
718 /* Need to update the weight for the player */
719 esrv_send_item (op, op);
720 op->contr->ns->floorbox_update ();
721 }
722
723 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
724 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
725 return;
726
727 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
728 sell_item (tmp, op);
729
730 tmp->x = op->x;
731 tmp->y = op->y;
732
733 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
734} 656}
735 657
736void 658void
737drop (object *op, object *tmp) 659drop (object *op, object *tmp)
738{ 660{
… …
747 if (tmp->env && tmp->env->type != PLAYER) 669 if (tmp->env && tmp->env->type != PLAYER)
748 { 670 {
749 /* Just toss the object - probably shouldn't be hanging 671 /* Just toss the object - probably shouldn't be hanging
750 * around anyways 672 * around anyways
751 */ 673 */
752 tmp->remove ();
753 tmp->destroy (); 674 tmp->destroy ();
754 return; 675 return;
755 } 676 }
756 else 677 else
757 {
758 while (tmp != NULL && tmp->invisible) 678 while (tmp && tmp->invisible)
759 tmp = tmp->below; 679 tmp = tmp->below;
760 }
761 } 680 }
762 681
763 if (tmp == NULL) 682 if (!tmp)
764 { 683 {
765 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 684 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
766 return; 685 return;
767 } 686 }
687
768 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 688 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
769 { 689 {
770 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 690 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
771 return; 691 return;
772 } 692 }
693
773 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 694 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
774 { 695 {
775#if 0 696#if 0
776 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 697 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
777 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 698 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
… …
780 } 701 }
781 702
782 if (op->type == PLAYER && op->contr->last_used == tmp) 703 if (op->type == PLAYER && op->contr->last_used == tmp)
783 op->contr->last_used = tmp->below ? tmp->below 704 op->contr->last_used = tmp->below ? tmp->below
784 : tmp->above ? tmp->above 705 : tmp->above ? tmp->above
785 : 0; 706 : (object *)0;
786 707
787 if (op->container) 708 if (op->container_ ())
788 { 709 {
789 if (op->type == PLAYER) 710 if (op->type == PLAYER)
790 put_object_in_sack (op, op->container, tmp, op->contr->count); 711 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
791 else 712 else
792 put_object_in_sack (op, op->container, tmp, 0); 713 put_object_in_sack (op, op->container_ (), tmp, 0);
793 } 714 }
794 else 715 else
795 { 716 {
796 if (op->type == PLAYER) 717 if (op->type == PLAYER)
797 drop_object (op, tmp, op->contr->count); 718 drop_object (op, tmp, op->contr->count);
… …
801 722
802 if (op->type == PLAYER) 723 if (op->type == PLAYER)
803 op->contr->count = 0; 724 op->contr->count = 0;
804} 725}
805 726
806
807
808/* Command will drop all items that have not been locked */ 727/* Command will drop all items that have not been locked */
809int 728int
810command_dropall (object *op, char *params) 729command_dropall (object *op, char *params)
811{ 730{
812 731
813 object *curinv, *nextinv;
814
815 if (op->inv == NULL) 732 if (op->inv == NULL)
816 { 733 {
817 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 734 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
818 return 0; 735 return 0;
819 } 736 }
820 737
821 curinv = op->inv; 738 object *curinv = op->inv;
739 object *nextinv;
822 740
823 /* 741 /*
824 This is the default. Drops everything not locked or considered 742 This is the default. Drops everything not locked or considered
825 not something that should be dropped. 743 not something that should be dropped.
826 */ 744 */
827 /* 745 /*
828 Care must be taken that the next item pointer is not to money as 746 Care must be taken that the next item pointer is not to money as
829 the drop() routine will do unknown things to it when dropping 747 the drop() routine will do unknown things to it when dropping
830 in a shop. --Tero.Pelander@utu.fi 748 in a shop. --Tero.Pelander@utu.fi
831 */ 749 */
832
833 int cnt = MAX_ITEM_PER_DROP; 750 int cnt = MAX_ITEM_PER_ACTION;
834 751
835 if (params == NULL) 752 if (!params)
836 { 753 {
837 while (curinv != NULL) 754 while (curinv)
838 { 755 {
839 nextinv = curinv->below; 756 nextinv = curinv->below;
757
840 while (nextinv && nextinv->type == MONEY) 758 while (nextinv && nextinv->type == MONEY)
841 nextinv = nextinv->below; 759 nextinv = nextinv->below;
760
842 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 761 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
843 curinv->type != FOOD && curinv->type != KEY && 762 && curinv->type != MONEY
844 curinv->type != SPECIAL_KEY && curinv->type != GEM && 763 && curinv->type != FOOD
764 && curinv->type != KEY
765 && curinv->type != SPECIAL_KEY
766 && curinv->type != GEM
767 && !curinv->invisible
845 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 768 && (curinv->type != CONTAINER || op->container_ () != curinv))
846 { 769 {
847 drop (op, curinv); 770 drop (op, curinv);
848 if (--cnt <= 0) break; 771 if (--cnt <= 0) break;
849 } 772 }
773
850 curinv = nextinv; 774 curinv = nextinv;
851 } 775 }
852 } 776 }
853
854 else if (strcmp (params, "weapons") == 0) 777 else if (strcmp (params, "weapons") == 0)
855 { 778 {
856 while (curinv != NULL) 779 while (curinv)
857 { 780 {
858 nextinv = curinv->below; 781 nextinv = curinv->below;
782
859 while (nextinv && nextinv->type == MONEY) 783 while (nextinv && nextinv->type == MONEY)
860 nextinv = nextinv->below; 784 nextinv = nextinv->below;
785
861 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 786 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
862 { 787 {
863 drop (op, curinv); 788 drop (op, curinv);
864 if (--cnt <= 0) break; 789 if (--cnt <= 0) break;
865 } 790 }
791
866 curinv = nextinv; 792 curinv = nextinv;
867 } 793 }
868 } 794 }
869
870 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 795 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
871 { 796 {
872 while (curinv != NULL) 797 while (curinv)
873 { 798 {
874 nextinv = curinv->below; 799 nextinv = curinv->below;
800
875 while (nextinv && nextinv->type == MONEY) 801 while (nextinv && nextinv->type == MONEY)
876 nextinv = nextinv->below; 802 nextinv = nextinv->below;
803
877 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 804 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
878 { 805 {
879 drop (op, curinv); 806 drop (op, curinv);
880 if (--cnt <= 0) break; 807 if (--cnt <= 0) break;
881 } 808 }
809
882 curinv = nextinv; 810 curinv = nextinv;
883 } 811 }
884 } 812 }
885
886 else if (strcmp (params, "misc") == 0) 813 else if (strcmp (params, "misc") == 0)
887 { 814 {
888 while (curinv != NULL) 815 while (curinv)
889 { 816 {
890 nextinv = curinv->below; 817 nextinv = curinv->below;
818
891 while (nextinv && nextinv->type == MONEY) 819 while (nextinv && nextinv->type == MONEY)
892 nextinv = nextinv->below; 820 nextinv = nextinv->below;
821
893 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 822 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
894 { 823 {
895 switch (curinv->type) 824 switch (curinv->type)
896 { 825 {
897 case HORN: 826 case HORN:
… …
915 break; 844 break;
916 default: 845 default:
917 curinv = nextinv; 846 curinv = nextinv;
918 break; 847 break;
919 } 848 }
849
920 if (--cnt <= 0) break; 850 if (--cnt <= 0) break;
921 } 851 }
852
922 curinv = nextinv; 853 curinv = nextinv;
923 } 854 }
924 } 855 }
925 856
926 if (cnt <= 0) 857 if (cnt <= 0)
927 op->failmsg (format ( 858 op->failmsg ("Only dropped some items, can't drop that many items at once.");
928 "Droppped only %d items, you can't drop more than that at once.",
929 MAX_ITEM_PER_DROP
930 ));
931
932 op->contr->ns->floorbox_update ();
933 859
934/* draw_look(op);*/ 860/* draw_look(op);*/
935 return 0; 861 return 0;
936} 862}
937 863
864
865/* This function tries to drop all objects in the <objs> vector.
866 * <dropper> is the object that wants to drop them.
867 * <cnt> can be a 0 pointer or a pointer to the maximum number of
868 * drop operations to perform.
869 *
870 * Returns true if at least one item was dropped.
871 */
872static bool
873drop_vector (object *dropper, vector<object *> &objs, int *cnt)
874{
875 vector<object *>::iterator i;
876
877 bool did_one = false;
878
879 for (i = objs.begin (); i != objs.end (); i++)
880 {
881 drop (dropper, *i);
882 if (cnt && --*cnt <= 0) break;
883 did_one = true;
884 }
885
886 return did_one;
887}
888
938/* Object op wants to drop object(s) params. params can be a 889/* Object op wants to drop object(s) params. params can be a
939 * comma seperated list. 890 * comma seperated list.
940 */ 891 */
941
942int 892int
943command_drop (object *op, char *params) 893command_drop (object *op, char *params)
944{ 894{
945 object *tmp, *next; 895 object *tmp, *next;
946 int did_one = 0; 896 int did_one = 0;
… …
950 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
951 return 0; 901 return 0;
952 } 902 }
953 else 903 else
954 { 904 {
955 int cnt = MAX_ITEM_PER_DROP; 905 vector<object *> matched_objs;
956 906
957 for (tmp = op->inv; tmp; tmp = next) 907 for (tmp = op->inv; tmp; tmp = next)
958 { 908 {
959 next = tmp->below; 909 next = tmp->below;
960 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 910 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
961 continue; 911 continue;
962 912
963 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
964 { 914 matched_objs.push_back (tmp);
965 drop (op, tmp);
966 if (--cnt <= 0) break;
967 did_one = 1;
968 } 915 }
969 }
970 916
971 if (!did_one) 917 int cnt = MAX_ITEM_PER_ACTION;
918
919 if (!drop_vector (op, matched_objs, &cnt))
972 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
973 921
974 if (cnt <= 0) 922 if (cnt <= 0)
975 op->failmsg (format ( 923 op->failmsg ("Only dropped some items, can't drop that many items at once.");
976 "Droppped only %d items, you can't drop more than that at once.",
977 MAX_ITEM_PER_DROP
978 ));
979 }
980 if (op->type == PLAYER)
981 {
982 op->contr->count = 0;
983 op->contr->ns->floorbox_update ();
984 }; 924 }
985 925
986/* draw_look(op);*/
987 return 0; 926 return 0;
988} 927}
989 928
990int 929int
991command_examine (object *op, char *params) 930command_examine (object *op, char *params)
… …
994 { 933 {
995 object *tmp = op->below; 934 object *tmp = op->below;
996 935
997 while (tmp && !tmp->client_visible ()) 936 while (tmp && !tmp->client_visible ())
998 tmp = tmp->below; 937 tmp = tmp->below;
938
999 if (tmp) 939 if (tmp)
1000 examine (op, tmp); 940 examine (op, tmp);
1001 } 941 }
1002 else 942 else
1003 { 943 {
1004 object *tmp = find_best_object_match (op, params); 944 object *tmp = find_best_object_match (op, params);
1005 945
1006 if (tmp) 946 if (tmp)
1007 examine (op, tmp); 947 examine (op, tmp);
1008 else 948 else
1009 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params); 949 op->contr->infobox (MSG_CHANNEL ("examine"), format ("Could not find an object that matches %s", params));
1010 } 950 }
951
1011 return 0; 952 return 0;
1012} 953}
1013 954
1014/* op should be a player. 955/* op should be a player.
1015 * we return the object the player has marked with the 'mark' command 956 * we return the object the player has marked with the 'mark' command
… …
1062 dynbuf_text buf (512, 512); 1003 dynbuf_text buf (512, 512);
1063 1004
1064 object *mon = head ? head : this; 1005 object *mon = head ? head : this;
1065 1006
1066 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 1007 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1067 buf << "It is an undead force.\n"; 1008 buf << "It is an undead force.\r";
1068 1009
1069 if (mon->level > who->level) 1010 if (mon->level > who->level)
1070 buf << "It is likely more powerful than you.\n"; 1011 buf << "It is likely more powerful than you.\r";
1071 else if (mon->level < who->level) 1012 else if (mon->level < who->level)
1072 buf << "It is likely less powerful than you.\n"; 1013 buf << "It is likely less powerful than you.\r";
1073 else 1014 else
1074 buf << "It is probably as powerful as you.\n"; 1015 buf << "It is probably as powerful as you.\r";
1075 1016
1076 if (mon->attacktype & AT_ACID) 1017 if (mon->attacktype & AT_ACID)
1077 buf << "You seem to smell an acrid odor.\n"; 1018 buf << "You seem to smell an acrid odor.\r";
1078 1019
1079 /* Anyone know why this used to use the clone value instead of the 1020 /* Anyone know why this used to use the clone value instead of the
1080 * maxhp field? This seems that it should give more accurate results. 1021 * maxhp field? This seems that it should give more accurate results.
1081 */ 1022 */
1082 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 1023 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1083 { /* From 1-4 */ 1024 { /* From 1-4 */
1084 case 1: 1025 case 1:
1085 buf << "It is in a bad shape.\n"; 1026 buf << "It is in a bad shape.\r";
1086 break; 1027 break;
1087 case 2: 1028 case 2:
1088 buf << "It is hurt.\n"; 1029 buf << "It is hurt.\r";
1089 break; 1030 break;
1090 case 3: 1031 case 3:
1091 buf << "It is somewhat hurt.\n"; 1032 buf << "It is somewhat hurt.\r";
1092 break; 1033 break;
1093 case 4: 1034 case 4:
1094 buf << "It is in excellent shape.\n"; 1035 buf << "It is in excellent shape.\r";
1095 break; 1036 break;
1096 } 1037 }
1097 1038
1098 if (present_in_ob (POISONING, mon)) 1039 if (present_in_ob (POISONING, mon))
1099 buf << "It looks very ill.\n"; 1040 buf << "It looks very ill.\r";
1041
1042 buf << '\n';
1100 1043
1101 return buf; 1044 return buf;
1102} 1045}
1103 1046
1104/* tmp is the object being described, pl is who is examing it. */ 1047/* tmp is the object being described, pl is who is examing it. */
… …
1111} 1054}
1112 1055
1113std::string 1056std::string
1114object::long_desc (object *who) 1057object::long_desc (object *who)
1115{ 1058{
1116 std::string buf (query_name (this)); 1059 std::string buf (query_name ());
1117 1060
1118 switch (type) 1061 switch (type)
1119 { 1062 {
1120 case RING: 1063 case RING:
1121 case SKILL: 1064 case SKILL:
… …
1133 case CLOAK: 1076 case CLOAK:
1134 case FOOD: 1077 case FOOD:
1135 case DRINK: 1078 case DRINK:
1136 case FLESH: 1079 case FLESH:
1137 case SKILL_TOOL: 1080 case SKILL_TOOL:
1081 case LAMP:
1138 case POWER_CRYSTAL: 1082 case POWER_CRYSTAL:
1139 { 1083 {
1140 const char *cp = ::describe_item (this, who); 1084 const char *cp = ::describe_item (this, who);
1141 1085
1142 if (*cp) 1086 if (*cp)
… …
1157examine_monster (object *op, object *tmp) 1101examine_monster (object *op, object *tmp)
1158{ 1102{
1159 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ()); 1103 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1160} 1104}
1161 1105
1162std::string
1163object::describe (object *who)
1164{
1165 dynbuf_text buf (1024, 1024);
1166
1167 buf.printf ("That is: %s.\n", long_desc (who).c_str ());
1168
1169 if (custom_name)
1170 buf.printf ("You call it %s\n", &custom_name);
1171
1172 switch (type)
1173 {
1174 case SPELLBOOK:
1175 if (flag [FLAG_IDENTIFIED] && inv)
1176 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1177 break;
1178
1179 case BOOK:
1180 if (msg)
1181 buf << "Something is written in it.\n";
1182 break;
1183
1184 case CONTAINER:
1185 if (race != NULL)
1186 {
1187 if (weight_limit && stats.Str < 100)
1188 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1189 &race, weight_limit / (10.0 * (100 - stats.Str)));
1190 else
1191 buf.printf ("It can hold only %s.\n", &race);
1192 }
1193 else if (weight_limit && stats.Str < 100)
1194 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1195 break;
1196
1197 case WAND:
1198 if (flag [FLAG_IDENTIFIED])
1199 buf.printf ("It has %d charges left.\n", stats.food);
1200 break;
1201 }
1202
1203 if (materialname && !msg)
1204 buf.printf ("It is made of: %s.\n", &materialname);
1205
1206 if (who)
1207 /* Where to wear this item */
1208 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1209 if (slot[i].info)
1210 {
1211 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1212
1213 if (slot[i].info < -1 && who->slot[i].info)
1214 buf.printf ("(%d)", -slot[i].info);
1215
1216 buf << ".\n";
1217 }
1218
1219 if (weight)
1220 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1221
1222 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1223 {
1224 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1225
1226 if (is_in_shop (who))
1227 {
1228 if (flag [FLAG_UNPAID])
1229 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1230 else
1231 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1232 }
1233 }
1234
1235 if (flag [FLAG_MONSTER])
1236 buf << describe_monster (who);
1237
1238 /* Is this item buildable? */
1239 if (flag [FLAG_IS_BUILDABLE])
1240 buf << "This is a buildable item.\n";
1241
1242 /* Does the object have a message? Don't show message for all object
1243 * types - especially if the first entry is a match
1244 */
1245 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && strncasecmp (msg, "@match", 7))
1246 {
1247 /* This is just a hack so when identifying the items, we print
1248 * out the extra message
1249 */
1250 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1251 buf << "The object has a story:\n";
1252
1253 buf << msg << '\n';
1254 }
1255
1256 buf << '\n';
1257
1258 return std::string (buf.linearise (), buf.size ());
1259}
1260
1261static void 1106static void
1262display_new_pickup (object *op) 1107display_new_pickup (object *op)
1263{ 1108{
1264 int i = op->contr->mode; 1109 int i = op->contr->mode;
1265 1110
1266 if (!(i & PU_NEWMODE))
1267 return;
1268
1269 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1270 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0); 1111 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1271 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0); 1112 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1272 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0); 1113 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1273 1114
1274 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5); 1115 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
… …
1325 }; 1166 };
1326 1167
1327 if (!params) 1168 if (!params)
1328 { 1169 {
1329 /* if the new mode is used, just print the settings */ 1170 /* if the new mode is used, just print the settings */
1330 if (op->contr->mode & PU_NEWMODE)
1331 {
1332 display_new_pickup (op); 1171 display_new_pickup (op);
1333 return 1;
1334 }
1335 if (1)
1336 LOG (llevDebug, "command_pickup: !params\n");
1337 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1338 return 0; 1172 return 0;
1339 } 1173 }
1340 1174
1341 while (*params == ' ' && *params) 1175 while (*params == ' ' && *params)
1342 params++; 1176 params++;
… …
1348 for (mode = 0; names[mode]; mode++) 1182 for (mode = 0; names[mode]; mode++)
1349 { 1183 {
1350 if (!strcmp (names[mode], params + 1)) 1184 if (!strcmp (names[mode], params + 1))
1351 { 1185 {
1352 i = op->contr->mode; 1186 i = op->contr->mode;
1353 if (!(i & PU_NEWMODE)) 1187
1354 i = PU_NEWMODE;
1355 if (*params == '+') 1188 if (*params == '+')
1356 i = i | modes[mode]; 1189 i = i | modes[mode];
1357 else 1190 else
1358 i = i & ~modes[mode]; 1191 i = i & ~modes[mode];
1192
1359 op->contr->mode = i; 1193 op->contr->mode = i;
1360 display_new_pickup (op); 1194 display_new_pickup (op);
1361 return 1; 1195 return 1;
1362 } 1196 }
1363 } 1197 }
… …
1365 return 1; 1199 return 1;
1366 } 1200 }
1367 1201
1368 if (sscanf (params, "%u", &i) != 1) 1202 if (sscanf (params, "%u", &i) != 1)
1369 { 1203 {
1370 if (1)
1371 LOG (llevDebug, "command_pickup: params==NULL\n");
1372 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> ."); 1204 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1373 return 1; 1205 return 1;
1374 } 1206 }
1375 set_pickup_mode (op, i); 1207
1208 if (i <= PU_RATIO)
1209 i |= op->contr->mode & ~PU_RATIO;
1210
1211 op->contr->mode = i;
1376 1212
1377 return 1; 1213 return 1;
1378}
1379
1380void
1381set_pickup_mode (object *op, int i)
1382{
1383 switch (op->contr->mode = i)
1384 {
1385 case 0:
1386 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1387 break;
1388 case 1:
1389 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1390 break;
1391 case 2:
1392 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1393 break;
1394 case 3:
1395 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1396 break;
1397 case 4:
1398 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1399 break;
1400 case 5:
1401 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1402 break;
1403 case 6:
1404 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1405 break;
1406 case 7:
1407 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1408 break;
1409 }
1410} 1214}
1411 1215
1412int 1216int
1413command_search_items (object *op, char *params) 1217command_search_items (object *op, char *params)
1414{ 1218{
1415 char buf[MAX_BUF];
1416
1417 if (settings.search_items == FALSE)
1418 return 1;
1419
1420 if (params == NULL) 1219 if (params == NULL)
1421 { 1220 {
1422 if (op->contr->search_str[0] == '\0') 1221 if (op->contr->search_str[0] == '\0')
1423 { 1222 {
1424 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1223 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1425 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all"); 1224 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1426 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'."); 1225 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1427 return 1; 1226 return 1;
1428 } 1227 }
1429 1228
1430 op->contr->search_str[0] = '\0'; 1229 op->contr->search_str[0] = '\0';
1431 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1230 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1432 op->update_stats (); 1231 op->contr->queue_stats_update ();
1433 return 1; 1232 return 1;
1434 } 1233 }
1435 1234
1436 if ((int) strlen (params) >= MAX_BUF) 1235 if (strlen (params) >= sizeof (op->contr->search_str))
1437 { 1236 {
1438 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1237 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1439 return 1; 1238 return 1;
1440 } 1239 }
1441 1240
1442 strcpy (op->contr->search_str, params); 1241 strcpy (op->contr->search_str, params);
1443 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1242 new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1444 new_draw_info (NDI_UNIQUE, 0, op, buf); 1243 op->contr->queue_stats_update ();
1445 op->update_stats (); 1244
1446 return 1; 1245 return 1;
1447} 1246}
1448 1247
1248int
1249command_unlock (object *op, char *params)
1250{
1251 /* if the unlock command typed with nothing, unlock everything,
1252 * this might be bad
1253 */
1254 if (params == NULL)
1255 {
1256 for (object *item = op->inv; item; item = item->below)
1257 {
1258 CLEAR_FLAG(item, FLAG_INV_LOCKED);
1259 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
1260 esrv_update_item (UPD_FLAGS, op, item);
1261 }
1262 return 0;
1263 }
1264
1265 /* if the unlock command is used with a param,
1266 * unlock what matches. i.e. unlock material, should unlock all the materials
1267 */
1268 for (object *item = op->inv; item; item = item->below)
1269 if (item->name.contains (params))
1270 {
1271 CLEAR_FLAG (item, FLAG_INV_LOCKED);
1272 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
1273 esrv_update_item (UPD_FLAGS, op, item);
1274 }
1275
1276 return 0;
1277}
1278
1279int
1280command_lock (object *op, char *params)
1281{
1282 /* if the lock command is typed by itself, lock everything
1283 */
1284 if (params == NULL)
1285 {
1286 for (object *item = op->inv; item; item = item->below)
1287 {
1288 SET_FLAG (item, FLAG_INV_LOCKED);
1289 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
1290 esrv_update_item (UPD_FLAGS, op, item);
1291 }
1292 return 0;
1293 }
1294
1295 /* if the lock command is used with a param, lock what matches.
1296 * i.e. lock material, should lock all the materials
1297 */
1298 for (object *item = op->inv; item; item = item->below)
1299 if (item->name.contains (params))
1300 {
1301 SET_FLAG (item, FLAG_INV_LOCKED);
1302 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
1303 esrv_update_item (UPD_FLAGS, op, item);
1304 }
1305
1306 return 0;
1307}
1308
1309/* op should be a player, params is any params.
1310 * If no params given, we print out the currently marked object.
1311 * otherwise, try to find a matching object - try best match first.
1312 */
1313int
1314command_mark (object *op, char *params)
1315{
1316 if (!params)
1317 {
1318 if (object *mark = find_marked_object (op))
1319 op->statusmsg (format ("%s is marked.", query_name (mark)));
1320 else
1321 op->failmsg ("You have no marked object.");
1322 }
1323 else
1324 {
1325 if (object *mark = find_best_object_match (op, params))
1326 {
1327 op->contr->mark = mark;
1328 op->statusmsg (format ("Marked item %s", query_name (mark)));
1329 }
1330 else
1331 op->failmsgf ("Could not find an object that matches %s", params);
1332 }
1333
1334 return 0; /*shouldnt get here */
1335}
1336

Diff Legend

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