ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_object.C
(Generate patch)

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.48 by root, Mon May 7 03:05:58 2007 UTC vs.
Revision 1.134 by root, Sat Nov 17 23:40:03 2018 UTC

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