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

Diff Legend

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