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