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.51 by root, Sat May 12 16:06:42 2007 UTC vs.
Revision 1.134 by root, Sat Nov 17 23:40:03 2018 UTC

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

Diff Legend

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