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.114 by root, Sat Apr 3 17:15:19 2010 UTC

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

Diff Legend

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