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

Diff Legend

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