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

Diff Legend

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