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.25 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.98 by sf-marcmagus, Thu Oct 15 16:00:38 2009 UTC

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

Diff Legend

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