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