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.133 by root, Sun Jan 29 02:47:05 2017 UTC

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

Diff Legend

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